projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Run clang-format on the whole tree
[lttng-tools.git]
/
src
/
common
/
uuid.cpp
diff --git
a/src/common/uuid.cpp
b/src/common/uuid.cpp
index bef038ac6f6675b915a9b3ee816b736918614190..770d95529c685b95fb54ca2cd9e3c469c19c7a9f 100644
(file)
--- a/
src/common/uuid.cpp
+++ b/
src/common/uuid.cpp
@@
-6,6
+6,8
@@
*
*/
*
*/
+#include "uuid.hpp"
+
#include <common/compat/string.hpp>
#include <common/error.hpp>
#include <common/format.hpp>
#include <common/compat/string.hpp>
#include <common/error.hpp>
#include <common/format.hpp>
@@
-18,8
+20,6
@@
#include <string.h>
#include <time.h>
#include <string.h>
#include <time.h>
-#include "uuid.hpp"
-
namespace {
const lttng_uuid nil_uuid = {};
bool lttng_uuid_is_init;
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. */
}
/* 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;
}
ret = -1;
goto end;
}
@@
-85,10
+84,8
@@
int lttng_uuid_generate(lttng_uuid& uuid_out)
try {
srand(lttng::random::produce_best_effort_random_seed());
} catch (std::exception& e) {
try {
srand(lttng::random::produce_best_effort_random_seed());
} catch (std::exception& e) {
- ERR("%s",
- fmt::format("Failed to initialize random seed during generation of UUID: {}",
- e.what())
- .c_str());
+ ERR("Failed to initialize random seed during generation of UUID: %s",
+ e.what());
ret = -1;
goto end;
}
ret = -1;
goto end;
}
This page took
0.024797 seconds
and
4
git commands to generate.