Browse Source

Fix confusing indentation pointed out by GCC 6 (closes: #811589).

tags/1.136
Colin Watson 5 years ago
parent
commit
3aaa7e162e
2 changed files with 26 additions and 20 deletions
  1. +6
    -0
      debian/changelog
  2. +20
    -20
      wpa.c

+ 6
- 0
debian/changelog View File

@@ -1,3 +1,9 @@
netcfg (1.136) UNRELEASED; urgency=medium

* Fix confusing indentation pointed out by GCC 6 (closes: #811589).

-- Colin Watson <cjwatson@debian.org> Wed, 20 Jan 2016 13:41:12 +0000

netcfg (1.135) unstable; urgency=medium

[ Philipp Kern ]


+ 20
- 20
wpa.c View File

@@ -261,29 +261,29 @@ int poll_wpa_supplicant(struct debconfclient *client)
CMD_PROGRESSCANCELLED)
goto stop;

if (debconf_progress_step(client, 1) == CMD_PROGRESSCANCELLED)
goto stop;
if (debconf_progress_step(client, 1) == CMD_PROGRESSCANCELLED)
goto stop;

sleep(1);
sleep(1);

if ((seconds_slept <= wpa_timeout) && (seconds_slept % 5) == 0) {
if (!wpa_status()) {
debconf_progress_set(client, wpa_timeout);
debconf_progress_info(client, "netcfg/wpa_success_note");
state = 0;
sleep(2);
goto stop;
}
}
if (seconds_slept == wpa_timeout) {
debconf_progress_stop(client);
debconf_capb(client, "backup");
debconf_capb(client, "");
debconf_input(client, "critical", "netcfg/wpa_supplicant_failed");
debconf_go(client);
debconf_capb(client, "backup");
return 1;
if ((seconds_slept <= wpa_timeout) && (seconds_slept % 5) == 0) {
if (!wpa_status()) {
debconf_progress_set(client, wpa_timeout);
debconf_progress_info(client, "netcfg/wpa_success_note");
state = 0;
sleep(2);
goto stop;
}
}
if (seconds_slept == wpa_timeout) {
debconf_progress_stop(client);
debconf_capb(client, "backup");
debconf_capb(client, "");
debconf_input(client, "critical", "netcfg/wpa_supplicant_failed");
debconf_go(client);
debconf_capb(client, "backup");
return 1;
}
}
stop:
debconf_progress_stop(client);


Loading…
Cancel
Save