mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 18:55:40 +03:00
sd-dhcp-client: shorten code a bit
This commit is contained in:
parent
67d8cd8193
commit
d57b62be0d
@ -1777,7 +1777,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
|
|||||||
static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, int len) {
|
static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, int len) {
|
||||||
DHCP_CLIENT_DONT_DESTROY(client);
|
DHCP_CLIENT_DONT_DESTROY(client);
|
||||||
char time_string[FORMAT_TIMESPAN_MAX];
|
char time_string[FORMAT_TIMESPAN_MAX];
|
||||||
int r = 0, notify_event = 0;
|
int r, notify_event = 0;
|
||||||
|
|
||||||
assert(client);
|
assert(client);
|
||||||
assert(client->event);
|
assert(client->event);
|
||||||
@ -1800,9 +1800,6 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i
|
|||||||
0, 0,
|
0, 0,
|
||||||
client_timeout_resend, client,
|
client_timeout_resend, client,
|
||||||
client->event_priority, "dhcp4-resend-timer", true);
|
client->event_priority, "dhcp4-resend-timer", true);
|
||||||
if (r < 0)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DHCP_STATE_REBOOTING:
|
case DHCP_STATE_REBOOTING:
|
||||||
@ -1830,7 +1827,6 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i
|
|||||||
|
|
||||||
client->start_delay = CLAMP(client->start_delay * 2,
|
client->start_delay = CLAMP(client->start_delay * 2,
|
||||||
RESTART_AFTER_NAK_MIN_USEC, RESTART_AFTER_NAK_MAX_USEC);
|
RESTART_AFTER_NAK_MIN_USEC, RESTART_AFTER_NAK_MAX_USEC);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
@ -1883,19 +1879,18 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i
|
|||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
r = client_timeout_t1(NULL, 0, client);
|
r = client_timeout_t1(NULL, 0, client);
|
||||||
if (r < 0)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DHCP_STATE_INIT:
|
case DHCP_STATE_INIT:
|
||||||
case DHCP_STATE_INIT_REBOOT:
|
case DHCP_STATE_INIT_REBOOT:
|
||||||
|
r = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DHCP_STATE_STOPPED:
|
case DHCP_STATE_STOPPED:
|
||||||
r = -EINVAL;
|
r = -EINVAL;
|
||||||
goto error;
|
goto error;
|
||||||
|
default:
|
||||||
|
assert_not_reached("invalid state");
|
||||||
}
|
}
|
||||||
|
|
||||||
error:
|
error:
|
||||||
|
Loading…
Reference in New Issue
Block a user