diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-12 07:22:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-12 07:33:52 +0200 |
| commit | d3d45fd1f9adf4812a658cf8bd3600c361eb5ab4 (patch) | |
| tree | daef05193264573d73798009aa688199f1e5fc76 /src/systemd | |
| parent | a94ccc9acc47f08943f017a5040abeb05afee183 (diff) | |
| parent | 2b1ea1613d16c7fed854d0e8e940bf32675a92b3 (diff) | |
| download | NetworkManager-d3d45fd1f9adf4812a658cf8bd3600c361eb5ab4.tar.gz | |
systemd: merge branch systemd into master
Diffstat (limited to 'src/systemd')
| -rw-r--r-- | src/systemd/src/libsystemd/sd-id128/id128-util.h | 3 | ||||
| -rw-r--r-- | src/systemd/src/systemd/sd-id128.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.h b/src/systemd/src/libsystemd/sd-id128/id128-util.h index 65f14ab252..82a69a77f3 100644 --- a/src/systemd/src/libsystemd/sd-id128/id128-util.h +++ b/src/systemd/src/libsystemd/sd-id128/id128-util.h @@ -10,9 +10,6 @@ char *id128_to_uuid_string(sd_id128_t id, char s[37]); -/* Like SD_ID128_FORMAT_STR, but formats as UUID, not in plain format */ -#define ID128_UUID_FORMAT_STR "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" - bool id128_is_valid(const char *s) _pure_; typedef enum Id128Format { diff --git a/src/systemd/src/systemd/sd-id128.h b/src/systemd/src/systemd/sd-id128.h index bdf88ed53f..c5fbe0a4f1 100644 --- a/src/systemd/src/systemd/sd-id128.h +++ b/src/systemd/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), \ |