Use ARRAY_SIZE macro
Replace array size calculations with ARRAY_SIZE macro. Implemented with this Coccinelle semantic patch, adapted from Linux kernel: @@ type T; T[] E; @@ - (sizeof(E)/sizeof(*E)) + ARRAY_SIZE(E) @@ type T; T[] E; @@ - (sizeof(E)/sizeof(E[...])) + ARRAY_SIZE(E) @@ type T; T[] E; @@ - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) Some files (*-dis.c, tests/*) had to be filtered out. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
f143efa60c
commit
66fe09eebb
@ -110,7 +110,7 @@ char *os_find_datadir(const char *argv0)
|
||||
size_t len = sizeof(buf) - 1;
|
||||
|
||||
*buf = '\0';
|
||||
if (!sysctl(mib, sizeof(mib)/sizeof(*mib), buf, &len, NULL, 0) &&
|
||||
if (!sysctl(mib, ARRAY_SIZE(mib), buf, &len, NULL, 0) &&
|
||||
*buf) {
|
||||
buf[sizeof(buf) - 1] = '\0';
|
||||
p = buf;
|
||||
|
@ -543,7 +543,7 @@ static int check_features_against_host(x86_def_t *guest_def)
|
||||
~CPUID_EXT3_SVM, ext3_feature_name, 0x80000001}};
|
||||
|
||||
cpu_x86_fill_host(&host_def);
|
||||
for (rv = 0, i = 0; i < sizeof (ft) / sizeof (ft[0]); ++i)
|
||||
for (rv = 0, i = 0; i < ARRAY_SIZE(ft); ++i)
|
||||
for (mask = 1; mask; mask <<= 1)
|
||||
if (ft[i].check_feat & mask && *ft[i].guest_feat & mask &&
|
||||
!(*ft[i].host_feat & mask)) {
|
||||
|
Loading…
Reference in New Issue
Block a user