mirror of
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
synced 2024-11-30 05:17:41 +08:00
Use ARRAY_SIZE macro everywhere
This patch was generated by the following semantic patch (a trimmed down version of what is shipped with Linux sources): @@ type T; T[] E; @@ ( - (sizeof(E)/sizeof(*E)) + ARRAY_SIZE(E) | - (sizeof(E)/sizeof(E[...])) + ARRAY_SIZE(E) | - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) ) The only manual adjustment was to include utils.h in misc/nstat.c to make the macro known there. Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
parent
2d29321256
commit
62000e51e0
@ -319,7 +319,7 @@ static int brlink_modify(int argc, char **argv)
|
||||
} else if (strcmp(*argv, "state") == 0) {
|
||||
NEXT_ARG();
|
||||
char *endptr;
|
||||
size_t nstates = sizeof(port_states) / sizeof(*port_states);
|
||||
size_t nstates = ARRAY_SIZE(port_states);
|
||||
|
||||
state = strtol(*argv, &endptr, 10);
|
||||
if (!(**argv != '\0' && *endptr == '\0')) {
|
||||
|
@ -30,6 +30,7 @@
|
||||
|
||||
#include <json_writer.h>
|
||||
#include <SNAPSHOT.h>
|
||||
#include "utils.h"
|
||||
|
||||
int dump_zeros;
|
||||
int reset_history;
|
||||
@ -95,7 +96,7 @@ static int useless_number(const char *id)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sizeof(useless_numbers)/sizeof(*useless_numbers); i++)
|
||||
for (i = 0; i < ARRAY_SIZE(useless_numbers); i++)
|
||||
if (strcmp(id, useless_numbers[i]) == 0)
|
||||
return 1;
|
||||
return 0;
|
||||
|
@ -666,7 +666,7 @@ static int get_slabstat(struct slabstat *s)
|
||||
while (fgets(buf, sizeof(buf), fp) != NULL) {
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sizeof(slabstat_ids)/sizeof(slabstat_ids[0]); i++) {
|
||||
for (i = 0; i < ARRAY_SIZE(slabstat_ids); i++) {
|
||||
if (memcmp(buf, slabstat_ids[i], strlen(slabstat_ids[i])) == 0) {
|
||||
sscanf(buf, "%*s%d", ((int *)s) + i);
|
||||
cnt--;
|
||||
|
Loading…
Reference in New Issue
Block a user