kbuild: trivial - use tabs for code indent where possible

Masahiro Yamada committed 12 years ago

Commit bb66fc61 parent 7eb6e3419 files · +89 −91Browse files

Showing the changes to scripts (19 of 19 files). Show all

Unified · Split

19 files

scripts/basic/fixdep.c +4 −4
scripts/docproc.c +28 −28
scripts/kallsyms.c +1 −1
scripts/kconfig/conf.c +1 −1
scripts/kconfig/gconf.c +1 −1
scripts/kconfig/lxdialog/checklist.c +2 −2
scripts/kconfig/lxdialog/inputbox.c +1 −1
scripts/kconfig/lxdialog/menubox.c +2 −2
scripts/kconfig/lxdialog/util.c +1 −1
scripts/kconfig/mconf.c +1 −1
scripts/kconfig/menu.c +3 −3
scripts/kconfig/zconf.l +2 −2
scripts/kconfig/zconf.lex.c_shipped +2 −2
scripts/kconfig/zconf.tab.c_shipped +1 −1
scripts/kconfig/zconf.y +1 −1
scripts/mod/file2alias.c +20 −22
scripts/mod/modpost.c +15 −15
scripts/mod/sumversion.c +2 −2
scripts/tags.sh +1 −1

@@ -409,10 +409,10 @@ static void print_deps(void) · 408 unmodified lines
409	409	exit(2);
410	410	}
411	411	if (fstat(fd, &st) < 0) {
412		− fprintf(stderr, "fixdep: error fstat'ing depfile: ");
413		− perror(depfile);
414		− exit(2);
415		− }
	412	+ fprintf(stderr, "fixdep: error fstat'ing depfile: ");
	413	+ perror(depfile);
	414	+ exit(2);
	415	+ }
416	416	if (st.st_size == 0) {
417	417	fprintf(stderr,"fixdep: %s is empty\n",depfile);
418	418	close(fd);

scripts/docproc.c+28−28

@@ -154,7 +154,7 @@ int symfilecnt = 0; · 153 unmodified lines
154	154	static void add_new_symbol(struct symfile sym, char symname)
155	155	{
156	156	sym->symbollist =
157		− realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
	157	+ realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
158	158	sym->symbollist[sym->symbolcnt++].name = strdup(symname);
159	159	}
160	160
@@ -215,7 +215,7 @@ static void find_export_symbols(char * filename) · 54 unmodified lines
215	215	char *p;
216	216	char *e;
217	217	if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) \|\|
218		− ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
	218	+ ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
219	219	/* Skip EXPORT_SYMBOL{_GPL} */
220	220	while (isalnum(p) \|\| p == '_')
221	221	p++;
@@ -291,28 +291,28 @@ static void extfunc(char * filename) { docfunctions(filename, FUNCTION); } · 69 unmodified lines
291	291	static void singfunc(char * filename, char * line)
292	292	{
293	293	char vec[200]; / Enough for specific functions */
294		− int i, idx = 0;
295		− int startofsym = 1;
	294	+ int i, idx = 0;
	295	+ int startofsym = 1;
296	296	vec[idx++] = KERNELDOC;
297	297	vec[idx++] = DOCBOOK;
298	298	vec[idx++] = SHOWNOTFOUND;
299	299
300		− /* Split line up in individual parameters preceded by FUNCTION */
301		− for (i=0; line[i]; i++) {
302		− if (isspace(line[i])) {
303		− line[i] = '\0';
304		− startofsym = 1;
305		− continue;
306		− }
307		− if (startofsym) {
308		− startofsym = 0;
309		− vec[idx++] = FUNCTION;
310		− vec[idx++] = &line[i];
311		− }
312		− }
	300	+ /* Split line up in individual parameters preceded by FUNCTION */
	301	+ for (i=0; line[i]; i++) {
	302	+ if (isspace(line[i])) {
	303	+ line[i] = '\0';
	304	+ startofsym = 1;
	305	+ continue;
	306	+ }
	307	+ if (startofsym) {
	308	+ startofsym = 0;
	309	+ vec[idx++] = FUNCTION;
	310	+ vec[idx++] = &line[i];
	311	+ }
	312	+ }
313	313	for (i = 0; i < idx; i++) {
314		− if (strcmp(vec[i], FUNCTION))
315		− continue;
	314	+ if (strcmp(vec[i], FUNCTION))
	315	+ continue;
316	316	consume_symbol(vec[i + 1]);
317	317	}
318	318	vec[idx++] = filename;
@@ -460,14 +460,14 @@ static void parse_file(FILE *infile) · 141 unmodified lines
460	460	break;
461	461	case 'D':
462	462	while (s && !isspace(s)) s++;
463		− *s = '\0';
464		− symbolsonly(line+2);
465		− break;
	463	+ *s = '\0';
	464	+ symbolsonly(line+2);
	465	+ break;
466	466	case 'F':
467	467	/* filename */
468	468	while (s && !isspace(s)) s++;
469	469	*s++ = '\0';
470		− /* function names */
	470	+ /* function names */
471	471	while (isspace(*s))
472	472	s++;
473	473	singlefunctions(line +2, s);
@@ -515,11 +515,11 @@ int main(int argc, char *argv[]) · 41 unmodified lines
515	515	}
516	516	/* Open file, exit on error */
517	517	infile = fopen(argv[2], "r");
518		− if (infile == NULL) {
519		− fprintf(stderr, "docproc: ");
520		− perror(argv[2]);
521		− exit(2);
522		− }
	518	+ if (infile == NULL) {
	519	+ fprintf(stderr, "docproc: ");
	520	+ perror(argv[2]);
	521	+ exit(2);
	522	+ }
