From 376ee2c312b87951028a0adff96b1052f32475fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 15 Jan 2022 13:38:30 +0100 Subject: [PATCH 1/2] sd-device: silence gcc warning with newest gcc --- src/libsystemd/sd-device/sd-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 94ea61cc8d..b163a0fb6b 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1392,7 +1392,7 @@ int device_read_db_internal_filename(sd_device *device, const char *filename) { _cleanup_free_ char *db = NULL; const char *value; size_t db_len; - char key; + char key = '\0'; /* Unnecessary initialization to appease gcc-12.0.0-0.4.fc36 */ int r; enum { From e47a3af44e71c2f7dcd4a60b43befcccd968c64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 15 Jan 2022 13:38:49 +0100 Subject: [PATCH 2/2] sd-device: drop unnecessary parenthesis --- src/libsystemd/sd-device/sd-device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index b163a0fb6b..ece01e35f7 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1419,7 +1419,7 @@ int device_read_db_internal_filename(sd_device *device, const char *filename) { device->db_loaded = true; - for (size_t i = 0; i < db_len; i++) { + for (size_t i = 0; i < db_len; i++) switch (state) { case PRE_KEY: if (!strchr(NEWLINE, db[i])) { @@ -1467,7 +1467,6 @@ int device_read_db_internal_filename(sd_device *device, const char *filename) { default: return log_device_debug_errno(device, SYNTHETIC_ERRNO(EINVAL), "sd-device: invalid db syntax."); } - } return 0; }