diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-08-20 10:54:49 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-08-20 11:09:48 +0200 |
| commit | 85b55869bc1065754fdd35ef43ff324cc5e3ef2e (patch) | |
| tree | 013fe377acb8a8617c700af9b14fa3be95acb06c /src/veritysetup/veritysetup-generator.c | |
| parent | sd-id128: add compound literal love to sd_id128_to_string() + id128_to_uuid_s... (diff) | |
| download | systemd-85b55869bc1065754fdd35ef43ff324cc5e3ef2e.tar.xz systemd-85b55869bc1065754fdd35ef43ff324cc5e3ef2e.zip | |
tree-wide: port everything over to new sd-id128 compund literal bliss
Diffstat (limited to '')
| -rw-r--r-- | src/veritysetup/veritysetup-generator.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c index fd95e6f304..1c68d28364 100644 --- a/src/veritysetup/veritysetup-generator.c +++ b/src/veritysetup/veritysetup-generator.c @@ -194,7 +194,6 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat static int determine_devices(void) { _cleanup_free_ void *m = NULL; sd_id128_t root_uuid, verity_uuid; - char ids[ID128_UUID_STRING_MAX]; size_t l; int r; @@ -217,7 +216,7 @@ static int determine_devices(void) { if (!arg_data_what) { memcpy(&root_uuid, m, sizeof(root_uuid)); - arg_data_what = path_join("/dev/disk/by-partuuid", id128_to_uuid_string(root_uuid, ids)); + arg_data_what = path_join("/dev/disk/by-partuuid", ID128_TO_UUID_STRING(root_uuid)); if (!arg_data_what) return log_oom(); } @@ -225,7 +224,7 @@ static int determine_devices(void) { if (!arg_hash_what) { memcpy(&verity_uuid, (uint8_t*) m + l - sizeof(verity_uuid), sizeof(verity_uuid)); - arg_hash_what = path_join("/dev/disk/by-partuuid", id128_to_uuid_string(verity_uuid, ids)); + arg_hash_what = path_join("/dev/disk/by-partuuid", ID128_TO_UUID_STRING(verity_uuid)); if (!arg_hash_what) return log_oom(); } |