moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

Use ARRAYSIZE macro for non-string array size computation

Browse Source 
Signed-off-by: Pierre Neidhardt <ambrevar@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Pierre Neidhardt 2015-10-21 11:11:17 +02:00 committed by Allan McRae
parent 9809102237
commit 456ebe8f8e
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/pkghash.c
View File

@ -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];

2
src/common/util-common.h
View File

@ -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: */

2
src/pacman/pacman.c
View File

@ -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) {

2
src/pacman/sync.c
View File

@ -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;

2
src/pacman/util.c
View File

@ -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;