X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fuuid.hpp;h=9bec2d55ae08f8fe50ae73c726bdaa5bbd31de15;hb=28f23191dcbf047429d51950a337a57d7a3f866a;hp=586c2ad67c06fcdaac63c39759dee0e95ae8a7d6;hpb=f250b40e2179eccdb83766bf4abef5a35036c47b;p=lttng-tools.git diff --git a/src/common/uuid.hpp b/src/common/uuid.hpp index 586c2ad67..9bec2d55a 100644 --- a/src/common/uuid.hpp +++ b/src/common/uuid.hpp @@ -9,34 +9,34 @@ #define LTTNG_UUID_H #include + +#include +#include #include #include -#include -#include #include /* * Includes final \0. */ -#define LTTNG_UUID_STR_LEN 37 -#define LTTNG_UUID_LEN 16 -#define LTTNG_UUID_VER 4 +#define LTTNG_UUID_STR_LEN 37 +#define LTTNG_UUID_LEN 16 +#define LTTNG_UUID_VER 4 -#define LTTNG_UUID_FMT \ - "%02" SCNx8 "%02" SCNx8 "%02" SCNx8 "%02" SCNx8 "-%02" SCNx8 \ - "%02" SCNx8 "-%02" SCNx8 "%02" SCNx8 "-%02" SCNx8 "%02" SCNx8 \ - "-%02" SCNx8 "%02" SCNx8 "%02" SCNx8 "%02" SCNx8 "%02" SCNx8 \ - "%02" SCNx8 +#define LTTNG_UUID_FMT \ + "%02" SCNx8 "%02" SCNx8 "%02" SCNx8 "%02" SCNx8 "-%02" SCNx8 "%02" SCNx8 "-%02" SCNx8 \ + "%02" SCNx8 "-%02" SCNx8 "%02" SCNx8 "-%02" SCNx8 "%02" SCNx8 "%02" SCNx8 "%02" SCNx8 \ + "%02" SCNx8 "%02" SCNx8 -#define LTTNG_UUID_FMT_VALUES(uuid) \ - (uuid)[0], (uuid)[1], (uuid)[2], (uuid)[3], (uuid)[4], (uuid)[5], \ - (uuid)[6], (uuid)[7], (uuid)[8], (uuid)[9], (uuid)[10], (uuid)[11], \ - (uuid)[12], (uuid)[13], (uuid)[14], (uuid)[15] +#define LTTNG_UUID_FMT_VALUES(uuid) \ + (uuid)[0], (uuid)[1], (uuid)[2], (uuid)[3], (uuid)[4], (uuid)[5], (uuid)[6], (uuid)[7], \ + (uuid)[8], (uuid)[9], (uuid)[10], (uuid)[11], (uuid)[12], (uuid)[13], (uuid)[14], \ + (uuid)[15] -#define LTTNG_UUID_SCAN_VALUES(uuid) \ - &(uuid)[0], &(uuid)[1], &(uuid)[2], &(uuid)[3], &(uuid)[4], &(uuid)[5], \ - &(uuid)[6], &(uuid)[7], &(uuid)[8], &(uuid)[9], &(uuid)[10], &(uuid)[11], \ - &(uuid)[12], &(uuid)[13], &(uuid)[14], &(uuid)[15] +#define LTTNG_UUID_SCAN_VALUES(uuid) \ + &(uuid)[0], &(uuid)[1], &(uuid)[2], &(uuid)[3], &(uuid)[4], &(uuid)[5], &(uuid)[6], \ + &(uuid)[7], &(uuid)[8], &(uuid)[9], &(uuid)[10], &(uuid)[11], &(uuid)[12], \ + &(uuid)[13], &(uuid)[14], &(uuid)[15] using lttng_uuid = std::array;