From b29ac8fbaceeac7f902fc75bb94a13b9cd9a0465 Mon Sep 17 00:00:00 2001 From: Ryan Farley Date: Wed, 7 Apr 2021 13:10:43 -0500 Subject: util/uuid: replace with util/token, remove libuuid Use 128-bit hexadecimal string tokens generated with /dev/urandom instead of UUIDs for xdg-foreign handles, removing the libuuid dependency. Update readme and CI. Closes #2830. build: remove xdg-foreign feature With no external dependencies required, there's no reason not to always build it. Remove WLR_HAS_XDG_FOREIGN as well. --- util/uuid.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 util/uuid.c (limited to 'util/uuid.c') diff --git a/util/uuid.c b/util/uuid.c deleted file mode 100644 index 82e310b9..00000000 --- a/util/uuid.c +++ /dev/null @@ -1,34 +0,0 @@ -#include -#include "util/uuid.h" - -#if HAS_LIBUUID -bool generate_uuid(char out[static 37]) { - uuid_t uuid; - uuid_generate_random(uuid); - uuid_unparse(uuid, out); - return true; -} -#else -#include -#include -#include - -bool generate_uuid(char out[static 37]) { - uuid_t uuid; - uint32_t status; - uuid_create(&uuid, &status); - if (status != uuid_s_ok) { - return false; - } - char *str; - uuid_to_string(&uuid, &str, &status); - if (status != uuid_s_ok) { - return false; - } - - assert(strlen(str) + 1 == 37); - memcpy(out, str, 37); - free(str); - return true; -} -#endif -- cgit v1.2.3