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
/
bin
/
lttng
/
commands
/
add_trigger.cpp
diff --git
a/src/bin/lttng/commands/add_trigger.cpp
b/src/bin/lttng/commands/add_trigger.cpp
index acaa50c7dfff3bfb183651e3f33c5c6e33f325bc..4ae57638fc71491e982a166acefec2fce2970ce3 100644
(file)
--- a/
src/bin/lttng/commands/add_trigger.cpp
+++ b/
src/bin/lttng/commands/add_trigger.cpp
@@
-640,6
+640,7
@@
void destroy_event_expr(void *ptr)
lttng_event_expr_destroy((lttng_event_expr *) ptr);
}
lttng_event_expr_destroy((lttng_event_expr *) ptr);
}
+namespace {
struct parse_event_rule_res {
/* Owned by this. */
struct lttng_event_rule *er;
struct parse_event_rule_res {
/* Owned by this. */
struct lttng_event_rule *er;
@@
-647,6
+648,7
@@
struct parse_event_rule_res {
/* Array of `struct lttng_event_expr *` */
struct lttng_dynamic_pointer_array capture_descriptors;
};
/* Array of `struct lttng_event_expr *` */
struct lttng_dynamic_pointer_array capture_descriptors;
};
+} /* namespace */
static
struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv,
static
struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv,
@@
-1404,11
+1406,13
@@
end:
return c;
}
return c;
}
+namespace {
struct condition_descr {
const char *name;
struct lttng_condition *(*handler) (int *argc, const char ***argv,
int argc_offset);
};
struct condition_descr {
const char *name;
struct lttng_condition *(*handler) (int *argc, const char ***argv,
int argc_offset);
};
+} /* namespace */
static const
struct condition_descr condition_descrs[] = {
static const
struct condition_descr condition_descrs[] = {
@@
-2099,11
+2103,13
@@
end:
return action;
}
return action;
}
+namespace {
struct action_descr {
const char *name;
struct lttng_action *(*handler) (int *argc, const char ***argv,
int argc_offset);
};
struct action_descr {
const char *name;
struct lttng_action *(*handler) (int *argc, const char ***argv,
int argc_offset);
};
+} /* namespace */
static const
struct action_descr action_descrs[] = {
static const
struct action_descr action_descrs[] = {
This page took
0.024797 seconds
and
4
git commands to generate.