Use ARRAYSIZE macro for non-string array size computation

Signed-off-by: Pierre Neidhardt <ambrevar@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

lib/libalpm/pkghash.c

@@ -66,7 +66,7 @@ alpm_pkghash_t *_alpm_pkghash_create(unsigned int size)
 	CALLOC(hash, 1, sizeof(alpm_pkghash_t), return NULL);
 	size = size / initial_hash_load + 1;
 
-	loopsize = sizeof(prime_list) / sizeof(*prime_list);
+	loopsize = ARRAYSIZE(prime_list);
 	for(i = 0; i < loopsize; i++) {
 		if(prime_list[i] > size) {
 			hash->buckets = prime_list[i];

src/common/util-common.h

@@ -36,6 +36,8 @@ size_t strtrim(char *str);
 char *strndup(const char *s, size_t n);
 #endif
 
+#define ARRAYSIZE(a) (sizeof (a) / sizeof (a[0]))
+
 #endif /* _PM_UTIL_COMMON_H */
 
 /* vim: set noet: */

src/pacman/pacman.c

@@ -1141,7 +1141,7 @@ int main(int argc, char *argv[])
 	new_action.sa_flags = SA_RESTART;
 
 	/* assign our handler to any signals we care about */
-	for(i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) {
+	for(i = 0; i < ARRAYSIZE(signals); i++) {
 		int signal = signals[i];
 		sigaction(signal, NULL, &old_action);
 		if(old_action.sa_handler != SIG_IGN) {

src/pacman/sync.c

@@ -228,7 +228,7 @@ static int sync_cleancache(int level)
 				};
 				size_t j;
 
-				for(j = 0; j < sizeof(glob_skips) / sizeof(glob_skips[0]); j++) {
+				for(j = 0; j < ARRAYSIZE(glob_skips); j++) {
 					if(fnmatch(glob_skips[j], ent->d_name, 0) == 0) {
 						delete = 0;
 						break;

src/pacman/util.c

@@ -1075,7 +1075,7 @@ double humanize_size(off_t bytes, const char target_unit, int precision,
 {
 	static const char *labels[] = {"B", "KiB", "MiB", "GiB",
 		"TiB", "PiB", "EiB", "ZiB", "YiB"};
-	static const int unitcount = sizeof(labels) / sizeof(labels[0]);
+	static const int unitcount = ARRAYSIZE(labels);
 
 	double val = (double)bytes;
 	int index;