From 42fdb14286a457fcad99a1e718e0b7b2ae6c9a8f Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Mon, 17 Jun 2024 07:21:43 +0200 Subject: [PATCH] core: cast ignored retval of deserialize_* to void Fixes CID#1547098 --- src/core/service.c | 12 ++++++------ src/core/socket.c | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/core/service.c b/src/core/service.c index 1e26a443646..92ce26c234c 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -3286,11 +3286,11 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, else s->main_exec_status.status = i; } 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")) - 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")) - 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")) { r = service_deserialize_exec_command(u, key, value); if (r < 0) @@ -3371,15 +3371,15 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, s->status_errno = i; } 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")) - deserialize_usec(value, &s->watchdog_original_usec); + (void) deserialize_usec(value, &s->watchdog_original_usec); else if (streq(key, "watchdog-override-usec")) { if (deserialize_usec(value, &s->watchdog_override_usec) >= 0) s->watchdog_override_enable = true; } else if (streq(key, "reload-begin-usec")) - deserialize_usec(value, &s->reload_begin_usec); + (void) deserialize_usec(value, &s->reload_begin_usec); else log_unit_debug(u, "Unknown serialization key: %s", key); diff --git a/src/core/socket.c b/src/core/socket.c index 4be308265a7..63c4c1a7aa6 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -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); } else if (streq(key, "trigger-ratelimit")) - deserialize_ratelimit(&s->trigger_limit, key, value); - + (void) deserialize_ratelimit(&s->trigger_limit, key, value); else log_unit_debug(UNIT(s), "Unknown serialization key: %s", key);