diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-02-14 14:52:02 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2022-02-14 15:13:23 +0100 |
| commit | b74163607b4e513288d38b7f16e230f5a61400c0 (patch) | |
| tree | 9a48311cacb1cd135cb40586a24411810ef20672 /src/shared/mkfs-util.c | |
| parent | fdf9de694f4c55b8cebd9d749f9c17c4bfb32650 (diff) | |
| download | systemd-b74163607b4e513288d38b7f16e230f5a61400c0.tar.gz | |
sd128: export sd_id128_to_uuid_string()
We expose various other forms of UUID helpers already, i.e.
SD_ID128_UUID_FORMAT_STR and SD_ID128_MAKE_UUID_STR(), and we parse
UUIDs, hence add a high-level helper for formatting UUIDs too.
This doesn't add any new code, it just moves some helpers
id128-util.[ch] → sd-id128.[ch], to make them public.
Diffstat (limited to 'src/shared/mkfs-util.c')
| -rw-r--r-- | src/shared/mkfs-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c index 061a2c2ef7..accd64f9e8 100644 --- a/src/shared/mkfs-util.c +++ b/src/shared/mkfs-util.c @@ -94,7 +94,7 @@ int make_filesystem( bool discard) { _cleanup_free_ char *mkfs = NULL, *mangled_label = NULL; - char vol_id[CONST_MAX(ID128_UUID_STRING_MAX, 8 + 1)] = {}; + char vol_id[CONST_MAX(SD_ID128_UUID_STRING_MAX, 8U + 1U)] = {}; int r; assert(node); @@ -144,7 +144,7 @@ int make_filesystem( } if (isempty(vol_id)) - id128_to_uuid_string(uuid, vol_id); + assert_se(sd_id128_to_uuid_string(uuid, vol_id)); r = safe_fork("(mkfs)", FORK_RESET_SIGNALS|FORK_RLIMIT_NOFILE_SAFE|FORK_DEATHSIG|FORK_LOG|FORK_WAIT|FORK_STDOUT_TO_STDERR, NULL); if (r < 0) |