#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);
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;
}
_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;
}
_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;
sd_id128_t t;
char *p;
- if (!ret)
- return -EINVAL;
+ assert_return(ret, -EINVAL);
if (saved_boot_id_valid) {
*ret = saved_boot_id;
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)