提交 48b9d03c 编写于 作者: J J.A. Magallon 提交者: Linus Torvalds

[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: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 f14c6fd0
...@@ -52,7 +52,7 @@ FILEONLY *internalfunctions; ...@@ -52,7 +52,7 @@ FILEONLY *internalfunctions;
FILEONLY *externalfunctions; FILEONLY *externalfunctions;
FILEONLY *symbolsonly; FILEONLY *symbolsonly;
typedef void FILELINE(char * file, signed char * line); typedef void FILELINE(char * file, char * line);
FILELINE * singlefunctions; FILELINE * singlefunctions;
FILELINE * entity_system; FILELINE * entity_system;
...@@ -148,9 +148,9 @@ struct symfile * filename_exist(char * filename) ...@@ -148,9 +148,9 @@ struct symfile * filename_exist(char * filename)
* Files are separated by tabs. * Files are separated by tabs.
*/ */
void adddep(char * file) { printf("\t%s", file); } 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 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 */ /* Echo the line without further action */
void printline(char * line) { printf("%s", line); } void printline(char * line) { printf("%s", line); }
...@@ -179,8 +179,8 @@ void find_export_symbols(char * filename) ...@@ -179,8 +179,8 @@ void find_export_symbols(char * filename)
perror(real_filename); perror(real_filename);
} }
while(fgets(line, MAXLINESZ, fp)) { while(fgets(line, MAXLINESZ, fp)) {
signed char *p; char *p;
signed char *e; char *e;
if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) || if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) ||
((p = strstr(line, "EXPORT_SYMBOL")) != 0)) { ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) {
/* Skip EXPORT_SYMBOL{_GPL} */ /* Skip EXPORT_SYMBOL{_GPL} */
...@@ -253,7 +253,7 @@ void extfunc(char * filename) { docfunctions(filename, FUNCTION); } ...@@ -253,7 +253,7 @@ void extfunc(char * filename) { docfunctions(filename, FUNCTION); }
* Call kernel-doc with the following parameters: * Call kernel-doc with the following parameters:
* kernel-doc -docbook -function function1 [-function function2] * 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 */ char *vec[200]; /* Enough for specific functions */
int i, idx = 0; int i, idx = 0;
...@@ -290,7 +290,7 @@ void singfunc(char * filename, signed char * line) ...@@ -290,7 +290,7 @@ void singfunc(char * filename, signed char * line)
void parse_file(FILE *infile) void parse_file(FILE *infile)
{ {
char line[MAXLINESZ]; char line[MAXLINESZ];
signed char * s; char * s;
while(fgets(line, MAXLINESZ, infile)) { while(fgets(line, MAXLINESZ, infile)) {
if (line[0] == '!') { if (line[0] == '!') {
s = line + 2; s = line + 2;
......
...@@ -212,23 +212,23 @@ void use_config(char *m, int slen) ...@@ -212,23 +212,23 @@ void use_config(char *m, int slen)
if (*p == '_') if (*p == '_')
*p = '/'; *p = '/';
else else
*p = tolower((unsigned char)*p); *p = tolower((int)*p);
} }
printf(" $(wildcard include/config/%s.h) \\\n", s); 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); int *end = (int *) (map + len);
/* start at +1, so that p can never be < map */ /* start at +1, so that p can never be < map */
int *m = (int *) map + 1; int *m = (int *) map + 1;
signed char *p, *q; char *p, *q;
for (; m < end; m++) { for (; m < end; m++) {
if (*m == INT_CONF) { p = (signed char *) m ; goto conf; } if (*m == INT_CONF) { p = (char *) m ; goto conf; }
if (*m == INT_ONFI) { p = (signed char *) m-1; goto conf; } if (*m == INT_ONFI) { p = (char *) m-1; goto conf; }
if (*m == INT_NFIG) { p = (signed char *) m-2; goto conf; } if (*m == INT_NFIG) { p = (char *) m-2; goto conf; }
if (*m == INT_FIG_) { p = (signed char *) m-3; goto conf; } if (*m == INT_FIG_) { p = (char *) m-3; goto conf; }
continue; continue;
conf: conf:
if (p > map + len - 7) if (p > map + len - 7)
...@@ -291,9 +291,9 @@ void do_config_file(char *filename) ...@@ -291,9 +291,9 @@ void do_config_file(char *filename)
void parse_dep_file(void *map, size_t len) void parse_dep_file(void *map, size_t len)
{ {
signed char *m = map; char *m = map;
signed char *end = m + len; char *end = m + len;
signed char *p; char *p;
char s[PATH_MAX]; char s[PATH_MAX];
p = strchr(m, ':'); p = strchr(m, ':');
......
...@@ -104,7 +104,7 @@ int main(int argc, const char * argv []) ...@@ -104,7 +104,7 @@ int main(int argc, const char * argv [])
/* Read config lines. */ /* Read config lines. */
while (fgets(line, buffer_size, fp_config)) while (fgets(line, buffer_size, fp_config))
{ {
const signed char * str_config; const char * str_config;
int is_same; int is_same;
int itarget; int itarget;
......
...@@ -31,14 +31,14 @@ char *defconfig_file; ...@@ -31,14 +31,14 @@ char *defconfig_file;
static int indent = 1; static int indent = 1;
static int valid_stdin = 1; static int valid_stdin = 1;
static int conf_cnt; static int conf_cnt;
static signed char line[128]; static char line[128];
static struct menu *rootEntry; static struct menu *rootEntry;
static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n"); 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; int l;
while ((isspace(*p))) while ((isspace(*p)))
......
...@@ -27,10 +27,10 @@ const char *conf_confnames[] = { ...@@ -27,10 +27,10 @@ const char *conf_confnames[] = {
NULL, NULL,
}; };
static char *conf_expand_value(const signed char *in) static char *conf_expand_value(const char *in)
{ {
struct symbol *sym; struct symbol *sym;
const signed char *src; const char *src;
static char res_value[SYMBOL_MAXLENGTH]; static char res_value[SYMBOL_MAXLENGTH];
char *dst, name[SYMBOL_MAXLENGTH]; char *dst, name[SYMBOL_MAXLENGTH];
......
...@@ -255,8 +255,8 @@ search_help[] = N_( ...@@ -255,8 +255,8 @@ search_help[] = N_(
" USB$ => find all CONFIG_ symbols ending with USB\n" " USB$ => find all CONFIG_ symbols ending with USB\n"
"\n"); "\n");
static signed char buf[4096], *bufptr = buf; static char buf[4096], *bufptr = buf;
static signed char input_buf[4096]; static char input_buf[4096];
static char filename[PATH_MAX+1] = ".config"; static char filename[PATH_MAX+1] = ".config";
static char *args[1024], **argptr = args; static char *args[1024], **argptr = args;
static int indent; static int indent;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册