preparatory patch for -Wwrite-strings #2
This commit is contained in:
@@ -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);
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user