projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: ODR violation results in memory corruption
[lttng-tools.git]
/
src
/
common
/
error-query.cpp
diff --git
a/src/common/error-query.cpp
b/src/common/error-query.cpp
index 13efbbfd7d03f6154ceca9dcc8f9b7b2e8fb69fb..31de0ee5e764c7d1b0ea98a784668afaedbdc304 100644
(file)
--- a/
src/common/error-query.cpp
+++ b/
src/common/error-query.cpp
@@
-24,6
+24,17
@@
struct lttng_error_query {
enum lttng_error_query_target_type target_type;
};
enum lttng_error_query_target_type target_type;
};
+struct lttng_error_query_result {
+ enum lttng_error_query_result_type type;
+ char *name;
+ char *description;
+};
+
+struct lttng_error_query_results {
+ struct lttng_dynamic_pointer_array results;
+};
+
+namespace {
struct lttng_error_query_comm {
/* enum lttng_error_query_target_type */
int8_t target_type;
struct lttng_error_query_comm {
/* enum lttng_error_query_target_type */
int8_t target_type;
@@
-50,12
+61,6
@@
struct lttng_error_query_action {
struct lttng_action_path action_path;
};
struct lttng_action_path action_path;
};
-struct lttng_error_query_result {
- enum lttng_error_query_result_type type;
- char *name;
- char *description;
-};
-
struct lttng_error_query_result_comm {
/* enum lttng_error_query_result_type */
uint8_t type;
struct lttng_error_query_result_comm {
/* enum lttng_error_query_result_type */
uint8_t type;
@@
-81,10
+86,7
@@
struct lttng_error_query_results_comm {
/* `count` instances of `struct lttng_error_query_result` follow. */
char payload[];
} LTTNG_PACKED;
/* `count` instances of `struct lttng_error_query_result` follow. */
char payload[];
} LTTNG_PACKED;
-
-struct lttng_error_query_results {
- struct lttng_dynamic_pointer_array results;
-};
+} /* namespace */
static
enum lttng_error_code lttng_error_query_result_mi_serialize(
static
enum lttng_error_code lttng_error_query_result_mi_serialize(
This page took
0.023353 seconds
and
4
git commands to generate.