merge from upstream for systems that dont integrate libintl into their C library:

[oweals/busybox.git] / scripts / kconfig / gconf.c

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 94118b059423fde15ffc090eb33436ed2b1d985a..fd3002bd3a029b10e7498bf4da4a158089308fd7 100644 (file)
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -84,7 +84,7 @@ const char *dbg_print_stype(int val)
 {
        static char buf[256];
 
-       bzero(buf, 256);
+       memset(buf, 0, 256);
 
        if (val == S_UNKNOWN)
                strcpy(buf, "unknown");
@@ -112,7 +112,7 @@ const char *dbg_print_flags(int val)
 {
        static char buf[256];
 
-       bzero(buf, 256);
+       memset(buf, 0, 256);
 
        if (val & SYMBOL_YES)
                strcat(buf, "yes/");
@@ -155,7 +155,7 @@ const char *dbg_print_ptype(int val)
 {
        static char buf[256];
 
-       bzero(buf, 256);
+       memset(buf, 0, 256);
 
        if (val == P_UNKNOWN)
                strcpy(buf, "unknown");
@@ -275,7 +275,7 @@ void init_main_window(const gchar * glade_file)
                                          /*"style", PANGO_STYLE_OBLIQUE, */
                                          NULL);
 
-       sprintf(title, _("Linux Kernel v%s Configuration"),
+       sprintf(title, _("BusyBox %s Configuration"),
                getenv("KERNELVERSION"));
        gtk_window_set_title(GTK_WINDOW(main_wnd), title);
 
@@ -741,7 +741,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
        GtkWidget *dialog;
        const gchar *intro_text = _(
-           "Welcome to gkc, the GTK+ graphical kernel configuration tool\n"
+           "Welcome to gkc, the GTK+ graphical busybox configuration tool\n"
            "for Linux.\n"
            "For each option, a blank box indicates the feature is disabled, a\n"
            "check indicates it is enabled, and a dot indicates that it is to\n"
@@ -1188,7 +1188,7 @@ static gchar **fill_row(struct menu *menu)
 
        for (i = COL_OPTION; i <= COL_COLOR; i++)
                g_free(row[i]);
-       bzero(row, sizeof(row));
+       memset(row, 0, sizeof(row));
 
        row[COL_OPTION] =
            g_strdup_printf("%s %s", menu_get_prompt(menu),
@@ -1516,7 +1516,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))*/
                if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))