diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 17:38:58 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 18:12:27 +0200 |
commit | 7accd7912a19638cc3a5bf735f028fefaa5fd7b7 (patch) | |
tree | 1538623184311aec20256a0f1189ac549fbaa981 /src/systemd/sd-id128.h | |
parent | 83712407769cf720122d8b6ea390cb29e316d4e1 (diff) |
Prep v233: Add missing updates from upstream in src/systemd
Diffstat (limited to 'src/systemd/sd-id128.h')
-rw-r--r-- | src/systemd/sd-id128.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h index ee011b186..9b38969b7 100644 --- a/src/systemd/sd-id128.h +++ b/src/systemd/sd-id128.h @@ -39,12 +39,12 @@ union sd_id128 { #define SD_ID128_STRING_MAX 33 char *sd_id128_to_string(sd_id128_t id, char s[SD_ID128_STRING_MAX]); - int sd_id128_from_string(const char *s, sd_id128_t *ret); int sd_id128_randomize(sd_id128_t *ret); int sd_id128_get_machine(sd_id128_t *ret); +int sd_id128_get_machine_app_specific(sd_id128_t app_id, sd_id128_t *ret); int sd_id128_get_boot(sd_id128_t *ret); int sd_id128_get_invocation(sd_id128_t *ret); @@ -100,6 +100,9 @@ int sd_id128_get_invocation(sd_id128_t *ret); ((x).bytes[15] & 15) >= 10 ? 'a' + ((x).bytes[15] & 15) - 10 : '0' + ((x).bytes[15] & 15), \ 0 }) +#define SD_ID128_MAKE_STR(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) \ + #a #b #c #d #e #f #g #h #i #j #k #l #m #n #o #p + _sd_pure_ static __inline__ int sd_id128_equal(sd_id128_t a, sd_id128_t b) { return memcmp(&a, &b, 16) == 0; } |