From 48b9d03c5f20a0585bb6f7d8c4abad3661df5d75 Mon Sep 17 00:00:00 2001 From: "J.A. Magallon" Date: Sat, 25 Jun 2005 14:59:22 -0700 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- scripts/basic/docproc.c | 14 +++++++------- scripts/basic/fixdep.c | 20 ++++++++++---------- scripts/basic/split-include.c | 2 +- scripts/kconfig/conf.c | 6 +++--- scripts/kconfig/confdata.c | 4 ++-- 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; FILEONLY *externalfunctions; FILEONLY *symbolsonly; -typedef void FILELINE(char * file, signed char * line); +typedef void FILELINE(char * file, char * line); FILELINE * singlefunctions; FILELINE * entity_system; @@ -148,9 +148,9 @@ struct symfile * filename_exist(char * filename) * Files are separated by tabs. */ void adddep(char * file) { printf("\t%s", file); } -void adddep2(char * file, signed char * line) { line = line; adddep(file); } +void adddep2(char * file, char * line) { line = line; adddep(file); } void noaction(char * line) { line = line; } -void noaction2(char * file, signed char * line) { file = file; line = line; } +void noaction2(char * file, char * line) { file = file; line = line; } /* Echo the line without further action */ void printline(char * line) { printf("%s", line); } @@ -179,8 +179,8 @@ void find_export_symbols(char * filename) perror(real_filename); } while(fgets(line, MAXLINESZ, fp)) { - signed char *p; - signed char *e; + char *p; + char *e; if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) || ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) { /* Skip EXPORT_SYMBOL{_GPL} */ @@ -253,7 +253,7 @@ void extfunc(char * filename) { docfunctions(filename, FUNCTION); } * Call kernel-doc with the following parameters: * kernel-doc -docbook -function function1 [-function function2] */ -void singfunc(char * filename, signed char * line) +void singfunc(char * filename, char * line) { char *vec[200]; /* Enough for specific functions */ int i, idx = 0; @@ -290,7 +290,7 @@ void singfunc(char * filename, signed char * line) void parse_file(FILE *infile) { char line[MAXLINESZ]; - signed char * s; + char * s; while(fgets(line, MAXLINESZ, infile)) { if (line[0] == '!') { 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) if (*p == '_') *p = '/'; else - *p = tolower((unsigned char)*p); + *p = tolower((int)*p); } printf(" $(wildcard include/config/%s.h) \\\n", s); } -void parse_config_file(signed char *map, size_t len) +void parse_config_file(char *map, size_t len) { int *end = (int *) (map + len); /* start at +1, so that p can never be < map */ int *m = (int *) map + 1; - signed char *p, *q; + char *p, *q; for (; m < end; m++) { - if (*m == INT_CONF) { p = (signed char *) m ; goto conf; } - if (*m == INT_ONFI) { p = (signed char *) m-1; goto conf; } - if (*m == INT_NFIG) { p = (signed char *) m-2; goto conf; } - if (*m == INT_FIG_) { p = (signed char *) m-3; goto conf; } + if (*m == INT_CONF) { p = (char *) m ; goto conf; } + if (*m == INT_ONFI) { p = (char *) m-1; goto conf; } + if (*m == INT_NFIG) { p = (char *) m-2; goto conf; } + if (*m == INT_FIG_) { p = (char *) m-3; goto conf; } continue; conf: if (p > map + len - 7) @@ -291,9 +291,9 @@ void do_config_file(char *filename) void parse_dep_file(void *map, size_t len) { - signed char *m = map; - signed char *end = m + len; - signed char *p; + char *m = map; + char *end = m + len; + char *p; char s[PATH_MAX]; 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 []) /* Read config lines. */ while (fgets(line, buffer_size, fp_config)) { - const signed char * str_config; + const char * str_config; int is_same; int itarget; 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; static int indent = 1; static int valid_stdin = 1; static int conf_cnt; -static signed char line[128]; +static char line[128]; static struct menu *rootEntry; static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n"); -static void strip(signed char *str) +static void strip(char *str) { - signed char *p = str; + char *p = str; int l; 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[] = { NULL, }; -static char *conf_expand_value(const signed char *in) +static char *conf_expand_value(const char *in) { struct symbol *sym; - const signed char *src; + const char *src; static char res_value[SYMBOL_MAXLENGTH]; char *dst, name[SYMBOL_MAXLENGTH]; 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_( " USB$ => find all CONFIG_ symbols ending with USB\n" "\n"); -static signed char buf[4096], *bufptr = buf; -static signed char input_buf[4096]; +static char buf[4096], *bufptr = buf; +static char input_buf[4096]; static char filename[PATH_MAX+1] = ".config"; static char *args[1024], **argptr = args; static int indent; -- 2.30.2