Just for the fun of it.
Signed-off-by: Johannes Berg <[EMAIL PROTECTED]>
---
fwcutter/fwcutter.c | 12 ++++++------
fwcutter/fwcutter_list.h | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
--- b43-tools.orig/fwcutter/fwcutter.c 2007-11-23 12:14:43.000000000 +0100
+++ b43-tools/fwcutter/fwcutter.c 2007-11-23 12:15:26.000000000 +0100
@@ -553,7 +553,7 @@ static int do_cmp_arg(char **argv, int *
if (param) {
/* Skip the parameter on the next iteration. */
(*pos)++;
- if (*param == 0) {
+ if (!*param) {
printf("%s needs a parameter\n", arg);
return ARG_ERROR;
}
@@ -591,34 +591,34 @@ static int parse_args(int argc, char *ar
if (argc < 2)
goto out_usage;
for (i = 1; i < argc; i++) {
- res = cmp_arg(argv, &i, "--list", "-l", 0);
+ res = cmp_arg(argv, &i, "--list", "-l", NULL);
if (res == ARG_MATCH) {
cmdargs.mode = FWCM_LIST;
continue;
} else if (res == ARG_ERROR)
goto out;
- res = cmp_arg(argv, &i, "--version", "-v", 0);
+ res = cmp_arg(argv, &i, "--version", "-v", NULL);
if (res == ARG_MATCH) {
print_banner();
return 1;
} else if (res == ARG_ERROR)
goto out;
- res = cmp_arg(argv, &i, "--help", "-h", 0);
+ res = cmp_arg(argv, &i, "--help", "-h", NULL);
if (res == ARG_MATCH)
goto out_usage;
else if (res == ARG_ERROR)
goto out;
- res = cmp_arg(argv, &i, "--identify", "-i", 0);
+ res = cmp_arg(argv, &i, "--identify", "-i", NULL);
if (res == ARG_MATCH) {
cmdargs.mode = FWCM_IDENTIFY;
continue;
} else if (res == ARG_ERROR)
goto out;
- res = cmp_arg(argv, &i, "--unsupported", NULL, 0);
+ res = cmp_arg(argv, &i, "--unsupported", NULL, NULL);
if (res == ARG_MATCH) {
cmdargs.unsupported = 1;
continue;
--- b43-tools.orig/fwcutter/fwcutter_list.h 2007-11-23 12:14:24.000000000
+0100
+++ b43-tools/fwcutter/fwcutter_list.h 2007-11-23 12:14:38.000000000 +0100
@@ -1,6 +1,6 @@
/* file member lists */
-struct extract _e08665c5c5b66beb9c3b2dd54aa80cb3[] =
+static struct extract _e08665c5c5b66beb9c3b2dd54aa80cb3[] =
{
{ .name = "ucode2", .offset = 0x59ca0, .length = 0x3fe0, .type =
EXT_UCODE_1, },
{ .name = "ucode4", .offset = 0x5dc84, .length = 0x4e78, .type =
EXT_UCODE_1, },
@@ -21,7 +21,7 @@ struct extract _e08665c5c5b66beb9c3b2dd5
EXTRACT_LIST_END
};
-struct extract _9207bc565c2fc9fa1591f6c7911d3fc0[] =
+static struct extract _9207bc565c2fc9fa1591f6c7911d3fc0[] =
{
{ .name = "ucode4", .offset = 0x66220 + 0x7ad8, .length = 0x4e68,
.type = EXT_UCODE_1, },
{ .name = "ucode5", .offset = 0x66220 + 0xc944, .length = 0x5640,
.type = EXT_UCODE_2, },
@@ -48,7 +48,7 @@ struct extract _9207bc565c2fc9fa1591f6c7
EXTRACT_LIST_END
};
-struct extract _722e2e0d8cc04b8f118bb5afe6829ff9[] =
+static struct extract _722e2e0d8cc04b8f118bb5afe6829ff9[] =
{
{ .name = "ucode4", .offset = 0x76a10 + 0x8960, .length = 0x4e68,
.type = EXT_UCODE_1, },
{ .name = "ucode5", .offset = 0x76a10 + 0xd7cc, .length = 0x5640,
.type = EXT_UCODE_2, },
@@ -75,7 +75,7 @@ struct extract _722e2e0d8cc04b8f118bb5af
EXTRACT_LIST_END
};
-struct extract _1e4763b4cb8cfbaae43e5c6d3d6b2ae7[] =
+static struct extract _1e4763b4cb8cfbaae43e5c6d3d6b2ae7[] =
{
{ .name = "ucode5", .offset = 0x71c80 + 0xacd0, .length = 0x5768,
.type = EXT_UCODE_2, },
{ .name = "ucode9", .offset = 0x71c80 + 0x1043c, .length = 0x6240,
.type = EXT_UCODE_2, },
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
