installer: Remove some unused variables.
authorSascha Wildner <saw@online.de>
Sat, 27 Oct 2012 11:23:50 +0000 (13:23 +0200)
committerSascha Wildner <saw@online.de>
Sat, 27 Oct 2012 22:38:26 +0000 (00:38 +0200)
Found-by: gcc47
usr.sbin/installer/dfuibe_installer/flow.c
usr.sbin/installer/dfuife_curses/curses_form.c
usr.sbin/installer/dfuife_curses/curses_xlat.c

index 0783fd3..934a11a 100644 (file)
@@ -171,7 +171,6 @@ void
 state_welcome(struct i_fn_args *a)
 {
        struct dfui_form *f;
-       struct dfui_action *k;
        struct dfui_response *r;
        char msg_buf[2][1024];
 
@@ -244,7 +243,7 @@ state_welcome(struct i_fn_args *a)
            dfui_info_new(_("Live CD Utilities"),
            _("Utilities to work with disks, diagnostics, and the LiveCD Environment"), ""));
 
-       k = dfui_form_action_add(f, "exit",
+       dfui_form_action_add(f, "exit",
            dfui_info_new(_("Exit to Live CD"),
            _("Exit this program to a login prompt with access to the LiveCD"), ""));
 
index 44ab7b8..34e0e20 100644 (file)
@@ -243,7 +243,6 @@ curses_form_descriptive_labels_add(struct curses_form *cf, const char *text,
                                   unsigned int x, unsigned int y,
                                   unsigned int width)
 {
-       struct curses_widget *w;
        int done = 0;
        int pos = 0;
        char *line;
@@ -253,7 +252,7 @@ curses_form_descriptive_labels_add(struct curses_form *cf, const char *text,
                done = extract_wrapped_line(text, line, width, &pos);
                dfui_debug("line = `%s', done = %d, width = %d, form width = %d : ",
                   line, done, width, cf->width);
-               w = curses_form_widget_add(cf, x, y++, 0,
+               curses_form_widget_add(cf, x, y++, 0,
                    CURSES_LABEL, line, 0, CURSES_WIDGET_WIDEN);
                dfui_debug("now %d\n", cf->width);
        }
index 0bba107..c51046e 100644 (file)
@@ -472,7 +472,7 @@ curses_form_construct_from_dfui_form_single(const struct dfui_form *f)
        unsigned int max_button_width, total_button_width;
        struct dfui_field *fi;
        struct dfui_action *a;
-       struct curses_widget *label, *xbox;
+       struct curses_widget *xbox;
        struct dfui_celldata *cd;
        const char *value;
        int is_menu;
@@ -556,7 +556,7 @@ curses_form_construct_from_dfui_form_single(const struct dfui_form *f)
         */
        for (fi = dfui_form_field_get_first(f); fi != NULL;
             fi = dfui_field_get_next(fi)) {
-               label = curses_form_widget_add(cf, 1,
+               curses_form_widget_add(cf, 1,
                    cf->height, max_label_width, CURSES_LABEL,
                    dfui_info_get_name(dfui_field_get_info(fi)), 0, 0);