523	523
524	524	if (strcmp("doc", argv[1]) == 0) {
525	525	/* Need to do this in two passes.

scripts/kallsyms.c+1−1

@@ -123,7 +123,7 @@ static int read_symbol(FILE in, struct sym_entry s) · 122 unmodified lines
123	123	}
124	124	if (strlen(str) > KSYM_NAME_LEN) {
125	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	127	str, strlen(str), KSYM_NAME_LEN);
128	128	return -1;
129	129	}

scripts/kconfig/conf.c+1−1

@@ -696,7 +696,7 @@ int main(int ac, char **av) · 695 unmodified lines
696	696	} else if (input_mode == savedefconfig) {
697	697	if (conf_write_defconfig(defconfig_file)) {
698	698	fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
699		− defconfig_file);
	699	+ defconfig_file);
700	700	return 1;
701	701	}
702	702	} else if (input_mode != listnewconfig) {

scripts/kconfig/gconf.c+1−1

@@ -1404,7 +1404,7 @@ static void display_tree(struct menu *menu) · 1403 unmodified lines
1404	1404	&& (tree == tree2))
1405	1405	continue;
1406	1406	/*
1407		− if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
	1407	+ if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
1408	1408	\|\| (view_mode == FULL_VIEW)
1409	1409	\|\| (view_mode == SPLIT_VIEW))*/
1410	1410

scripts/kconfig/lxdialog/checklist.c+2−2

@@ -168,13 +168,13 @@ do_resize: · 167 unmodified lines
168	168
169	169	/* create new window for the list */
170	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	173	keypad(list, TRUE);
174	174
175	175	/* draw a box around the list items */
176	176	draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2,
177		− dlg.menubox_border.atr, dlg.menubox.atr);
	177	+ dlg.menubox_border.atr, dlg.menubox.atr);
178	178
179	179	/* Find length of longest item in order to center checklist */
180	180	check_x = 0;

scripts/kconfig/lxdialog/inputbox.c+1−1

@@ -42,7 +42,7 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected) · 41 unmodified lines
42	42	* Display a dialog box for inputing a string
43	43	*/
44	44	int dialog_inputbox(const char title, const char prompt, int height, int width,
45		− const char *init)
	45	+ const char *init)
46	46	{
47	47	int i, x, y, box_y, box_x, box_width;
48	48	int input_x = 0, key = 0, button = -1;

scripts/kconfig/lxdialog/menubox.c+2−2

@@ -64,7 +64,7 @@ static int menu_width, item_x; · 63 unmodified lines
64	64	* Print menu item
65	65	*/
66	66	static void do_print_item(WINDOW * win, const char *item, int line_y,
67		− int selected, int hotkey)
	67	+ int selected, int hotkey)
