summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-07-17 11:08:09 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-07-17 11:08:09 +0800
commitc1359507c1556ba5f6d2afd0e401abcfe66f02a9 (patch)
treeebfb48c4fe90b3a47f7f459d2744961ea806987c /ui
parent71f338ca02092cb75608a511d6885affaf7adb66 (diff)
downloadpetitboot-c1359507c1556ba5f6d2afd0e401abcfe66f02a9.zip
petitboot-c1359507c1556ba5f6d2afd0e401abcfe66f02a9.tar.gz
ui/ncurses: Remove net_conf parameter from sconfig_screen_layout_widgets
We always pass screen->net_conf_type as this parameter, so we may as weel grab it from screen directly. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'ui')
-rw-r--r--ui/ncurses/nc-config.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 3107c72..6aecb33 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -319,8 +319,7 @@ static int layout_pair(struct config_screen *screen, int y,
return max(widget_height(label_w), widget_height(field));
}
-static void config_screen_layout_widgets(struct config_screen *screen,
- enum net_conf_type net_conf)
+static void config_screen_layout_widgets(struct config_screen *screen)
{
struct nc_widget *wl, *wf, *wh;
int y, x, help_x;
@@ -351,8 +350,8 @@ static void config_screen_layout_widgets(struct config_screen *screen,
wl = widget_label_base(screen->widgets.iface_l);
wf = widget_select_base(screen->widgets.iface_f);
- show = net_conf == NET_CONF_TYPE_DHCP_ONE ||
- net_conf == NET_CONF_TYPE_STATIC;
+ show = screen->net_conf_type == NET_CONF_TYPE_DHCP_ONE ||
+ screen->net_conf_type == NET_CONF_TYPE_STATIC;
widget_set_visible(wl, show);
widget_set_visible(wf, show);
@@ -361,7 +360,7 @@ static void config_screen_layout_widgets(struct config_screen *screen,
y += layout_pair(screen, y, screen->widgets.iface_l, wf) + 1;
/* conditionally show static IP params */
- show = net_conf == NET_CONF_TYPE_STATIC;
+ show = screen->net_conf_type == NET_CONF_TYPE_STATIC;
wl = widget_label_base(screen->widgets.ip_addr_l);
wf = widget_textbox_base(screen->widgets.ip_addr_f);
@@ -410,7 +409,7 @@ static void config_screen_layout_widgets(struct config_screen *screen,
y++;
/* we show the DNS/DHCP help if we're configuring DHCP */
- show = net_conf != NET_CONF_TYPE_STATIC;
+ show = screen->net_conf_type != NET_CONF_TYPE_STATIC;
wl = widget_label_base(screen->widgets.dns_dhcp_help_l);
widget_set_visible(wl, show);
if (show) {
@@ -433,7 +432,7 @@ static void config_screen_network_change(void *arg, int value)
struct config_screen *screen = arg;
screen->net_conf_type = value;
widgetset_unpost(screen->widgetset);
- config_screen_layout_widgets(screen, value);
+ config_screen_layout_widgets(screen);
widgetset_post(screen->widgetset);
}
@@ -664,7 +663,7 @@ static void config_screen_draw(struct config_screen *screen,
screen->net_conf_type = find_net_conf_type(config);
config_screen_setup_widgets(screen, config, sysinfo);
- config_screen_layout_widgets(screen, screen->net_conf_type);
+ config_screen_layout_widgets(screen);
}
if (repost)
OpenPOWER on IntegriCloud