aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/conf.c2
-rw-r--r--scripts/kconfig/gconf.c2
-rw-r--r--scripts/kconfig/lxdialog/checklist.c4
-rw-r--r--scripts/kconfig/lxdialog/inputbox.c2
-rw-r--r--scripts/kconfig/lxdialog/menubox.c4
-rw-r--r--scripts/kconfig/lxdialog/util.c2
-rw-r--r--scripts/kconfig/mconf.c2
-rw-r--r--scripts/kconfig/menu.c6
-rw-r--r--scripts/kconfig/zconf.l4
-rw-r--r--scripts/kconfig/zconf.lex.c_shipped4
-rw-r--r--scripts/kconfig/zconf.tab.c_shipped2
-rw-r--r--scripts/kconfig/zconf.y2
12 files changed, 18 insertions, 18 deletions
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, 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 /* Find length of longest item in order to center checklist */ 179 /* Find length of longest item in order to center checklist */
180 check_x = 0; 180 check_x = 0;
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index 447a582198c9..d58de1dc5360 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -42,7 +42,7 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
42 * Display a dialog box for inputing a string 42 * Display a dialog box for inputing a string
43 */ 43 */
44int dialog_inputbox(const char *title, const char *prompt, int height, int width, 44int dialog_inputbox(const char *title, const char *prompt, int height, int width,
45 const char *init) 45 const char *init)
46{ 46{
47 int i, x, y, box_y, box_x, box_width; 47 int i, x, y, box_y, box_x, box_width;
48 int input_x = 0, key = 0, button = -1; 48 int input_x = 0, key = 0, button = -1;
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index c93de0b2faca..11ae9ad7ac7b 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -64,7 +64,7 @@ static int menu_width, item_x;
64 * Print menu item 64 * Print menu item
65 */ 65 */
66static void do_print_item(WINDOW * win, const char *item, int line_y, 66static 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 int j; 69 int j;
70 char *menu_item = malloc(menu_width + 1); 70 char *menu_item = malloc(menu_width + 1);
@@ -182,7 +182,7 @@ static void do_scroll(WINDOW *win, int *scroll, int n)
182 * Display a menu for choosing among a number of options 182 * Display a menu for choosing among a number of options
183 */ 183 */
184int dialog_menu(const char *title, const char *prompt, 184int 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 int i, j, x, y, box_x, box_y; 187 int i, j, x, y, box_x, box_y;
188 int height, width, menu_height; 188 int height, width, menu_height;
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index 58a8289dd650..f7abdeb92af0 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -623,7 +623,7 @@ void item_make(const char *fmt, ...)
623void item_add_str(const char *fmt, ...) 623void item_add_str(const char *fmt, ...)
624{ 624{
625 va_list ap; 625 va_list ap;
626 size_t avail; 626 size_t avail;
627 627
628 avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str); 628 avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str);
629 629
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 0cc37b5c4021..14cea7463a62 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -299,7 +299,7 @@ static void set_config_filename(const char *config_filename)
299 int size; 299 int size;
300 300
301 size = snprintf(menu_backtitle, sizeof(menu_backtitle), 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 if (size >= sizeof(menu_backtitle)) 303 if (size >= sizeof(menu_backtitle))
304 menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; 304 menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
305 set_dialog_backtitle(menu_backtitle); 305 set_dialog_backtitle(menu_backtitle);
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 3ac2c9c6e280..a26cc5d2a9b0 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -258,8 +258,8 @@ static void sym_check_prop(struct symbol *sym)
258 "config symbol '%s' uses select, but is " 258 "config symbol '%s' uses select, but is "
259 "not boolean or tristate", sym->name); 259 "not boolean or tristate", sym->name);
260 else if (sym2->type != S_UNKNOWN && 260 else if (sym2->type != S_UNKNOWN &&
261 sym2->type != S_BOOLEAN && 261 sym2->type != S_BOOLEAN &&
262 sym2->type != S_TRISTATE) 262 sym2->type != S_TRISTATE)
263 prop_warn(prop, 263 prop_warn(prop,
264 "'%s' has wrong type. 'select' only " 264 "'%s' has wrong type. 'select' only "
265 "accept arguments of boolean and " 265 "accept arguments of boolean and "
@@ -268,7 +268,7 @@ static void sym_check_prop(struct symbol *sym)
268 case P_RANGE: 268 case P_RANGE:
269 if (sym->type != S_INT && sym->type != S_HEX) 269 if (sym->type != S_INT && sym->type != S_HEX)
270 prop_warn(prop, "range is only allowed " 270 prop_warn(prop, "range is only allowed "
271 "for int or hex symbols"); 271 "for int or hex symbols");
272 if (!menu_validate_number(sym, prop->expr->left.sym) || 272 if (!menu_validate_number(sym, prop->expr->left.sym) ||
273 !menu_validate_number(sym, prop->expr->right.sym)) 273 !menu_validate_number(sym, prop->expr->right.sym))
274 prop_warn(prop, "range is invalid"); 274 prop_warn(prop, "range is invalid");
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 1a9f53e535ca..6c62d93b4ffb 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -27,8 +27,8 @@ static char *text;
27static int text_size, text_asize; 27static int text_size, text_asize;
28 28
29struct buffer { 29struct buffer {
30 struct buffer *parent; 30 struct buffer *parent;
31 YY_BUFFER_STATE state; 31 YY_BUFFER_STATE state;
32}; 32};
33 33
34struct buffer *current_buf; 34struct buffer *current_buf;
diff --git a/scripts/kconfig/zconf.lex.c_shipped b/scripts/kconfig/zconf.lex.c_shipped
index a0521aa5974b..349a7f24315b 100644
--- a/scripts/kconfig/zconf.lex.c_shipped
+++ b/scripts/kconfig/zconf.lex.c_shipped
@@ -789,8 +789,8 @@ static char *text;
789static int text_size, text_asize; 789static int text_size, text_asize;
790 790
791struct buffer { 791struct buffer {
792 struct buffer *parent; 792 struct buffer *parent;
793 YY_BUFFER_STATE state; 793 YY_BUFFER_STATE state;
794}; 794};
795 795
796struct buffer *current_buf; 796struct buffer *current_buf;
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 25ae16ac75c8..de5e84ed3f96 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -2314,7 +2314,7 @@ void conf_parse(const char *name)
2314 for_all_symbols(i, sym) { 2314 for_all_symbols(i, sym) {
2315 if (sym_check_deps(sym)) 2315 if (sym_check_deps(sym))
2316 zconfnerrs++; 2316 zconfnerrs++;
2317 } 2317 }
2318 if (zconfnerrs) 2318 if (zconfnerrs)
2319 exit(1); 2319 exit(1);
2320 sym_set_change_count(1); 2320 sym_set_change_count(1);
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 0653886fac48..0f683cfa53e9 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -510,7 +510,7 @@ void conf_parse(const char *name)
510 for_all_symbols(i, sym) { 510 for_all_symbols(i, sym) {
511 if (sym_check_deps(sym)) 511 if (sym_check_deps(sym))
512 zconfnerrs++; 512 zconfnerrs++;
513 } 513 }
514 if (zconfnerrs) 514 if (zconfnerrs)
515 exit(1); 515 exit(1);
516 sym_set_change_count(1); 516 sym_set_change_count(1);