68	68	{
69	69	int j;
70	70	char *menu_item = malloc(menu_width + 1);
@@ -182,7 +182,7 @@ static void do_scroll(WINDOW win, int scroll, int n) · 111 unmodified lines
182	182	* Display a menu for choosing among a number of options
183	183	*/
184	184	int dialog_menu(const char title, const char prompt,
185		− const void selected, int s_scroll)
	185	+ const void selected, int s_scroll)
186	186	{
187	187	int i, j, x, y, box_x, box_y;
188	188	int height, width, menu_height;

scripts/kconfig/lxdialog/util.c+1−1

@@ -623,7 +623,7 @@ void item_make(const char *fmt, ...) · 622 unmodified lines
623	623	void item_add_str(const char *fmt, ...)
624	624	{
625	625	va_list ap;
626		− size_t avail;
	626	+ size_t avail;
627	627
628	628	avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str);
629	629

scripts/kconfig/mconf.c+1−1

@@ -299,7 +299,7 @@ static void set_config_filename(const char *config_filename) · 298 unmodified lines
299	299	int size;
300	300
301	301	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
302		− "%s - %s", config_filename, rootmenu.prompt->text);
	302	+ "%s - %s", config_filename, rootmenu.prompt->text);
303	303	if (size >= sizeof(menu_backtitle))
304	304	menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
305	305	set_dialog_backtitle(menu_backtitle);

scripts/kconfig/menu.c+3−3

@@ -258,8 +258,8 @@ static void sym_check_prop(struct symbol *sym) · 257 unmodified lines
258	258	"config symbol '%s' uses select, but is "
259	259	"not boolean or tristate", sym->name);
260	260	else if (sym2->type != S_UNKNOWN &&
261		− sym2->type != S_BOOLEAN &&
262		− sym2->type != S_TRISTATE)
	261	+ sym2->type != S_BOOLEAN &&
	262	+ sym2->type != S_TRISTATE)
263	263	prop_warn(prop,
264	264	"'%s' has wrong type. 'select' only "
265	265	"accept arguments of boolean and "
@@ -268,7 +268,7 @@ static void sym_check_prop(struct symbol *sym) · 2 unmodified lines
268	268	case P_RANGE:
269	269	if (sym->type != S_INT && sym->type != S_HEX)
270	270	prop_warn(prop, "range is only allowed "
271		− "for int or hex symbols");
	271	+ "for int or hex symbols");
272	272	if (!menu_validate_number(sym, prop->expr->left.sym) \|\|
273	273	!menu_validate_number(sym, prop->expr->right.sym))
274	274	prop_warn(prop, "range is invalid");

scripts/kconfig/zconf.l+2−2

@@ -27,8 +27,8 @@ static char *text; · 26 unmodified lines
27	27	static int text_size, text_asize;
28	28
29	29	struct buffer {
30		− struct buffer *parent;
31		− YY_BUFFER_STATE state;
	30	+ struct buffer *parent;
	31	+ YY_BUFFER_STATE state;
32	32	};
33	33
34	34	struct buffer *current_buf;

scripts/kconfig/zconf.lex.c_shipped+2−2

@@ -789,8 +789,8 @@ static char *text; · 788 unmodified lines
789	789	static int text_size, text_asize;
790	790
791	791	struct buffer {
792		− struct buffer *parent;
793		− YY_BUFFER_STATE state;
	792	+ struct buffer *parent;
	793	+ YY_BUFFER_STATE state;
794	794	};
795	795
796	796	struct buffer *current_buf;

scripts/kconfig/zconf.tab.c_shipped+1−1

@@ -2314,7 +2314,7 @@ void conf_parse(const char *name) · 2313 unmodified lines
2314	2314	for_all_symbols(i, sym) {
2315	2315	if (sym_check_deps(sym))
2316	2316	zconfnerrs++;
2317		− }
	2317	+ }
2318	2318	if (zconfnerrs)
2319	2319	exit(1);
2320	2320	sym_set_change_count(1);

scripts/kconfig/zconf.y+1−1

@@ -510,7 +510,7 @@ void conf_parse(const char *name) · 509 unmodified lines
510	510	for_all_symbols(i, sym) {
511	511	if (sym_check_deps(sym))
512	512	zconfnerrs++;
513		− }
	513	+ }
