diff options
| author | Pierre Neidhardt <ambrevar@gmail.com> | 2015-10-21 11:11:17 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-10-27 04:53:18 +0100 |
| commit | 456ebe8f8eee82c467805613f107edd84e73ac26 (patch) | |
| tree | da9a058a2e598d7dbf2efd9c61d9107eb9c5eb31 | |
| parent | 9809102237f89b73a120250260bf3f68d6bc4ba9 (diff) | |
| download | pacman-456ebe8f8eee82c467805613f107edd84e73ac26.tar.gz pacman-456ebe8f8eee82c467805613f107edd84e73ac26.tar.xz | |
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>
| -rw-r--r-- | lib/libalpm/pkghash.c | 2 | ||||
| -rw-r--r-- | src/common/util-common.h | 2 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 2 | ||||
| -rw-r--r-- | src/pacman/sync.c | 2 | ||||
| -rw-r--r-- | src/pacman/util.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 989a8c1b..5328ce43 100644 --- a/lib/libalpm/pkghash.c +++ b/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]; diff --git a/src/common/util-common.h b/src/common/util-common.h index af2ebdaa..f604e79a 100644 --- a/src/common/util-common.h +++ b/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: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d777663d..019b0c2e 100644 --- a/src/pacman/pacman.c +++ b/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) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3c201999..2a0f4b55 100644 --- a/src/pacman/sync.c +++ b/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; diff --git a/src/pacman/util.c b/src/pacman/util.c index 1542f8a2..5f331e82 100644 --- a/src/pacman/util.c +++ b/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; |