diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/basic/docproc.c | 52 | ||||
-rw-r--r-- | scripts/kconfig/conf.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/expr.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/gconf.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/kconfig_load.c | 4 |
5 files changed, 31 insertions, 31 deletions
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c index a1b761bbd..e178d72d2 100644 --- a/scripts/basic/docproc.c +++ b/scripts/basic/docproc.c | |||
@@ -123,7 +123,7 @@ int symfilecnt = 0; | |||
123 | void add_new_symbol(struct symfile *sym, char * symname) | 123 | void add_new_symbol(struct symfile *sym, char * symname) |
124 | { | 124 | { |
125 | sym->symbollist = | 125 | sym->symbollist = |
126 | realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); | 126 | realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); |
127 | sym->symbollist[sym->symbolcnt++].name = strdup(symname); | 127 | sym->symbollist[sym->symbolcnt++].name = strdup(symname); |
128 | } | 128 | } |
129 | 129 | ||
@@ -182,7 +182,7 @@ void find_export_symbols(char * filename) | |||
182 | char *p; | 182 | char *p; |
183 | 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} */ |
187 | while (isalnum(*p) || *p == '_') | 187 | while (isalnum(*p) || *p == '_') |
188 | p++; | 188 | p++; |
@@ -256,24 +256,24 @@ void extfunc(char * filename) { docfunctions(filename, FUNCTION); } | |||
256 | void singfunc(char * filename, 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; |
260 | int startofsym = 1; | 260 | int startofsym = 1; |
261 | vec[idx++] = KERNELDOC; | 261 | vec[idx++] = KERNELDOC; |
262 | vec[idx++] = DOCBOOK; | 262 | vec[idx++] = DOCBOOK; |
263 | 263 | ||
264 | /* Split line up in individual parameters preceeded by FUNCTION */ | 264 | /* Split line up in individual parameters preceeded by FUNCTION */ |
265 | for (i=0; line[i]; i++) { | 265 | for (i=0; line[i]; i++) { |
266 | if (isspace(line[i])) { | 266 | if (isspace(line[i])) { |
267 | line[i] = '\0'; | 267 | line[i] = '\0'; |
268 | startofsym = 1; | 268 | startofsym = 1; |
269 | continue; | 269 | continue; |
270 | } | 270 | } |
271 | if (startofsym) { | 271 | if (startofsym) { |
272 | startofsym = 0; | 272 | startofsym = 0; |
273 | vec[idx++] = FUNCTION; | 273 | vec[idx++] = FUNCTION; |
274 | vec[idx++] = &line[i]; | 274 | vec[idx++] = &line[i]; |
275 | } | 275 | } |
276 | } | 276 | } |
277 | vec[idx++] = filename; | 277 | vec[idx++] = filename; |
278 | vec[idx] = NULL; | 278 | vec[idx] = NULL; |
279 | exec_kernel_doc(vec); | 279 | exec_kernel_doc(vec); |
@@ -307,14 +307,14 @@ void parse_file(FILE *infile) | |||
307 | break; | 307 | break; |
308 | case 'D': | 308 | case 'D': |
309 | while (*s && !isspace(*s)) s++; | 309 | while (*s && !isspace(*s)) s++; |
310 | *s = '\0'; | 310 | *s = '\0'; |
311 | symbolsonly(line+2); | 311 | symbolsonly(line+2); |
312 | break; | 312 | break; |
313 | case 'F': | 313 | case 'F': |
314 | /* filename */ | 314 | /* filename */ |
315 | while (*s && !isspace(*s)) s++; | 315 | while (*s && !isspace(*s)) s++; |
316 | *s++ = '\0'; | 316 | *s++ = '\0'; |
317 | /* function names */ | 317 | /* function names */ |
318 | while (isspace(*s)) | 318 | while (isspace(*s)) |
319 | s++; | 319 | s++; |
320 | singlefunctions(line +2, s); | 320 | singlefunctions(line +2, s); |
@@ -340,11 +340,11 @@ int main(int argc, char **argv) | |||
340 | } | 340 | } |
341 | /* Open file, exit on error */ | 341 | /* Open file, exit on error */ |
342 | infile = fopen(argv[2], "r"); | 342 | infile = fopen(argv[2], "r"); |
343 | if (infile == NULL) { | 343 | if (infile == NULL) { |
344 | fprintf(stderr, "docproc: "); | 344 | fprintf(stderr, "docproc: "); |
345 | perror(argv[2]); | 345 | perror(argv[2]); |
346 | exit(2); | 346 | exit(2); |
347 | } | 347 | } |
348 | 348 | ||
349 | if (strcmp("doc", argv[1]) == 0) | 349 | if (strcmp("doc", argv[1]) == 0) |
350 | { | 350 | { |
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 02693b791..2a1a59fc3 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -536,7 +536,7 @@ int main(int ac, char **av) | |||
536 | exit(0); | 536 | exit(0); |
537 | } | 537 | } |
538 | } | 538 | } |
539 | name = av[i]; | 539 | name = av[i]; |
540 | if (!name) { | 540 | if (!name) { |
541 | printf(_("%s: Kconfig file missing\n"), av[0]); | 541 | printf(_("%s: Kconfig file missing\n"), av[0]); |
542 | } | 542 | } |
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index 30e4f9d69..6f39e7a25 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c | |||
@@ -824,7 +824,7 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym) | |||
824 | default: | 824 | default: |
825 | ; | 825 | ; |
826 | } | 826 | } |
827 | return false; | 827 | return false; |
828 | } | 828 | } |
829 | 829 | ||
830 | struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2) | 830 | struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2) |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 6d372997d..fd3002bd3 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -1516,7 +1516,7 @@ static void display_tree(struct menu *menu) | |||
1516 | && (tree == tree2)) | 1516 | && (tree == tree2)) |
1517 | continue; | 1517 | continue; |
1518 | /* | 1518 | /* |
1519 | if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) | 1519 | if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) |
1520 | || (view_mode == FULL_VIEW) | 1520 | || (view_mode == FULL_VIEW) |
1521 | || (view_mode == SPLIT_VIEW))*/ | 1521 | || (view_mode == SPLIT_VIEW))*/ |
1522 | if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT)) | 1522 | if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT)) |
diff --git a/scripts/kconfig/kconfig_load.c b/scripts/kconfig/kconfig_load.c index dbdcaad82..5e87dd555 100644 --- a/scripts/kconfig/kconfig_load.c +++ b/scripts/kconfig/kconfig_load.c | |||
@@ -25,8 +25,8 @@ void kconfig_load(void) | |||
25 | #define P(name,type,arg) \ | 25 | #define P(name,type,arg) \ |
26 | { \ | 26 | { \ |
27 | name ## _p = dlsym(handle, #name); \ | 27 | name ## _p = dlsym(handle, #name); \ |
28 | if ((error = dlerror())) { \ | 28 | if ((error = dlerror())) { \ |
29 | fprintf(stderr, "%s\n", error); \ | 29 | fprintf(stderr, "%s\n", error); \ |
30 | exit(1); \ | 30 | exit(1); \ |
31 | } \ | 31 | } \ |
32 | } | 32 | } |