X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fuuid.cpp;fp=src%2Fcommon%2Fuuid.cpp;h=770d95529c685b95fb54ca2cd9e3c469c19c7a9f;hp=4a1038b330caf66e4be141bc251e5dcd14b965b6;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hpb=52e345b9ac912d033c2a2c25a170a01cf209839d diff --git a/src/common/uuid.cpp b/src/common/uuid.cpp index 4a1038b33..770d95529 100644 --- a/src/common/uuid.cpp +++ b/src/common/uuid.cpp @@ -6,6 +6,8 @@ * */ +#include "uuid.hpp" + #include #include #include @@ -18,8 +20,6 @@ #include #include -#include "uuid.hpp" - namespace { const lttng_uuid nil_uuid = {}; bool lttng_uuid_is_init; @@ -58,8 +58,7 @@ int lttng_uuid_from_str(const char *str_in, lttng_uuid& uuid_out) } /* Scan to a temporary location in case of a partial match. */ - if (sscanf(str_in, LTTNG_UUID_FMT, LTTNG_UUID_SCAN_VALUES(uuid_scan)) != - LTTNG_UUID_LEN) { + if (sscanf(str_in, LTTNG_UUID_FMT, LTTNG_UUID_SCAN_VALUES(uuid_scan)) != LTTNG_UUID_LEN) { ret = -1; goto end; } @@ -86,7 +85,7 @@ int lttng_uuid_generate(lttng_uuid& uuid_out) srand(lttng::random::produce_best_effort_random_seed()); } catch (std::exception& e) { ERR("Failed to initialize random seed during generation of UUID: %s", - e.what()); + e.what()); ret = -1; goto end; }