Module Name: src Committed By: pgoyette Date: Sun Mar 11 08:32:21 UTC 2018
Modified Files: src/sys/kern [pgoyette-compat]: kern_module.c sys_module.c Log Message: Since we use pointer semantics when walking the alias lists, declare the pointer variable accordingly. To generate a diff of this commit: cvs rdiff -u -r1.130.2.2 -r1.130.2.3 src/sys/kern/kern_module.c cvs rdiff -u -r1.23.2.2 -r1.23.2.3 src/sys/kern/sys_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/kern_module.c diff -u src/sys/kern/kern_module.c:1.130.2.2 src/sys/kern/kern_module.c:1.130.2.3 --- src/sys/kern/kern_module.c:1.130.2.2 Sun Mar 11 07:25:59 2018 +++ src/sys/kern/kern_module.c Sun Mar 11 08:32:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_module.c,v 1.130.2.2 2018/03/11 07:25:59 pgoyette Exp $ */ +/* $NetBSD: kern_module.c,v 1.130.2.3 2018/03/11 08:32:21 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.2 2018/03/11 07:25:59 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.3 2018/03/11 08:32:21 pgoyette Exp $"); #define _MODULE_INTERNAL @@ -666,7 +666,7 @@ module_unload(const char *name) int module_alias_lookup(const char *name, module_t *mod) { - const char * const aliasp[]; + const char * const *aliasp; aliasp = *mod->mod_info->mi_aliases; if (aliasp == NULL) @@ -784,7 +784,7 @@ module_do_builtin(const module_t *pmod, prop_dictionary_t props) { const char *p, *s; - const char * const aliasp[]; + const char * const *aliasp; char buf[MAXMODNAME]; modinfo_t *mi = NULL; module_t *mod, *mod2, *mod_loaded, *prev_active; @@ -910,7 +910,7 @@ module_do_load(const char *name, bool is prop_dictionary_t filedict; char buf[MAXMODNAME]; const char *s, *p; - const char * const aliasp[]; + const char * const *aliasp; int error; size_t len; Index: src/sys/kern/sys_module.c diff -u src/sys/kern/sys_module.c:1.23.2.2 src/sys/kern/sys_module.c:1.23.2.3 --- src/sys/kern/sys_module.c:1.23.2.2 Sun Mar 11 07:25:59 2018 +++ src/sys/kern/sys_module.c Sun Mar 11 08:32:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_module.c,v 1.23.2.2 2018/03/11 07:25:59 pgoyette Exp $ */ +/* $NetBSD: sys_module.c,v 1.23.2.3 2018/03/11 08:32:21 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.2 2018/03/11 07:25:59 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.3 2018/03/11 08:32:21 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -122,7 +122,7 @@ handle_modctl_stat(struct iovec *iov, vo int error; int mscnt; bool stataddr; - const char * const aliasp[]; + const char * const *aliasp; /* If not privileged, don't expose kernel addresses. */ error = kauth_authorize_system(kauth_cred_get(), KAUTH_SYSTEM_MODULE,