From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Tue, 2 Aug 2016 20:11:06 +0000 (+0200)
Subject: Synchronise with v3.16
X-Git-Tag: v3.16.0.0^0
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6bc83be982e93c53a4fdeda9d60dcbb2a95c8f1b;p=kconfig-frontends

Synchronise with v3.16

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---

diff --git a/.version b/.version
index 69d9a5d..487e691 100644
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-3.15.0 1860e379875dfe7271c649058aeddffe5afd9d0d Shuffling Zombie Juror
+3.16.0 19583ca584d6f574384e17fe7613dfaeadcdc4a6 Shuffling Zombie Juror
 0
diff --git a/frontends/conf/conf.c b/frontends/conf/conf.c
index d19944f..fef75fc 100644
--- a/frontends/conf/conf.c
+++ b/frontends/conf/conf.c
@@ -696,7 +696,7 @@ int main(int ac, char **av)
 	} else if (input_mode == savedefconfig) {
 		if (conf_write_defconfig(defconfig_file)) {
 			fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
-			        defconfig_file);
+				defconfig_file);
 			return 1;
 		}
 	} else if (input_mode != listnewconfig) {
diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
index 0418a4c..b94dfa3 100644
--- a/frontends/gconf/gconf.c
+++ b/frontends/gconf/gconf.c
@@ -1404,7 +1404,7 @@ static void display_tree(struct menu *menu)
 		    && (tree == tree2))
 			continue;
 /*
-                if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
+		if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
 		    || (view_mode == FULL_VIEW)
 		    || (view_mode == SPLIT_VIEW))*/
 
diff --git a/frontends/mconf/mconf.c b/frontends/mconf/mconf.c
index 59184bb..14cea74 100644
--- a/frontends/mconf/mconf.c
+++ b/frontends/mconf/mconf.c
@@ -299,7 +299,7 @@ static void set_config_filename(const char *config_filename)
 	int size;
 
 	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-	                "%s - %s", config_filename, rootmenu.prompt->text);
+			"%s - %s", config_filename, rootmenu.prompt->text);
 	if (size >= sizeof(menu_backtitle))
 		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
 	set_dialog_backtitle(menu_backtitle);
@@ -1034,4 +1034,3 @@ int main(int ac, char **av)
 
 	return res;
 }
-
diff --git a/frontends/nconf/nconf.c b/frontends/nconf/nconf.c
index 4fbecd2..984489e 100644
--- a/frontends/nconf/nconf.c
+++ b/frontends/nconf/nconf.c
@@ -1554,4 +1554,3 @@ int main(int ac, char **av)
 	endwin();
 	return 0;
 }
-
diff --git a/libs/lxdialog/checklist.c b/libs/lxdialog/checklist.c
index 3b15c08..8d016fa 100644
--- a/libs/lxdialog/checklist.c
+++ b/libs/lxdialog/checklist.c
@@ -168,13 +168,13 @@ do_resize:
 
 	/* create new window for the list */
 	list = subwin(dialog, list_height, list_width, y + box_y + 1,
-	              x + box_x + 1);
+		      x + box_x + 1);
 
 	keypad(list, TRUE);
 
 	/* draw a box around the list items */
 	draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2,
-	         dlg.menubox_border.atr, dlg.menubox.atr);
+		 dlg.menubox_border.atr, dlg.menubox.atr);
 
 	/* Find length of longest item in order to center checklist */
 	check_x = 0;
