diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-06-10 06:08:13 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-06-10 08:00:53 -0400 |
| commit | bb66fc67192bbd406fe9c22033f1bbbf3e7ec621 (patch) | |
| tree | 19948db86af0bc1d4662fca553d0a23c6e4d648d | |
| parent | 7eb6e340526adf14ed7cf7dfde8b9c6fc0741cfc (diff) | |
kbuild: trivial - use tabs for code indent where possible
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | scripts/basic/fixdep.c | 8 | ||||
| -rw-r--r-- | scripts/docproc.c | 56 | ||||
| -rw-r--r-- | scripts/kallsyms.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/conf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/gconf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/lxdialog/checklist.c | 4 | ||||
| -rw-r--r-- | scripts/kconfig/lxdialog/inputbox.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/lxdialog/menubox.c | 4 | ||||
| -rw-r--r-- | scripts/kconfig/lxdialog/util.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/mconf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/menu.c | 6 | ||||
| -rw-r--r-- | scripts/kconfig/zconf.l | 4 | ||||
| -rw-r--r-- | scripts/kconfig/zconf.lex.c_shipped | 4 | ||||
| -rw-r--r-- | scripts/kconfig/zconf.tab.c_shipped | 2 | ||||
| -rw-r--r-- | scripts/kconfig/zconf.y | 2 | ||||
| -rw-r--r-- | scripts/mod/file2alias.c | 42 | ||||
| -rw-r--r-- | scripts/mod/modpost.c | 30 | ||||
| -rw-r--r-- | scripts/mod/sumversion.c | 4 | ||||
| -rwxr-xr-x | scripts/tags.sh | 2 |
19 files changed, 89 insertions, 91 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 078fe1d64e7d..b30406860b73 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
| @@ -409,10 +409,10 @@ static void print_deps(void) | |||
| 409 | exit(2); | 409 | exit(2); |
| 410 | } | 410 | } |
| 411 | if (fstat(fd, &st) < 0) { | 411 | if (fstat(fd, &st) < 0) { |
| 412 | fprintf(stderr, "fixdep: error fstat'ing depfile: "); | 412 | fprintf(stderr, "fixdep: error fstat'ing depfile: "); |
| 413 | perror(depfile); | 413 | perror(depfile); |
| 414 | exit(2); | 414 | exit(2); |
| 415 | } | 415 | } |
| 416 | if (st.st_size == 0) { | 416 | if (st.st_size == 0) { |
| 417 | fprintf(stderr,"fixdep: %s is empty\n",depfile); | 417 | fprintf(stderr,"fixdep: %s is empty\n",depfile); |
| 418 | close(fd); | 418 | close(fd); |
diff --git a/scripts/docproc.c b/scripts/docproc.c index 2b69eaf5b646..e267e621431a 100644 --- a/scripts/docproc.c +++ b/scripts/docproc.c | |||
| @@ -154,7 +154,7 @@ int symfilecnt = 0; | |||
| 154 | static void add_new_symbol(struct symfile *sym, char * symname) | 154 | static void add_new_symbol(struct symfile *sym, char * symname) |
| 155 | { | 155 | { |
| 156 | sym->symbollist = | 156 | sym->symbollist = |
| 157 | realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); | 157 | realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); |
| 158 | sym->symbollist[sym->symbolcnt++].name = strdup(symname); | 158 | sym->symbollist[sym->symbolcnt++].name = strdup(symname); |
| 159 | } | 159 | } |
| 160 | 160 | ||
| @@ -215,7 +215,7 @@ static void find_export_symbols(char * filename) | |||
| 215 | char *p; | 215 | char *p; |
| 216 | char *e; | 216 | char *e; |
| 217 | if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) || | 217 | if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) || |
| 218 | ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) { | 218 | ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) { |
| 219 | /* Skip EXPORT_SYMBOL{_GPL} */ | 219 | /* Skip EXPORT_SYMBOL{_GPL} */ |
| 220 | while (isalnum(*p) || *p == '_') | 220 | while (isalnum(*p) || *p == '_') |
| 221 | p++; | 221 | p++; |
| @@ -291,28 +291,28 @@ static void extfunc(char * filename) { docfunctions(filename, FUNCTION); } | |||
| 291 | static void singfunc(char * filename, char * line) | 291 | static void singfunc(char * filename, char * line) |
| 292 | { | 292 | { |
| 293 | char *vec[200]; /* Enough for specific functions */ | 293 | char *vec[200]; /* Enough for specific functions */ |
| 294 | int i, idx = 0; | 294 | int i, idx = 0; |
| 295 | int startofsym = 1; | 295 | int startofsym = 1; |
| 296 | vec[idx++] = KERNELDOC; | 296 | vec[idx++] = KERNELDOC; |
| 297 | vec[idx++] = DOCBOOK; | 297 | vec[idx++] = DOCBOOK; |
| 298 | vec[idx++] = SHOWNOTFOUND; | 298 | vec[idx++] = SHOWNOTFOUND; |
| 299 | 299 | ||
| 300 | /* Split line up in individual parameters preceded by FUNCTION */ | 300 | /* Split line up in individual parameters preceded by FUNCTION */ |
| 301 | for (i=0; line[i]; i++) { | 301 | for (i=0; line[i]; i++) { |
| 302 | if (isspace(line[i])) { | 302 | if (isspace(line[i])) { |
| 303 | line[i] = '\0'; | 303 | line[i] = '\0'; |
| 304 | startofsym = 1; | 304 | startofsym = 1; |
| 305 | continue; | 305 | continue; |
| 306 | } | 306 | } |
| 307 | if (startofsym) { | 307 | if (startofsym) { |
| 308 | startofsym = 0; | 308 | startofsym = 0; |
| 309 | vec[idx++] = FUNCTION; | 309 | vec[idx++] = FUNCTION; |
| 310 | vec[idx++] = &line[i]; | 310 | vec[idx++] = &line[i]; |
| 311 | } | 311 | } |
| 312 | } | 312 | } |
| 313 | for (i = 0; i < idx; i++) { | 313 | for (i = 0; i < idx; i++) { |
| 314 | if (strcmp(vec[i], FUNCTION)) | 314 | if (strcmp(vec[i], FUNCTION)) |
| 315 | continue; | 315 | continue; |
| 316 | consume_symbol(vec[i + 1]); | 316 | consume_symbol(vec[i + 1]); |
| 317 | } | 317 | } |
| 318 | vec[idx++] = filename; | 318 | vec[idx++] = filename; |
| @@ -460,14 +460,14 @@ static void parse_file(FILE *infile) | |||
| 460 | break; | 460 | break; |
| 461 | case 'D': | 461 | case 'D': |
| 462 | while (*s && !isspace(*s)) s++; | 462 | while (*s && !isspace(*s)) s++; |
| 463 | *s = '\0'; | 463 | *s = '\0'; |
| 464 | symbolsonly(line+2); | 464 | symbolsonly(line+2); |
| 465 | break; | 465 | break; |
| 466 | case 'F': | 466 | case 'F': |
| 467 | /* filename */ | 467 | /* filename */ |
| 468 | while (*s && !isspace(*s)) s++; | 468 | while (*s && !isspace(*s)) s++; |
| 469 | *s++ = '\0'; | 469 | *s++ = '\0'; |
| 470 | /* function names */ | 470 | /* function names */ |
| 471 | while (isspace(*s)) | 471 | while (isspace(*s)) |
| 472 | s++; | 472 | s++; |
| 473 | singlefunctions(line +2, s); | 473 | singlefunctions(line +2, s); |
| @@ -515,11 +515,11 @@ int main(int argc, char *argv[]) | |||
| 515 | } | 515 | } |
| 516 | /* Open file, exit on error */ | 516 | /* Open file, exit on error */ |
| 517 | infile = fopen(argv[2], "r"); | 517 | infile = fopen(argv[2], "r"); |
| 518 | if (infile == NULL) { | 518 | if (infile == NULL) { |
| 519 | fprintf(stderr, "docproc: "); | 519 | fprintf(stderr, "docproc: "); |
| 520 | perror(argv[2]); | 520 | perror(argv[2]); |
| 521 | exit(2); | 521 | exit(2); |
| 522 | } | 522 | } |
| 523 | 523 | ||
| 524 | if (strcmp("doc", argv[1]) == 0) { | 524 | if (strcmp("doc", argv[1]) == 0) { |
| 525 | /* Need to do this in two passes. | 525 | /* Need to do this in two passes. |
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 1237dd7fb4ca..dc7aa45e80ce 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c | |||
| @@ -123,7 +123,7 @@ static int read_symbol(FILE *in, struct sym_entry *s) | |||
| 123 | } | 123 | } |
| 124 | if (strlen(str) > KSYM_NAME_LEN) { | 124 | if (strlen(str) > KSYM_NAME_LEN) { |
| 125 | fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n" | 125 | fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n" |
| 126 | "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n", | 126 | "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n", |
| 127 | str, strlen(str), KSYM_NAME_LEN); | 127 | str, strlen(str), KSYM_NAME_LEN); |
| 128 | return -1; | 128 | return -1; |
| 129 | } | 129 | } |
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index d19944f9c3ac..fef75fc756f4 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
| @@ -696,7 +696,7 @@ int main(int ac, char **av) | |||
| 696 | } else if (input_mode == savedefconfig) { | 696 | } else if (input_mode == savedefconfig) { |
| 697 | if (conf_write_defconfig(defconfig_file)) { | 697 | if (conf_write_defconfig(defconfig_file)) { |
| 698 | fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), | 698 | fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), |
| 699 | defconfig_file); | 699 | defconfig_file); |
| 700 | return 1; | 700 | return 1; |
| 701 | } | 701 | } |
| 702 | } else if (input_mode != listnewconfig) { | 702 | } else if (input_mode != listnewconfig) { |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index f2bee70e26f4..d0a35b21f308 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
| @@ -1404,7 +1404,7 @@ static void display_tree(struct menu *menu) | |||
| 1404 | && (tree == tree2)) | 1404 | && (tree == tree2)) |
| 1405 | continue; | 1405 | continue; |
| 1406 | /* | 1406 | /* |
| 1407 | if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) | 1407 | if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) |
| 1408 | || (view_mode == FULL_VIEW) | 1408 | || (view_mode == FULL_VIEW) |
| 1409 | || (view_mode == SPLIT_VIEW))*/ | 1409 | || (view_mode == SPLIT_VIEW))*/ |
| 1410 | 1410 | ||
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c index 3b15c08ec1fa..8d016faa28d7 100644 --- a/scripts/kconfig/lxdialog/checklist.c +++ b/scripts/kconfig/lxdialog/checklist.c | |||
| @@ -168,13 +168,13 @@ do_resize: | |||
| 168 | 168 | ||
| 169 | /* create new window for the list */ | 169 | /* create new window for the list */ |
| 170 | list = subwin(dialog, list_height, list_width, y + box_y + 1, | 170 | list = subwin(dialog, list_height, list_width, y + box_y + 1, |
| 171 | x + box_x + 1); | 171 | x + box_x + 1); |
| 172 | 172 | ||
| 173 | keypad(list, TRUE); | 173 | keypad(list, TRUE); |
| 174 | 174 | ||
| 175 | /* draw a box around the list items */ | 175 | /* draw a box around the list items */ |
| 176 | draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2, | ||
