Commit 287b901d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  menuconfig: fix a regression when canceling the prompt dialog at exit
  kbuild: Fix compiler warning with assertion when calling 'fwrite'
  Improve update-po-config output
  menuconfig: let make not report error when not save configuration
  merge_config.sh: fix bug in final check
  merge_config.sh: whitespace cleanup
  merge_config.sh: use signal names compatible with dash and bash
  kconfig: add merge_config.sh script
  kconfig: use xfwrite wrapper function to silence warnings
  kconfig: fix set but not used warnings
  kconfig: fix warnings by specifing format arguments
parents c63dbbd5 30c4eaaf

scripts/kconfig/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,8 @@ localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 


# Create new linux.pot file

# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files

# The symlink is used to repair a deficiency in arch/um

update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h

	$(Q)echo "  GEN config"

	$(Q)echo "  GEN     config.pot"

	$(Q)xgettext --default-domain=linux                         \

	    --add-comments --keyword=_ --keyword=N_                 \

	    --from-code=UTF-8                                       \
@@ -67,6 +66,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
		$(obj)/kxgettext $$i                     \

		     >> $(obj)/config.pot;               \

	    done )

	$(Q)echo "  GEN     linux.pot"

	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \

	    --output $(obj)/linux.pot

	$(Q)rm -f $(obj)/config.pot

scripts/kconfig/confdata.c

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ kconfig_print_comment(FILE *fp, const char *value, void *arg) 
		fprintf(fp, "#");

		if (l) {

			fprintf(fp, " ");

			fwrite(p, l, 1, fp);

			xfwrite(p, l, 1, fp);

			p += l;

		}

		fprintf(fp, "\n");
@@ -537,7 +537,7 @@ header_print_comment(FILE *fp, const char *value, void *arg) 
		fprintf(fp, " *");

		if (l) {

			fprintf(fp, " ");

			fwrite(p, l, 1, fp);

			xfwrite(p, l, 1, fp);

			p += l;

		}

		fprintf(fp, "\n");

scripts/kconfig/expr.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
extern "C" {

#endif



#include <assert.h>

#include <stdio.h>

#ifndef __cplusplus

#include <stdbool.h>

scripts/kconfig/gconf.c

+4 −7
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) 
	dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),

					GTK_DIALOG_DESTROY_WITH_PARENT,

					GTK_MESSAGE_INFO,

					GTK_BUTTONS_CLOSE, intro_text);

					GTK_BUTTONS_CLOSE, "%s", intro_text);

	g_signal_connect_swapped(GTK_OBJECT(dialog), "response",

				 G_CALLBACK(gtk_widget_destroy),

				 GTK_OBJECT(dialog));
@@ -701,7 +701,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data) 
	dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),

					GTK_DIALOG_DESTROY_WITH_PARENT,

					GTK_MESSAGE_INFO,

					GTK_BUTTONS_CLOSE, about_text);

					GTK_BUTTONS_CLOSE, "%s", about_text);

	g_signal_connect_swapped(GTK_OBJECT(dialog), "response",

				 G_CALLBACK(gtk_widget_destroy),

				 GTK_OBJECT(dialog));
@@ -720,7 +720,7 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data) 
	dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),

					GTK_DIALOG_DESTROY_WITH_PARENT,

					GTK_MESSAGE_INFO,

					GTK_BUTTONS_CLOSE, license_text);

					GTK_BUTTONS_CLOSE, "%s", license_text);

	g_signal_connect_swapped(GTK_OBJECT(dialog), "response",

				 G_CALLBACK(gtk_widget_destroy),

				 GTK_OBJECT(dialog));
@@ -830,7 +830,7 @@ static void renderer_edited(GtkCellRendererText * cell, 
static void change_sym_value(struct menu *menu, gint col)

{

	struct symbol *sym = menu->sym;

	tristate oldval, newval;

	tristate newval;



	if (!sym)

		return;
@@ -847,7 +847,6 @@ static void change_sym_value(struct menu *menu, gint col) 
	switch (sym_get_type(sym)) {

	case S_BOOLEAN:

	case S_TRISTATE:

		oldval = sym_get_tristate_value(sym);

		if (!sym_tristate_within_range(sym, newval))

			newval = yes;

		sym_set_tristate_value(sym, newval);
@@ -1278,7 +1277,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst) 
	gboolean valid;

	GtkTreeIter *sibling;

	struct symbol *sym;

	struct property *prop;

	struct menu *menu1, *menu2;



	if (src == &rootmenu)
@@ -1287,7 +1285,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst) 
	valid = gtk_tree_model_iter_children(model2, child2, dst);

	for (child1 = src->list; child1; child1 = child1->next) {



		prop = child1->prompt;

		sym = child1->sym;



	      reparse:

scripts/kconfig/lkc.h

+4 −2
Original line number Diff line number Diff line
@@ -90,8 +90,10 @@ struct conf_printer { 
/* confdata.c and expr.c */

static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)

{

	if (fwrite(str, len, count, out) < count)

		fprintf(stderr, "\nError in writing or end of file.\n");

	assert(len != 0);



	if (fwrite(str, len, count, out) != count)

		fprintf(stderr, "Error in writing or end of file.\n");

}



/* menu.c */

CRA Git | Maintained and supported by SUSTech CRA and CCSE