X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fuuid.cpp;h=a820a8a4191defbef75ae63c2085540f8f5dfcae;hb=328c2fe7297c941aa9cbcfa4ce944fca1bd7300f;hp=77b9a767bececffe3210255c9d8c11f1dc9a086d;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c;p=lttng-tools.git

diff --git a/src/common/uuid.cpp b/src/common/uuid.cpp
index 77b9a767b..a820a8a41 100644
--- a/src/common/uuid.cpp
+++ b/src/common/uuid.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <common/compat/string.h>
+#include <common/compat/string.hpp>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -14,22 +14,24 @@
 #include <string.h>
 #include <time.h>
 
-#include "uuid.h"
+#include "uuid.hpp"
 
-static const lttng_uuid nil_uuid = { 0 };
-static bool lttng_uuid_is_init;
+namespace {
+const lttng_uuid nil_uuid = {};
+bool lttng_uuid_is_init;
+} /* namespace */
 
-void lttng_uuid_to_str(const lttng_uuid uuid, char *uuid_str)
+void lttng_uuid_to_str(const lttng_uuid& uuid, char *uuid_str)
 {
 	sprintf(uuid_str, LTTNG_UUID_FMT, LTTNG_UUID_FMT_VALUES(uuid));
 }
 
-int lttng_uuid_from_str(const char *str_in, lttng_uuid uuid_out)
+int lttng_uuid_from_str(const char *str_in, lttng_uuid& uuid_out)
 {
 	int ret = 0;
 	lttng_uuid uuid_scan;
 
-	if ((str_in == NULL) || (uuid_out == NULL)) {
+	if (str_in == nullptr) {
 		ret = -1;
 		goto end;
 	}
@@ -45,38 +47,23 @@ int lttng_uuid_from_str(const char *str_in, lttng_uuid uuid_out)
 		ret = -1;
 	}
 
-	lttng_uuid_copy(uuid_out, uuid_scan);
+	uuid_out = uuid_scan;
 end:
 	return ret;
 }
 
-bool lttng_uuid_is_equal(const lttng_uuid a, const lttng_uuid b)
+bool lttng_uuid_is_nil(const lttng_uuid& uuid)
 {
-	return memcmp(a, b, LTTNG_UUID_LEN) == 0;
-}
-
-bool lttng_uuid_is_nil(const lttng_uuid uuid)
-{
-	return memcmp(nil_uuid, uuid, sizeof(lttng_uuid)) == 0;
-}
-
-void lttng_uuid_copy(lttng_uuid dst, const lttng_uuid src)
-{
-	memcpy(dst, src, LTTNG_UUID_LEN);
+	return uuid == nil_uuid;
 }
 
 /*
  * Generate a random UUID according to RFC4122, section 4.4.
  */
-int lttng_uuid_generate(lttng_uuid uuid_out)
+int lttng_uuid_generate(lttng_uuid& uuid_out)
 {
 	int i, ret = 0;
 
-	if (uuid_out == NULL) {
-		ret = -1;
-		goto end;
-	}
-
 	if (!lttng_uuid_is_init) {
 		/*
 		 * We don't need cryptographic quality randomness to
@@ -88,8 +75,8 @@ int lttng_uuid_generate(lttng_uuid uuid_out)
 			ret = -1;
 			goto end;
 		}
-		srand(epoch);
 
+		srand(epoch);
 		lttng_uuid_is_init = true;
 	}