514	514	if (zconfnerrs)
515	515	exit(1);
516	516	sym_set_change_count(1);

scripts/mod/file2alias.c+20−22

@@ -644,28 +644,26 @@ ADD_TO_DEVTABLE("pcmcia", pcmcia_device_id, do_pcmcia_entry); · 643 unmodified lines
644	644
645	645	static int do_of_entry (const char filename, void symval, char *alias)
646	646	{
647		− int len;
648		− char *tmp;
649		− DEF_FIELD_ADDR(symval, of_device_id, name);
650		− DEF_FIELD_ADDR(symval, of_device_id, type);
651		− DEF_FIELD_ADDR(symval, of_device_id, compatible);
652		−
653		− len = sprintf (alias, "of:N%sT%s",
654		− (name)[0] ? name : "*",
655		− (type)[0] ? type : "*");
656		−
657		− if (compatible[0])
658		− sprintf (&alias[len], "%sC%s",
659		− (type)[0] ? "" : "",
660		− *compatible);
661		−
662		− /* Replace all whitespace with underscores */
663		− for (tmp = alias; tmp && *tmp; tmp++)
664		− if (isspace (*tmp))
665		− *tmp = '_';
666		−
667		− add_wildcard(alias);
668		− return 1;
	647	+ int len;
	648	+ char *tmp;
	649	+ DEF_FIELD_ADDR(symval, of_device_id, name);
	650	+ DEF_FIELD_ADDR(symval, of_device_id, type);
	651	+ DEF_FIELD_ADDR(symval, of_device_id, compatible);
	652	+
	653	+ len = sprintf(alias, "of:N%sT%s", (name)[0] ? name : "*",
	654	+ (type)[0] ? type : "*");
	655	+
	656	+ if (compatible[0])
	657	+ sprintf(&alias[len], "%sC%s", (type)[0] ? "" : "",
	658	+ *compatible);
	659	+
	660	+ /* Replace all whitespace with underscores */
	661	+ for (tmp = alias; tmp && *tmp; tmp++)
	662	+ if (isspace (*tmp))
	663	+ *tmp = '_';
	664	+
	665	+ add_wildcard(alias);
	666	+ return 1;
669	667	}
670	668	ADD_TO_DEVTABLE("of", of_device_id, do_of_entry);
671	669

scripts/mod/modpost.c+15−15

@@ -862,7 +862,7 @@ static const char *section_white_list[] = · 861 unmodified lines
862	862	* without "ax" / "aw".
863	863	*/
864	864	static void check_section(const char modname, struct elf_info elf,
865		− Elf_Shdr *sechdr)
	865	+ Elf_Shdr *sechdr)
866	866	{
867	867	const char *sec = sech_name(elf, sechdr);
868	868
@@ -1296,12 +1296,12 @@ static void print_section_list(const char * const list[20]) · 427 unmodified lines
1296	1296	*/
1297	1297	static void report_sec_mismatch(const char *modname,
1298	1298	const struct sectioncheck *mismatch,
1299		− const char *fromsec,
1300		− unsigned long long fromaddr,
1301		− const char *fromsym,
1302		− int from_is_func,
1303		− const char tosec, const char tosym,
1304		− int to_is_func)
	1299	+ const char *fromsec,
	1300	+ unsigned long long fromaddr,
	1301	+ const char *fromsym,
	1302	+ int from_is_func,
	1303	+ const char tosec, const char tosym,
	1304	+ int to_is_func)
1305	1305	{
1306	1306	const char from, from_p;
1307	1307	const char to, to_p;
@@ -1441,7 +1441,7 @@ static void report_sec_mismatch(const char *modname, · 133 unmodified lines
1441	1441	}
1442	1442
1443	1443	static void check_section_mismatch(const char modname, struct elf_info elf,
1444		− Elf_Rela r, Elf_Sym sym, const char *fromsec)
	1444	+ Elf_Rela r, Elf_Sym sym, const char *fromsec)
