diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-29 22:51:25 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-29 22:51:25 +0000 |
| commit | b6aae0f38194cd39960a898606ee65d4be93a895 (patch) | |
| tree | b73c92aefaf614291a71d05e9d28ca68f4ef021b /modutils | |
| parent | a41fdf331af344ecd3ec230a072857ea197e1890 (diff) | |
| download | busybox-b6aae0f38194cd39960a898606ee65d4be93a895.tar.gz | |
preparatory patch for -Wwrite-strings #2
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/insmod.c | 2 | ||||
| -rw-r--r-- | modutils/lsmod.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 1ad3c23a4..241db45e8 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -1782,7 +1782,7 @@ static int arch_single_init(ElfW(RelM) *rel, struct arch_single_entry *single, #if defined(USE_GOT_ENTRIES) || defined(USE_PLT_ENTRIES) -static struct obj_section *arch_xsect_init(struct obj_file *f, char *name, +static struct obj_section *arch_xsect_init(struct obj_file *f, const char *name, int offset, int size) { struct obj_section *myrelsec = obj_find_section(f, name); diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 987174081..af16f2c61 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c @@ -161,7 +161,7 @@ int lsmod_main(int argc, char **argv) printf(" %s", tok); tok = strtok(NULL, "\n"); if (!tok) - tok = ""; + tok = (char*)""; /* New-style has commas, or -. If so, truncate (other fields might follow). */ else if (strchr(tok, ',')) { @@ -170,9 +170,11 @@ int lsmod_main(int argc, char **argv) if (tok[strlen(tok)-1] == ',') tok[strlen(tok)-1] = '\0'; } else if (tok[0] == '-' - && (tok[1] == '\0' || isspace(tok[1]))) - tok = ""; - printf(" %s", tok); + && (tok[1] == '\0' || isspace(tok[1])) + ) { + tok = (char*)""; + } + printf(" %s", tok); } puts(""); free(line); |