[RFC v4] [PATCH 1/3] Whitespace changes to prepare for more cases.
Once the WPA cases are added the enum spans many columns. Break it into one line per tag.
Change whitespace in a few functions that we will be working on to make future patches cleaner.
---
packages/netcfg/dhcp.c | 4 ++--
packages/netcfg/netcfg-static.c | 13 ++++++++++---
packages/netcfg/netcfg.c | 16 +++++++++++++---
3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/packages/netcfg/dhcp.c b/packages/netcfg/dhcp.c
index d58119c..37a5890 100644
--- a/packages/netcfg/dhcp.c
+++ b/packages/netcfg/dhcp.c
@@ -478,11 +478,11 @@ int netcfg_activate_dhcp (struct debconfclient *client)
for (;;) {
switch (wifistate) {
case ESSID:
- wifistate = ( netcfg_wireless_set_essid(client, interface, "high") == GO_BACK ) ?
+ wifistate = (netcfg_wireless_set_essid(client, interface, "high") == GO_BACK ) ?
ABORT : WEP;
break;
case WEP:
- wifistate = ( netcfg_wireless_set_wep (client, interface) == GO_BACK ) ?
+ wifistate = (netcfg_wireless_set_wep(client, interface) == GO_BACK ) ?
ESSID : DONE;
break;
case ABORT:
diff --git a/packages/netcfg/netcfg-static.c b/packages/netcfg/netcfg-static.c
index 8feac2c..285f26f 100644
--- a/packages/netcfg/netcfg-static.c
+++ b/packages/netcfg/netcfg-static.c
@@ -33,7 +33,14 @@ int main(int argc, char** argv)
static struct debconfclient *client;
static int requested_wireless_tools = 0;
- enum { BACKUP, GET_INTERFACE, GET_HOSTNAME_ONLY, GET_STATIC, WCONFIG, WCONFIG_ESSID, WCONFIG_WEP, QUIT} state = GET_INTERFACE;
+ enum { BACKUP,
+ GET_INTERFACE,
+ GET_HOSTNAME_ONLY,
+ GET_STATIC,
+ WCONFIG,
+ WCONFIG_ESSID,
+ WCONFIG_WEP,
+ QUIT } state = GET_INTERFACE;
/* initialize libd-i */
di_system_init("netcfg-static");
@@ -88,14 +95,14 @@ int main(int argc, char** argv)
break;
case WCONFIG_ESSID:
- if (netcfg_wireless_set_essid (client, interface, NULL))
+ if (netcfg_wireless_set_essid(client, interface, NULL))
state = BACKUP;
else
state = WCONFIG_WEP;
break;
case WCONFIG_WEP:
- if (netcfg_wireless_set_wep (client, interface))
+ if (netcfg_wireless_set_wep(client, interface))
state = WCONFIG_ESSID;
else
state = GET_STATIC;
diff --git a/packages/netcfg/netcfg.c b/packages/netcfg/netcfg.c
index 710327b..3c638aa 100644
--- a/packages/netcfg/netcfg.c
+++ b/packages/netcfg/netcfg.c
@@ -61,7 +61,17 @@ response_t netcfg_get_method(struct debconfclient *client)
int main(int argc, char *argv[])
{
int num_interfaces = 0;
- enum { BACKUP, GET_INTERFACE, GET_HOSTNAME_ONLY, GET_METHOD, GET_DHCP, GET_STATIC, WCONFIG, WCONFIG_ESSID, WCONFIG_WEP, QUIT } state = GET_INTERFACE;
+ enum { BACKUP,
+ GET_INTERFACE,
+ GET_HOSTNAME_ONLY,
+ GET_METHOD,
+ GET_DHCP,
+ GET_STATIC,
+ WCONFIG,
+ WCONFIG_ESSID,
+ WCONFIG_WEP,
+ QUIT } state = GET_INTERFACE;
+
static struct debconfclient *client;
static int requested_wireless_tools = 0;
char **ifaces;
@@ -239,14 +249,14 @@ int main(int argc, char *argv[])
break;
case WCONFIG_ESSID:
- if (netcfg_wireless_set_essid (client, interface, NULL) == GO_BACK)
+ if (netcfg_wireless_set_essid(client, interface, NULL) == GO_BACK)
state = BACKUP;
else
state = WCONFIG_WEP;
break;
case WCONFIG_WEP:
- if (netcfg_wireless_set_wep (client, interface) == GO_BACK)
+ if (netcfg_wireless_set_wep(client, interface) == GO_BACK)
state = WCONFIG_ESSID;
else
state = GET_METHOD;
--
1.5.5.1
Reply to: