Add LTTNG_EVENT_EXCLUSION_NAME_AT() helper macro

[lttng-tools.git] / src / bin / lttng-sessiond / save.c

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 4c70e5836687fa725928b88eae434d07d058f6a2..a6fea46ce55e5e9d3dcca669bf4bd1d8839ce1f4 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
@@ -25,7 +24,7 @@
 
 #include <common/defaults.h>
 #include <common/error.h>
-#include <common/config/config.h>
+#include <common/config/session-config.h>
 #include <common/utils.h>
 #include <common/runas.h>
 #include <lttng/save-internal.h>
@@ -675,7 +674,8 @@ int save_ust_event(struct config_writer *writer,
                for (i = 0; i < event->exclusion->count; i++) {
                        ret = config_writer_write_element_string(writer,
                                config_element_exclusion,
-                               &event->exclusion->names[0][i]);
+                               LTTNG_EVENT_EXCLUSION_NAME_AT(
+                                       event->exclusion, i));
                        if (ret) {
                                ret = LTTNG_ERR_SAVE_IO_FAIL;
                                goto end;
@@ -768,7 +768,7 @@ int init_ust_event_from_agent_event(struct ltt_ust_event *ust_event,
        }
 
        ust_event->attr.loglevel_type = ust_loglevel_type;
-       ust_event->attr.loglevel = agent_event->loglevel;
+       ust_event->attr.loglevel = agent_event->loglevel_value;
        ust_event->filter_expression = agent_event->filter_expression;
        ust_event->exclusion = agent_event->exclusion;
 end: