From: Michael Buesch <mb@bu3sch.de>
Date: Thu, 26 Nov 2009 14:18:15 +0000 (+0100)
Subject: disassembler: Fix sparse warnings
X-Git-Tag: b43-fwcutter-013~7
X-Git-Url: https://jxself.org/git/?p=b43-tools.git;a=commitdiff_plain;h=d24a5147fd500f6bdc76599d2a4e471b15a73c7f

disassembler: Fix sparse warnings

Signed-off-by: Michael Buesch <mb@bu3sch.de>
---

diff --git a/disassembler/Makefile b/disassembler/Makefile
index 41b3ad9..8944a21 100644
--- a/disassembler/Makefile
+++ b/disassembler/Makefile
@@ -16,7 +16,7 @@ endif
 PREFIX		?= /usr/local
 CFLAGS		?= -O2 -fomit-frame-pointer
 CFLAGS		+= -std=gnu99 -Wall -D_BSD_SOURCE -D_GNU_SOURCE
-SPARSEFLAGS	= $(CFLAGS)
+SPARSEFLAGS	= $(CFLAGS) -D__transparent_union__=__unused__ -D_STRING_ARCH_unaligned=1
 LDFLAGS		?=
 
 BIN = b43-dasm
diff --git a/disassembler/args.c b/disassembler/args.c
index d48100e..67ba2fc 100644
--- a/disassembler/args.c
+++ b/disassembler/args.c
@@ -66,7 +66,7 @@ static int do_cmp_arg(char **argv, int *pos,
 		if (param) {
 			/* Skip the parameter on the next iteration. */
 			(*pos)++;
-			if (*param == 0) {
+			if (*param == NULL) {
 				fprintf(stderr, "%s needs a parameter\n", arg);
 				return ARG_ERROR;
 			}
@@ -117,14 +117,14 @@ int parse_args(int argc, char **argv)
 	outfile_name = NULL;
 
 	for (i = 1; i < argc; i++) {
-		if ((res = cmp_arg(argv, &i, "--help", "-h", 0)) == ARG_MATCH) {
+		if ((res = cmp_arg(argv, &i, "--help", "-h", NULL)) == ARG_MATCH) {
 			usage(argc, argv);
 			return 1;
-		} else if ((res = cmp_arg(argv, &i, "--nohdr", 0, 0)) == ARG_MATCH) {
+		} else if ((res = cmp_arg(argv, &i, "--nohdr", NULL, NULL)) == ARG_MATCH) {
 			cmdargs.no_header = 1;
-		} else if ((res = cmp_arg(argv, &i, "--paddr", 0, 0)) == ARG_MATCH) {
+		} else if ((res = cmp_arg(argv, &i, "--paddr", NULL, NULL)) == ARG_MATCH) {
 			cmdargs.print_addresses = 1;
-		} else if ((res = cmp_arg(argv, &i, "--debug", "-d", 0)) == ARG_MATCH) {
+		} else if ((res = cmp_arg(argv, &i, "--debug", "-d", NULL)) == ARG_MATCH) {
 			_debug++;
 		} else if ((res = cmp_arg(argv, &i, "--arch", "-a", &param)) == ARG_MATCH) {
 			unsigned long arch;
diff --git a/disassembler/main.h b/disassembler/main.h
index 354d001..633411a 100644
--- a/disassembler/main.h
+++ b/disassembler/main.h
@@ -26,9 +26,9 @@ struct fw_header {
 #define FW_HDR_VER	0x01
 
 
-FILE *infile;
-FILE *outfile;
-const char *infile_name;
-const char *outfile_name;
+extern FILE *infile;
+extern FILE *outfile;
+extern const char *infile_name;
+extern const char *outfile_name;
 
 #endif /* B43_DASM_MAIN_H_ */