X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-id128.h;h=fa17be84347815de3e15079400b9f4ecaec1b184;hb=e88baee88fad8bc59d33b55a7a2d640ef9e16cd6;hp=7d5e6c440e3567a1f877ccec3be2cf878d0d7878;hpb=cb07866b1b7c11e687a322d70dd9f9d73bbbe488;p=elogind.git diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h index 7d5e6c440..fa17be843 100644 --- a/src/systemd/sd-id128.h +++ b/src/systemd/sd-id128.h @@ -23,7 +23,6 @@ ***/ #include -#include #include #ifdef __cplusplus @@ -57,13 +56,17 @@ int sd_id128_get_boot(sd_id128_t *ret); * times. It is hence not a good idea to call this macro with an * expensive function as paramater or an expression with side * effects */ + #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] -static inline bool sd_id128_equal(sd_id128_t a, sd_id128_t b) { +static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) { return memcmp(&a, &b, 16) == 0; } +#define SD_ID128_NULL ((sd_id128_t) { .qwords = { 0, 0 }}) +#define MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x) + #ifdef __cplusplus } #endif