X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2F80211debug.c;h=6aefad5e770c8fb4e4a5e4db47e606aa21f5a57f;hb=c5246021b7b8580c2aeb0a145903acc07d246ac1;hp=734ef9601f069e6d8d967cbb08abf6b95e35c0d5;hpb=ec5e8e0a11d3cb7d34a0c3c3d026e0a51dc55609;p=madwifi%2F.git

diff --git a/tools/80211debug.c b/tools/80211debug.c
index 734ef96..6aefad5 100644
--- a/tools/80211debug.c
+++ b/tools/80211debug.c
@@ -49,7 +49,8 @@
 #include <getopt.h>
 #include <err.h>
 
-#define	N(a)	(sizeof(a)/sizeof(a[0]))
+#undef ARRAY_SIZE
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 static const char *progname;
 
@@ -122,7 +123,7 @@ getflag(const char *name, int len)
 {
 	int i;
 
-	for (i = 0; i < N(flags); i++)
+	for (i = 0; i < ARRAY_SIZE(flags); i++)
 		if (strncasecmp(flags[i].name, name, len) == 0)
 			return flags[i].bit;
 	return 0;
@@ -135,7 +136,7 @@ usage(void)
 
 	fprintf(stderr, "usage: %s [-i interface] [(+/-) flags]\n", progname);
 	fprintf(stderr, "\twhere flags are:\n\n");
-	for (i = 0; i < N(flags); i++)
+	for (i = 0; i < ARRAY_SIZE(flags); i++)
 		printf("\t%12s\t0x%08x\t%s\n", flags[i].name, flags[i].bit, flags[i].desc);
 	exit(-1);
 }
@@ -167,7 +168,7 @@ sysctlbyname(const char *oid0, void *oldp, size_t *oldlenp,
 		if (fd == NULL)
 			return -1;
 		/* XXX: only handle ints */
-		if (fscanf(fd, "%u", (int *) oldp) != 1) {
+		if (fscanf(fd, "%u", (int *)oldp) != 1) {
 			fclose(fd);
 			return -1;
 		}
@@ -259,14 +260,14 @@ main(int argc, char *argv[])
 	} else
 		printf("%s: 0x%08x", oid, debug);
 	sep = "<";
-	for (i = 0; i < N(flags); i++)
+	for (i = 0; i < ARRAY_SIZE(flags); i++)
 		if (debug & flags[i].bit) {
 			printf("%s%s", sep, flags[i].name);
 			sep = ",";
 		}
 	printf("%s\n", *sep != '<' ? ">" : "");
 	printf("Details:\n");
-	for (i = 0; i < N(flags); i++)
+	for (i = 0; i < ARRAY_SIZE(flags); i++)
 		printf("%12s %s 0x%08x - %s\n", flags[i].name, debug & flags[i].bit ? "+" : " ", flags[i].bit, flags[i].desc);
 	return 0;
 }