6e21b2e use the nitems() macro instead of sizeof — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

use the nitems() macro instead of sizeof

rilysh committed 2 years ago

commit 6e21b2ecca7c2c62313af50fd8ecf2813e64e279
parent ed0550c

2 files changed +3 -3

modified libpkg/pkg_macho.c

@@ -150,7 +150,7 @@ add_dylibs_to_pkg(__unused void *actdata, struct pkg *pkg, const char *fpath,

 		  const char *name, bool is_shlib)
 {
 	/* Skip references to system libraries */
 	for (size_t i = 0; i < sizeof(system_dylib_prefixes) / sizeof(system_dylib_prefixes[0]); i++) {
 	for (size_t i = 0; i < nitems(system_dylib_prefixes); i++) {
 		const char *prefix = system_dylib_prefixes[i];
 		if (strncmp(name, prefix, strlen(prefix)) == 0)
 			return EPKG_OK;

modified libpkg/scripts.c

@@ -90,12 +90,12 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade)

 		return (EPKG_OK);
 	}
 	for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) {
 	for (i = 0; i < nitems(map); i++) {
 		if (map[i].a == type)
 			break;
 	}
 	assert(i < sizeof(map) / sizeof(map[0]));
 	assert(i < nitems(map));
 #ifdef PROC_REAP_KILL
 	mypid = getpid();