]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: Fix Wformat warnings
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 1 Oct 2024 07:28:42 +0000 (09:28 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 2 Oct 2024 09:26:58 +0000 (11:26 +0200)
The latest clang has started catching more integer promotions which
cause us to pass the wrong type to printf() format specifiers so let's
fix those.

src/pcrlock/pcrlock-firmware.c
src/udev/cdrom_id/cdrom_id.c
src/udev/dmi_memory_id/dmi_memory_id.c

index 6fd73631440865f0ecff006d57fbe6b3b553052e..059c87c62233ccc42be51262a1a37c876c6e6032 100644 (file)
@@ -128,7 +128,7 @@ int validate_firmware_header(
 
         log_debug("TPM PC Client Platform Firmware Profile: family %u.%u, revision %u.%u",
                   id->specVersionMajor, id->specVersionMinor,
-                  id->specErrata / 100, id->specErrata % 100);
+                  id->specErrata / 100U, id->specErrata % 100U);
 
         if (h->eventDataSize < (uint64_t) offsetof(TCG_EfiSpecIDEvent, digestSizes) + (uint64_t) (id->numberOfAlgorithms * sizeof(TCG_EfiSpecIdEventAlgorithmSize)) + 1U)
                 return log_error_errno(SYNTHETIC_ERRNO(EBADMSG), "Event log header doesn't fit all algorithms.");
index 195fadc5697e81f19273f0228d07a87d6de4f5bf..1366f9e0458e122948a3160360c2e9e280884cdc 100644 (file)
@@ -477,7 +477,7 @@ static int cd_profiles(Context *c) {
 
                 switch (feature) {
                 case 0x00:
-                        log_debug("GET CONFIGURATION: feature 'profiles', with %u entries", features[i + 3] / 4);
+                        log_debug("GET CONFIGURATION: feature 'profiles', with %u entries", features[i + 3] / 4U);
                         feature_profiles(c, features + i + 4, MIN(features[i + 3], len - i - 4));
                         break;
                 default:
index 9823df01c71c22d2aaa90460aa3de3ede463bf60..71cec5fc4743a837348d106f4d6ab97721c2ca9c 100644 (file)
@@ -399,7 +399,7 @@ static void dmi_memory_device_manufacturer_id(
         /* LSB is 7-bit Odd Parity number of continuation codes */
         if (code != 0)
                 printf("MEMORY_DEVICE_%u_%s=Bank %d, Hex 0x%02X\n", slot_num, attr_suffix,
-                       (code & 0x7F) + 1, code >> 8);
+                       (code & 0x7F) + 1, (uint16_t) (code >> 8));
 }
 
 static void dmi_memory_device_product_id(