summaryrefslogtreecommitdiff
path: root/src/systemd
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-04-11 18:57:18 +0200
committerGitHub <noreply@github.com>2019-04-11 18:57:18 +0200
commit3b21fd06ed6d5818cb9b88eb8725253aa62bc675 (patch)
tree693a0af17deeda0c9812298f8382c4ffa7bb0bac /src/systemd
parent1e5d2d656420d0e755dbcf72aeba3c3aba54e956 (diff)
parentcce9457c70b6bb94213dfba0010b3ae25950b845 (diff)
downloadsystemd-3b21fd06ed6d5818cb9b88eb8725253aa62bc675.tar.gz
Merge pull request #12219 from keszybz/bootctl-check-entries
bootctl: check entries when showing them
Diffstat (limited to 'src/systemd')
-rw-r--r--src/systemd/sd-id128.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index bdf88ed53f..c5fbe0a4f1 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -63,6 +63,9 @@ int sd_id128_get_boot_app_specific(sd_id128_t app_id, sd_id128_t *ret);
#define SD_ID128_FORMAT_STR "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
#define SD_ID128_FORMAT_VAL(x) (x).bytes[0], (x).bytes[1], (x).bytes[2], (x).bytes[3], (x).bytes[4], (x).bytes[5], (x).bytes[6], (x).bytes[7], (x).bytes[8], (x).bytes[9], (x).bytes[10], (x).bytes[11], (x).bytes[12], (x).bytes[13], (x).bytes[14], (x).bytes[15]
+/* Like SD_ID128_FORMAT_STR, but formats as UUID, not in plain format */
+#define SD_ID128_UUID_FORMAT_STR "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
+
#define SD_ID128_CONST_STR(x) \
((const char[SD_ID128_STRING_MAX]) { \
((x).bytes[0] >> 4) >= 10 ? 'a' + ((x).bytes[0] >> 4) - 10 : '0' + ((x).bytes[0] >> 4), \