From 60521e1f94c8f7c93ad95d704b47995782d72ef5 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Mon, 12 Oct 2020 22:08:33 +0000 Subject: make fixed-sized fixed-value mib[] arrays be const ok guenther tb millert --- src/lib/libc/stdlib/malloc.c | 7 +++---- src/lib/libcrypto/arc4random/getentropy_freebsd.c | 6 ++---- src/lib/libcrypto/arc4random/getentropy_netbsd.c | 6 ++---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index a62bfac3e5..86670fca87 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.265 2020/10/09 16:01:48 otto Exp $ */ +/* $OpenBSD: malloc.c,v 1.266 2020/10/12 22:08:33 deraadt Exp $ */ /* * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek * Copyright (c) 2012 Matthew Dempsky @@ -406,7 +406,8 @@ static void omalloc_init(void) { char *p, *q, b[16]; - int i, j, mib[2]; + int i, j; + const int mib[2] = { CTL_VM, VM_MALLOC_CONF }; size_t sb; /* @@ -419,8 +420,6 @@ omalloc_init(void) for (i = 0; i < 3; i++) { switch (i) { case 0: - mib[0] = CTL_VM; - mib[1] = VM_MALLOC_CONF; sb = sizeof(b); j = sysctl(mib, 2, b, &sb, NULL, 0); if (j != 0) diff --git a/src/lib/libcrypto/arc4random/getentropy_freebsd.c b/src/lib/libcrypto/arc4random/getentropy_freebsd.c index 30cd68e97d..ea90ffe202 100644 --- a/src/lib/libcrypto/arc4random/getentropy_freebsd.c +++ b/src/lib/libcrypto/arc4random/getentropy_freebsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_freebsd.c,v 1.3 2016/08/07 03:27:21 tb Exp $ */ +/* $OpenBSD: getentropy_freebsd.c,v 1.4 2020/10/12 22:08:33 deraadt Exp $ */ /* * Copyright (c) 2014 Pawel Jakub Dawidek @@ -32,11 +32,9 @@ static size_t getentropy_sysctl(u_char *buf, size_t size) { - int mib[2]; + const int mib[2] = { CTL_KERN, KERN_ARND }; size_t len, done; - mib[0] = CTL_KERN; - mib[1] = KERN_ARND; done = 0; do { diff --git a/src/lib/libcrypto/arc4random/getentropy_netbsd.c b/src/lib/libcrypto/arc4random/getentropy_netbsd.c index 45d68c9fda..5dc89594cd 100644 --- a/src/lib/libcrypto/arc4random/getentropy_netbsd.c +++ b/src/lib/libcrypto/arc4random/getentropy_netbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_netbsd.c,v 1.3 2016/08/07 03:27:21 tb Exp $ */ +/* $OpenBSD: getentropy_netbsd.c,v 1.4 2020/10/12 22:08:33 deraadt Exp $ */ /* * Copyright (c) 2014 Pawel Jakub Dawidek @@ -32,11 +32,9 @@ static size_t getentropy_sysctl(u_char *buf, size_t size) { - int mib[2]; + const int mib[2] = { CTL_KERN, KERN_ARND }; size_t len, done; - mib[0] = CTL_KERN; - mib[1] = KERN_ARND; done = 0; do { -- cgit v1.2.3-55-g6feb