aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c2
-rw-r--r--modutils/lsmod.c10
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,
1782 1782
1783#if defined(USE_GOT_ENTRIES) || defined(USE_PLT_ENTRIES) 1783#if defined(USE_GOT_ENTRIES) || defined(USE_PLT_ENTRIES)
1784 1784
1785static struct obj_section *arch_xsect_init(struct obj_file *f, char *name, 1785static struct obj_section *arch_xsect_init(struct obj_file *f, const char *name,
1786 int offset, int size) 1786 int offset, int size)
1787{ 1787{
1788 struct obj_section *myrelsec = obj_find_section(f, name); 1788 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)
161 printf(" %s", tok); 161 printf(" %s", tok);
162 tok = strtok(NULL, "\n"); 162 tok = strtok(NULL, "\n");
163 if (!tok) 163 if (!tok)
164 tok = ""; 164 tok = (char*)"";
165 /* New-style has commas, or -. If so, 165 /* New-style has commas, or -. If so,
166 truncate (other fields might follow). */ 166 truncate (other fields might follow). */
167 else if (strchr(tok, ',')) { 167 else if (strchr(tok, ',')) {
@@ -170,9 +170,11 @@ int lsmod_main(int argc, char **argv)
170 if (tok[strlen(tok)-1] == ',') 170 if (tok[strlen(tok)-1] == ',')
171 tok[strlen(tok)-1] = '\0'; 171 tok[strlen(tok)-1] = '\0';
172 } else if (tok[0] == '-' 172 } else if (tok[0] == '-'
173 && (tok[1] == '\0' || isspace(tok[1]))) 173 && (tok[1] == '\0' || isspace(tok[1]))
174 tok = ""; 174 ) {
175 printf(" %s", tok); 175 tok = (char*)"";
176 }
177 printf(" %s", tok);
176 } 178 }
177 puts(""); 179 puts("");
178 free(line); 180 free(line);