X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-id128.h;h=4dff0b9b811df5d61cea402907a77294aaedb556;hb=2027bfc6205de5f5313609fe0ca7e0649640219b;hp=f14efeb28dfe121b3576491a58454922da03b55a;hpb=b28ff39f42877daef31383748fd2f313d7fd67c1;p=elogind.git diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h index f14efeb28..4dff0b9b8 100644 --- a/src/systemd/sd-id128.h +++ b/src/systemd/sd-id128.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - #ifndef foosdid128hfoo #define foosdid128hfoo @@ -29,7 +27,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; @@ -60,7 +58,7 @@ int sd_id128_get_boot(sd_id128_t *ret); /* 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,10 +100,14 @@ int sd_id128_get_boot(sd_id128_t *ret); ((x).bytes[15] & 15) >= 10 ? 'a' + ((x).bytes[15] & 15) - 10 : '0' + ((x).bytes[15] & 15), \ 0 }) -_sd_pure_ static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) { +_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;