mirror of
https://github.com/systemd/systemd
synced 2024-10-02 22:37:25 +00:00
core: cast ignored retval of deserialize_* to void
Fixes CID#1547098
This commit is contained in:
parent
42e9967baf
commit
42fdb14286
|
@ -3286,11 +3286,11 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
|
||||||
else
|
else
|
||||||
s->main_exec_status.status = i;
|
s->main_exec_status.status = i;
|
||||||
} else if (streq(key, "main-exec-status-start"))
|
} else if (streq(key, "main-exec-status-start"))
|
||||||
deserialize_dual_timestamp(value, &s->main_exec_status.start_timestamp);
|
(void) deserialize_dual_timestamp(value, &s->main_exec_status.start_timestamp);
|
||||||
else if (streq(key, "main-exec-status-exit"))
|
else if (streq(key, "main-exec-status-exit"))
|
||||||
deserialize_dual_timestamp(value, &s->main_exec_status.exit_timestamp);
|
(void) deserialize_dual_timestamp(value, &s->main_exec_status.exit_timestamp);
|
||||||
else if (streq(key, "main-exec-status-handoff"))
|
else if (streq(key, "main-exec-status-handoff"))
|
||||||
deserialize_dual_timestamp(value, &s->main_exec_status.handoff_timestamp);
|
(void) deserialize_dual_timestamp(value, &s->main_exec_status.handoff_timestamp);
|
||||||
else if (STR_IN_SET(key, "main-command", "control-command")) {
|
else if (STR_IN_SET(key, "main-command", "control-command")) {
|
||||||
r = service_deserialize_exec_command(u, key, value);
|
r = service_deserialize_exec_command(u, key, value);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
|
@ -3371,15 +3371,15 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
|
||||||
s->status_errno = i;
|
s->status_errno = i;
|
||||||
|
|
||||||
} else if (streq(key, "watchdog-timestamp"))
|
} else if (streq(key, "watchdog-timestamp"))
|
||||||
deserialize_dual_timestamp(value, &s->watchdog_timestamp);
|
(void) deserialize_dual_timestamp(value, &s->watchdog_timestamp);
|
||||||
else if (streq(key, "watchdog-original-usec"))
|
else if (streq(key, "watchdog-original-usec"))
|
||||||
deserialize_usec(value, &s->watchdog_original_usec);
|
(void) deserialize_usec(value, &s->watchdog_original_usec);
|
||||||
else if (streq(key, "watchdog-override-usec")) {
|
else if (streq(key, "watchdog-override-usec")) {
|
||||||
if (deserialize_usec(value, &s->watchdog_override_usec) >= 0)
|
if (deserialize_usec(value, &s->watchdog_override_usec) >= 0)
|
||||||
s->watchdog_override_enable = true;
|
s->watchdog_override_enable = true;
|
||||||
|
|
||||||
} else if (streq(key, "reload-begin-usec"))
|
} else if (streq(key, "reload-begin-usec"))
|
||||||
deserialize_usec(value, &s->reload_begin_usec);
|
(void) deserialize_usec(value, &s->reload_begin_usec);
|
||||||
else
|
else
|
||||||
log_unit_debug(u, "Unknown serialization key: %s", key);
|
log_unit_debug(u, "Unknown serialization key: %s", key);
|
||||||
|
|
||||||
|
|
|
@ -2823,8 +2823,7 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
|
||||||
log_unit_debug(u, "No matching ffs socket found: %s", value);
|
log_unit_debug(u, "No matching ffs socket found: %s", value);
|
||||||
|
|
||||||
} else if (streq(key, "trigger-ratelimit"))
|
} else if (streq(key, "trigger-ratelimit"))
|
||||||
deserialize_ratelimit(&s->trigger_limit, key, value);
|
(void) deserialize_ratelimit(&s->trigger_limit, key, value);
|
||||||
|
|
||||||
else
|
else
|
||||||
log_unit_debug(UNIT(s), "Unknown serialization key: %s", key);
|
log_unit_debug(UNIT(s), "Unknown serialization key: %s", key);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue