X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemd%2Fsd-id128.h;h=9f445278bbf6481399ca9c16d736893bd46c00f6;hp=fb82b6fa48a123803f42582ad416f9c1565d995e;hb=8b89c78c709c597c8838095ff33845ffa7b1f268;hpb=9bf3b53533cdc9b95c921b71da755401f223f765 diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h index fb82b6fa4..9f445278b 100644 --- a/src/systemd/sd-id128.h +++ b/src/systemd/sd-id128.h @@ -29,7 +29,7 @@ _SD_BEGIN_DECLARATIONS; -/* 128 Bit ID APIs. See sd-id128(3) for more information. */ +/* 128-bit ID APIs. See sd-id128(3) for more information. */ typedef union sd_id128 sd_id128_t; @@ -54,9 +54,13 @@ int sd_id128_get_boot(sd_id128_t *ret); ((const sd_id128_t) { .bytes = { 0x##v0, 0x##v1, 0x##v2, 0x##v3, 0x##v4, 0x##v5, 0x##v6, 0x##v7, \ 0x##v8, 0x##v9, 0x##v10, 0x##v11, 0x##v12, 0x##v13, 0x##v14, 0x##v15 }}) +#define SD_ID128_ARRAY(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) \ + { .bytes = { 0x##v0, 0x##v1, 0x##v2, 0x##v3, 0x##v4, 0x##v5, 0x##v6, 0x##v7, \ + 0x##v8, 0x##v9, 0x##v10, 0x##v11, 0x##v12, 0x##v13, 0x##v14, 0x##v15 }} + /* Note that SD_ID128_FORMAT_VAL will evaluate the passed argument 16 * times. It is hence not a good idea to call this macro with an - * expensive function as paramater or an expression with side + * expensive function as parameter 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" @@ -102,6 +106,10 @@ _sd_pure_ static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) { return memcmp(&a, &b, 16) == 0; } +_sd_pure_ static inline int sd_id128_is_null(sd_id128_t a) { + return a.qwords[0] == 0 && a.qwords[1] == 0; +} + #define SD_ID128_NULL ((const sd_id128_t) { .qwords = { 0, 0 }}) _SD_END_DECLARATIONS;