diff options
author | J.A. Magallon <jamagallon@able.es> | 2005-06-25 17:59:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:25:07 -0400 |
commit | 48b9d03c5f20a0585bb6f7d8c4abad3661df5d75 (patch) | |
tree | 01168bdbbfd92510412afb38d976d78f77f324f7 | |
parent | f14c6fd0fc9fbaf242254c84ba2632decb25e91a (diff) |
[PATCH] Kill signed chars
scripts/ is full of mismatches between char* params an signed char* arguments,
and viceversa. gcc4 now complaints loud about this. Patch below deletes all
those 'signed'.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | scripts/basic/docproc.c | 14 | ||||
-rw-r--r-- | scripts/basic/fixdep.c | 20 | ||||
-rw-r--r-- | scripts/basic/split-include.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/conf.c | 6 | ||||
-rw-r--r-- | scripts/kconfig/confdata.c | 4 | ||||
-rw-r--r-- | scripts/kconfig/mconf.c | 4 |
6 files changed, 25 insertions, 25 deletions
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c index 8ca7ecdb68fb..cb02baa63256 100644 --- a/scripts/basic/docproc.c +++ b/scripts/basic/docproc.c | |||
@@ -52,7 +52,7 @@ FILEONLY *internalfunctions; | |||
52 | FILEONLY *externalfunctions; | 52 | FILEONLY *externalfunctions; |
53 | FILEONLY *symbolsonly; | 53 | FILEONLY *symbolsonly; |
54 | 54 | ||
55 | typedef void FILELINE(char * file, signed char * line); | 55 | typedef void FILELINE(char * file, char * line); |
56 | FILELINE * singlefunctions; | 56 | FILELINE * singlefunctions; |
57 | FILELINE * entity_system; | 57 | FILELINE * entity_system; |
58 | 58 | ||
@@ -148,9 +148,9 @@ struct symfile * filename_exist(char * filename) | |||
148 | * Files are separated by tabs. | 148 | * Files are separated by tabs. |
149 | */ | 149 | */ |
150 | void adddep(char * file) { printf("\t%s", file); } | 150 | void adddep(char * file) { printf("\t%s", file); } |
151 | void adddep2(char * file, signed char * line) { line = line; adddep(file); } | 151 | void adddep2(char * file, char * line) { line = line; adddep(file); } |
152 | void noaction(char * line) { line = line; } | 152 | void noaction(char * line) { line = line; } |
153 | void noaction2(char * file, signed char * line) { file = file; line = line; } | 153 | void noaction2(char * file, char * line) { file = file; line = line; } |
154 | 154 | ||
155 | /* Echo the line without further action */ | 155 | /* Echo the line without further action */ |
156 | void printline(char * line) { printf("%s", line); } | 156 | void printline(char * line) { printf("%s", line); } |
@@ -179,8 +179,8 @@ void find_export_symbols(char * filename) | |||
179 | perror(real_filename); | 179 | perror(real_filename); |
180 | } | 180 | } |
181 | while(fgets(line, MAXLINESZ, fp)) { | 181 | while(fgets(line, MAXLINESZ, fp)) { |
182 | signed char *p; | 182 | char *p; |
183 | signed char *e; | 183 | char *e; |
184 | if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) || | 184 | if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) || |
185 | ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) { | 185 | ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) { |
186 | /* Skip EXPORT_SYMBOL{_GPL} */ | 186 | /* Skip EXPORT_SYMBOL{_GPL} */ |
@@ -253,7 +253,7 @@ void extfunc(char * filename) { docfunctions(filename, FUNCTION); } | |||
253 | * Call kernel-doc with the following parameters: | 253 | * Call kernel-doc with the following parameters: |
254 | * kernel-doc -docbook -function function1 [-function function2] | 254 | * kernel-doc -docbook -function function1 [-function function2] |
255 | */ | 255 | */ |
256 | void singfunc(char * filename, signed char * line) | 256 | void singfunc(char * filename, char * line) |
257 | { | 257 | { |
258 | char *vec[200]; /* Enough for specific functions */ | 258 | char *vec[200]; /* Enough for specific functions */ |
259 | int i, idx = 0; | 259 | int i, idx = 0; |
@@ -290,7 +290,7 @@ void singfunc(char * filename, signed char * line) | |||
290 | void parse_file(FILE *infile) | 290 | void parse_file(FILE *infile) |
291 | { | 291 | { |
292 | char line[MAXLINESZ]; | 292 | char line[MAXLINESZ]; |
293 | signed char * s; | 293 | char * s; |
294 | while(fgets(line, MAXLINESZ, infile)) { | 294 | while(fgets(line, MAXLINESZ, infile)) { |
295 | if (line[0] == '!') { | 295 | if (line[0] == '!') { |
296 | s = line + 2; | 296 | s = line + 2; |
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 7f42c5d8a5a2..0b61bea869f7 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
@@ -212,23 +212,23 @@ void use_config(char *m, int slen) | |||
212 | if (*p == '_') | 212 | if (*p == '_') |
213 | *p = '/'; | 213 | *p = '/'; |
214 | else | 214 | else |
215 | *p = tolower((unsigned char)*p); | 215 | *p = tolower((int)*p); |
216 | } | 216 | } |
217 | printf(" $(wildcard include/config/%s.h) \\\n", s); | 217 | printf(" $(wildcard include/config/%s.h) \\\n", s); |
218 | } | 218 | } |
219 | 219 | ||
220 | void parse_config_file(signed char *map, size_t len) | 220 | void parse_config_file(char *map, size_t len) |
221 | { | 221 | { |
222 | int *end = (int *) (map + len); | 222 | int *end = (int *) (map + len); |
223 | /* start at +1, so that p can never be < map */ | 223 | /* start at +1, so that p can never be < map */ |
224 | int *m = (int *) map + 1; | 224 | int *m = (int *) map + 1; |
225 | signed char *p, *q; | 225 | char *p, *q; |
226 | 226 | ||
227 | for (; m < end; m++) { | 227 | for (; m < end; m++) { |
228 | if (*m == INT_CONF) { p = (signed char *) m ; goto conf; } | 228 | if (*m == INT_CONF) { p = (char *) m ; goto conf; } |
229 | if (*m == INT_ONFI) { p = (signed char *) m-1; goto conf; } | 229 | if (*m == INT_ONFI) { p = (char *) m-1; goto conf; } |
230 | if (*m == INT_NFIG) { p = (signed char *) m-2; goto conf; } | 230 | if (*m == INT_NFIG) { p = (char *) m-2; goto conf; } |
231 | if (*m == INT_FIG_) { p = (signed char *) m-3; goto conf; } | 231 | if (*m == INT_FIG_) { p = (char *) m-3; goto conf; } |
232 | continue; | 232 | continue; |
233 | conf: | 233 | conf: |
234 | if (p > map + len - 7) | 234 | if (p > map + len - 7) |
@@ -291,9 +291,9 @@ void do_config_file(char *filename) | |||
291 | 291 | ||
292 | void parse_dep_file(void *map, size_t len) | 292 | void parse_dep_file(void *map, size_t len) |
293 | { | 293 | { |
294 | signed char *m = map; | 294 | char *m = map; |
295 | signed char *end = m + len; | 295 | char *end = m + len; |
296 | signed char *p; | 296 | char *p; |
297 | char s[PATH_MAX]; | 297 | char s[PATH_MAX]; |
298 | 298 | ||
299 | p = strchr(m, ':'); | 299 | p = strchr(m, ':'); |
diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c index 60fc4d8ebaa9..459c45276cb1 100644 --- a/scripts/basic/split-include.c +++ b/scripts/basic/split-include.c | |||
@@ -104,7 +104,7 @@ int main(int argc, const char * argv []) | |||
104 | /* Read config lines. */ | 104 | /* Read config lines. */ |
105 | while (fgets(line, buffer_size, fp_config)) | 105 | while (fgets(line, buffer_size, fp_config)) |
106 | { | 106 | { |
107 | const signed char * str_config; | 107 | const char * str_config; |
108 | int is_same; | 108 | int is_same; |
109 | int itarget; | 109 | int itarget; |
110 | 110 | ||
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 70e7264c6942..bc20cab9d0d6 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -31,14 +31,14 @@ char *defconfig_file; | |||
31 | static int indent = 1; | 31 | static int indent = 1; |
32 | static int valid_stdin = 1; | 32 | static int valid_stdin = 1; |
33 | static int conf_cnt; | 33 | static int conf_cnt; |
34 | static signed char line[128]; | 34 | static char line[128]; |
35 | static struct menu *rootEntry; | 35 | static struct menu *rootEntry; |
36 | 36 | ||
37 | static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n"); | 37 | static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n"); |
38 | 38 | ||
39 | static void strip(signed char *str) | 39 | static void strip(char *str) |
40 | { | 40 | { |
41 | signed char *p = str; | 41 | char *p = str; |
42 | int l; | 42 | int l; |
43 | 43 | ||
44 | while ((isspace(*p))) | 44 | while ((isspace(*p))) |
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 2755c459d780..02f670cc6bb9 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
@@ -27,10 +27,10 @@ const char *conf_confnames[] = { | |||
27 | NULL, | 27 | NULL, |
28 | }; | 28 | }; |
29 | 29 | ||
30 | static char *conf_expand_value(const signed char *in) | 30 | static char *conf_expand_value(const char *in) |
31 | { | 31 | { |
32 | struct symbol *sym; | 32 | struct symbol *sym; |
33 | const signed char *src; | 33 | const char *src; |
34 | static char res_value[SYMBOL_MAXLENGTH]; | 34 | static char res_value[SYMBOL_MAXLENGTH]; |
35 | char *dst, name[SYMBOL_MAXLENGTH]; | 35 | char *dst, name[SYMBOL_MAXLENGTH]; |
36 | 36 | ||
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 98039bf721f6..457bec29511d 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -255,8 +255,8 @@ search_help[] = N_( | |||
255 | " USB$ => find all CONFIG_ symbols ending with USB\n" | 255 | " USB$ => find all CONFIG_ symbols ending with USB\n" |
256 | "\n"); | 256 | "\n"); |
257 | 257 | ||
258 | static signed char buf[4096], *bufptr = buf; | 258 | static char buf[4096], *bufptr = buf; |
259 | static signed char input_buf[4096]; | 259 | static char input_buf[4096]; |
260 | static char filename[PATH_MAX+1] = ".config"; | 260 | static char filename[PATH_MAX+1] = ".config"; |
261 | static char *args[1024], **argptr = args; | 261 | static char *args[1024], **argptr = args; |
262 | static int indent; | 262 | static int indent; |