X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-id128%2Fsd-id128.c;h=9ee40ab91eaaee64a3f13dc61dc354bc8de26400;hb=ec202eae8e84a4c99f054f771cb832046cb8769f;hp=64ddd092366add557967e34b3fb86162d905f1a8;hpb=aa96c6cb44a6eeccc506ae055aae2519a7f914e1;p=elogind.git

diff --git a/src/libsystemd-id128/sd-id128.c b/src/libsystemd-id128/sd-id128.c
index 64ddd0923..9ee40ab91 100644
--- a/src/libsystemd-id128/sd-id128.c
+++ b/src/libsystemd-id128/sd-id128.c
@@ -23,16 +23,14 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
-
 #include "util.h"
 #include "macro.h"
+#include "sd-id128.h"
 
 _public_ char *sd_id128_to_string(sd_id128_t id, char s[33]) {
         unsigned n;
 
-        if (!s)
-                return NULL;
+        assert_return(s, NULL);
 
         for (n = 0; n < 16; n++) {
                 s[n*2] = hexchar(id.bytes[n] >> 4);
@@ -49,10 +47,8 @@ _public_ int sd_id128_from_string(const char s[], sd_id128_t *ret) {
         sd_id128_t t;
         bool is_guid = false;
 
-        if (!s)
-                return -EINVAL;
-        if (!ret)
-                return -EINVAL;
+        assert_return(s, -EINVAL);
+        assert_return(ret, -EINVAL);
 
         for (n = 0, i = 0; n < 16;) {
                 int a, b;
@@ -108,16 +104,15 @@ static sd_id128_t make_v4_uuid(sd_id128_t id) {
 }
 
 _public_ int sd_id128_get_machine(sd_id128_t *ret) {
-        static __thread sd_id128_t saved_machine_id;
-        static __thread bool saved_machine_id_valid = false;
+        static thread_local sd_id128_t saved_machine_id;
+        static thread_local bool saved_machine_id_valid = false;
         _cleanup_close_ int fd = -1;
         char buf[33];
         ssize_t k;
         unsigned j;
         sd_id128_t t;
 
-        if (!ret)
-                return -EINVAL;
+        assert_return(ret, -EINVAL);
 
         if (saved_machine_id_valid) {
                 *ret = saved_machine_id;
@@ -158,8 +153,8 @@ _public_ int sd_id128_get_machine(sd_id128_t *ret) {
 }
 
 _public_ int sd_id128_get_boot(sd_id128_t *ret) {
-        static __thread sd_id128_t saved_boot_id;
-        static __thread bool saved_boot_id_valid = false;
+        static thread_local sd_id128_t saved_boot_id;
+        static thread_local bool saved_boot_id_valid = false;
         _cleanup_close_ int fd = -1;
         char buf[36];
         ssize_t k;
@@ -167,8 +162,7 @@ _public_ int sd_id128_get_boot(sd_id128_t *ret) {
         sd_id128_t t;
         char *p;
 
-        if (!ret)
-                return -EINVAL;
+        assert_return(ret, -EINVAL);
 
         if (saved_boot_id_valid) {
                 *ret = saved_boot_id;
@@ -218,8 +212,7 @@ _public_ int sd_id128_randomize(sd_id128_t *ret) {
         sd_id128_t t;
         ssize_t k;
 
-        if (!ret)
-                return -EINVAL;
+        assert_return(ret, -EINVAL);
 
         fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
         if (fd < 0)