1445	1445	{
1446	1446	const char *tosec;
1447	1447	const struct sectioncheck *mismatch;
@@ -1528,7 +1528,7 @@ static int addend_arm_rel(struct elf_info elf, Elf_Shdr sechdr, Elf_Rela *r) · 80 unmodified lines
1528	1528	case R_ARM_ABS32:
1529	1529	/* From ARM ABI: (S + A) \| T */
1530	1530	r->r_addend = (int)(long)
1531		− (elf->symtab_start + ELF_R_SYM(r->r_info));
	1531	+ (elf->symtab_start + ELF_R_SYM(r->r_info));
1532	1532	break;
1533	1533	case R_ARM_PC24:
1534	1534	case R_ARM_CALL:
@@ -1538,8 +1538,8 @@ static int addend_arm_rel(struct elf_info elf, Elf_Shdr sechdr, Elf_Rela *r) · 3 unmodified lines
1538	1538	case R_ARM_THM_JUMP19:
1539	1539	/* From ARM ABI: ((S + A) \| T) - P */
1540	1540	r->r_addend = (int)(long)(elf->hdr +
1541		− sechdr->sh_offset +
1542		− (r->r_offset - sechdr->sh_addr));
	1541	+ sechdr->sh_offset +
	1542	+ (r->r_offset - sechdr->sh_addr));
1543	1543	break;
1544	1544	default:
1545	1545	return 1;
@@ -1571,7 +1571,7 @@ static int addend_mips_rel(struct elf_info elf, Elf_Shdr sechdr, Elf_Rela *r) · 25 unmodified lines
1571	1571	}
1572	1572
1573	1573	static void section_rela(const char modname, struct elf_info elf,
1574		− Elf_Shdr *sechdr)
	1574	+ Elf_Shdr *sechdr)
1575	1575	{
1576	1576	Elf_Sym *sym;
1577	1577	Elf_Rela *rela;
@@ -1615,7 +1615,7 @@ static void section_rela(const char modname, struct elf_info elf, · 37 unmodified lines
1615	1615	}
1616	1616
1617	1617	static void section_rel(const char modname, struct elf_info elf,
1618		− Elf_Shdr *sechdr)
	1618	+ Elf_Shdr *sechdr)
1619	1619	{
1620	1620	Elf_Sym *sym;
1621	1621	Elf_Rel *rel;
@@ -1685,7 +1685,7 @@ static void section_rel(const char modname, struct elf_info elf, · 63 unmodified lines
1685	1685	* be discarded and warns about it.
1686	1686	**/
1687	1687	static void check_sec_ref(struct module mod, const char modname,
1688		− struct elf_info *elf)
	1688	+ struct elf_info *elf)
1689	1689	{
1690	1690	int i;
1691	1691	Elf_Shdr *sechdrs = elf->sechdrs;
@@ -1945,7 +1945,7 @@ static int add_versions(struct buffer b, struct module mod) · 253 unmodified lines
1945	1945	s->name, mod->name);
1946	1946	} else {
1947	1947	merror("\"%s\" [%s.ko] undefined!\n",
1948		− s->name, mod->name);
	1948	+ s->name, mod->name);
1949	1949	err = 1;
1950	1950	}
1951	1951	}

scripts/mod/sumversion.c+2−2

@@ -214,7 +214,7 @@ static void md4_final_ascii(struct md4_ctx mctx, char out, unsigned int len) · 213 unmodified lines
214	214	mctx->block[14] = mctx->byte_count << 3;
215	215	mctx->block[15] = mctx->byte_count >> 29;
216	216	le32_to_cpu_array(mctx->block, (sizeof(mctx->block) -
217		− sizeof(uint64_t)) / sizeof(uint32_t));
	217	+ sizeof(uint64_t)) / sizeof(uint32_t));
218	218	md4_transform(mctx->hash, mctx->block);
219	219	cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t));
220	220
@@ -367,7 +367,7 @@ static int parse_source_files(const char objfile, struct md4_ctx md) · 146 unmodified lines
367	367	break;
368	368	/* Terminate line at first space, to get rid of final ' \' */
369	369	while (*p) {
370		− if (isspace(*p)) {
	370	+ if (isspace(*p)) {
371	371	*p = '\0';
372	372	break;
373	373	}

scripts/tags.sh+1−1

@@ -281,7 +281,7 @@ xtags() · 280 unmodified lines
281	281	emacs $1
282	282	else
283	283	all_target_sources \| xargs $1 -a
284		− fi
	284	+ fi
285	285	}
286	286
287	287	# Support um (which uses SUBARCH)