SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use SD_ID128_UUID_FORMAT_STR as appropriate

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2019-04-05 13:48:38 +02:00
parent 38df8d3f52
commit bd44566c4d
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/efivars.c
+1 -1
View File
@@ -772,7 +772,7 @@ int efi_loader_get_device_part_uuid(sd_id128_t *u) {
if (r < 0)
return r;
if (sscanf(p, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
if (sscanf(p, SD_ID128_UUID_FORMAT_STR,
&parsed[0], &parsed[1], &parsed[2], &parsed[3],
&parsed[4], &parsed[5], &parsed[6], &parsed[7],
&parsed[8], &parsed[9], &parsed[10], &parsed[11],
src/shared/id128-print.c
+1 -1
View File
@@ -33,7 +33,7 @@ int id128_pretty_print(sd_id128_t id, bool pretty) {
printf("As string:\n"
"%s" SD_ID128_FORMAT_STR "%s\n\n"
"As UUID:\n"
"%s%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x%s\n\n"
"%s" SD_ID128_UUID_FORMAT_STR "%s\n\n"
"As %s macro:\n"
"%s#define MESSAGE_XYZ SD_ID128_MAKE(",
on, SD_ID128_FORMAT_VAL(id), off,