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=126d83ce8a87409d57ee93ae1a29a2fdf1ccb061;hp=d835cf47688671fce90dff0936267c5ea87ec335;hb=178cc7700c23ac088cd7190d7854282075028d91;hpb=81527be142678057215665be66e4b3c8306a7ab3
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index d835cf476..126d83ce8 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -9,23 +9,28 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
#include
-#include
#include
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* 128 Bit ID APIs. See sd-id128(3) for more information. */
+
typedef union sd_id128 sd_id128_t;
union sd_id128 {
@@ -39,8 +44,6 @@ int sd_id128_from_string(const char s[33], sd_id128_t *ret);
int sd_id128_randomize(sd_id128_t *ret);
-sd_id128_t sd_id128_make_v4_uuid(sd_id128_t id);
-
int sd_id128_get_machine(sd_id128_t *ret);
int sd_id128_get_boot(sd_id128_t *ret);
@@ -53,11 +56,16 @@ 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;
}
+#ifdef __cplusplus
+}
+#endif
+
#endif