Skip to content

Commit

Permalink
[PATCH] Kill signed chars
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
J.A. Magallon authored and Linus Torvalds committed Jun 25, 2005
1 parent f14c6fd commit 48b9d03
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
14 changes: 7 additions & 7 deletions scripts/basic/docproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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); }
Expand Down Expand Up @@ -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} */
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions scripts/basic/fixdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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, ':');
Expand Down
2 changes: 1 addition & 1 deletion scripts/basic/split-include.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions scripts/kconfig/conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
4 changes: 2 additions & 2 deletions scripts/kconfig/confdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down
4 changes: 2 additions & 2 deletions scripts/kconfig/mconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 48b9d03

Please sign in to comment.