diff --git a/libs/lxdialog/inputbox.c b/libs/lxdialog/inputbox.c
index 447a582..d58de1d 100644
--- a/libs/lxdialog/inputbox.c
+++ b/libs/lxdialog/inputbox.c
@@ -42,7 +42,7 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
  * Display a dialog box for inputing a string
  */
 int dialog_inputbox(const char *title, const char *prompt, int height, int width,
-                    const char *init)
+		    const char *init)
 {
 	int i, x, y, box_y, box_x, box_width;
 	int input_x = 0, key = 0, button = -1;
diff --git a/libs/lxdialog/menubox.c b/libs/lxdialog/menubox.c
index c93de0b..11ae9ad 100644
--- a/libs/lxdialog/menubox.c
+++ b/libs/lxdialog/menubox.c
@@ -64,7 +64,7 @@ static int menu_width, item_x;
  * Print menu item
  */
 static void do_print_item(WINDOW * win, const char *item, int line_y,
-                          int selected, int hotkey)
+			  int selected, int hotkey)
 {
 	int j;
 	char *menu_item = malloc(menu_width + 1);
@@ -182,7 +182,7 @@ static void do_scroll(WINDOW *win, int *scroll, int n)
  * Display a menu for choosing among a number of options
  */
 int dialog_menu(const char *title, const char *prompt,
-                const void *selected, int *s_scroll)
+		const void *selected, int *s_scroll)
 {
 	int i, j, x, y, box_x, box_y;
 	int height, width, menu_height;
diff --git a/libs/lxdialog/util.c b/libs/lxdialog/util.c
index 58a8289..f7abdeb 100644
--- a/libs/lxdialog/util.c
+++ b/libs/lxdialog/util.c
@@ -623,7 +623,7 @@ void item_make(const char *fmt, ...)
 void item_add_str(const char *fmt, ...)
 {
 	va_list ap;
-        size_t avail;
+	size_t avail;
 
 	avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str);
 
diff --git a/libs/parser/lconf.l b/libs/parser/lconf.l
index 1a9f53e..6c62d93 100644
--- a/libs/parser/lconf.l
+++ b/libs/parser/lconf.l
@@ -27,8 +27,8 @@ static char *text;
 static int text_size, text_asize;
 
 struct buffer {
-        struct buffer *parent;
-        YY_BUFFER_STATE state;
+	struct buffer *parent;
+	YY_BUFFER_STATE state;
 };
 
 struct buffer *current_buf;
diff --git a/libs/parser/menu.c b/libs/parser/menu.c
index 3ac2c9c..a26cc5d 100644
--- a/libs/parser/menu.c
+++ b/libs/parser/menu.c
@@ -258,8 +258,8 @@ static void sym_check_prop(struct symbol *sym)
 				    "config symbol '%s' uses select, but is "
 				    "not boolean or tristate", sym->name);
 			else if (sym2->type != S_UNKNOWN &&
-			         sym2->type != S_BOOLEAN &&
-			         sym2->type != S_TRISTATE)
+				 sym2->type != S_BOOLEAN &&
+				 sym2->type != S_TRISTATE)
 				prop_warn(prop,
 				    "'%s' has wrong type. 'select' only "
 				    "accept arguments of boolean and "
@@ -268,7 +268,7 @@ static void sym_check_prop(struct symbol *sym)
 		case P_RANGE:
 			if (sym->type != S_INT && sym->type != S_HEX)
 				prop_warn(prop, "range is only allowed "
-				                "for int or hex symbols");
+						"for int or hex symbols");
 			if (!menu_validate_number(sym, prop->expr->left.sym) ||
 			    !menu_validate_number(sym, prop->expr->right.sym))
 				prop_warn(prop, "range is invalid");
diff --git a/libs/parser/util.c b/libs/parser/util.c
index 6e7fbf1..94f9c83 100644
--- a/libs/parser/util.c
+++ b/libs/parser/util.c
@@ -155,5 +155,3 @@ void *xcalloc(size_t nmemb, size_t size)
 	fprintf(stderr, "Out of memory.\n");
 	exit(1);
 }
-
-
diff --git a/libs/parser/yconf.y b/libs/parser/yconf.y
index bc1cae0..b8b9354 100644
--- a/libs/parser/yconf.y
+++ b/libs/parser/yconf.y
@@ -510,7 +510,7 @@ void conf_parse(const char *name)
 	for_all_symbols(i, sym) {
 		if (sym_check_deps(sym))
 			zconfnerrs++;
-        }
+	}
 	if (zconfnerrs)
 		exit(1);
 	sym_set_change_count(1);
diff --git a/scripts/ksync.log b/scripts/ksync.log
index 79573b9..3551f85 100644
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -92,3 +92,5 @@ e062781 kconfig: do not allow more than one symbol to have 'option modules'
 503c823 kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
 00d4f8f xconfig: Fix the filename for GUI settings
 5d2acfc kconfig: make allnoconfig disable options behind EMBEDDED and EXPERT
+7eb6e34 kbuild: trivial - remove trailing empty lines
+bb66fc6 kbuild: trivial - use tabs for code indent where possible
diff --git a/utils/tweak.in b/utils/tweak.in
index c58dc81..9c2fdae 100644
--- a/utils/tweak.in
+++ b/utils/tweak.in
@@ -223,4 +223,3 @@ while [ "$1" != "" ] ; do
 		;;
 	esac
 done
-