sessiond-comm: prefix lttcomm_sessiond_command entries

[lttng-tools.git] / src / lib / lttng-ctl / snapshot.cpp

diff --git a/src/lib/lttng-ctl/snapshot.cpp b/src/lib/lttng-ctl/snapshot.cpp
index 543861d676d4639bb52cf9ac494f263d7317592e..2814cc5ee2bca788e2e2412257f98693f127c963 100644 (file)
--- a/src/lib/lttng-ctl/snapshot.cpp
+++ b/src/lib/lttng-ctl/snapshot.cpp
@@ -8,12 +8,12 @@
 #define _LGPL_SOURCE
 #include <string.h>
 
-#include <common/sessiond-comm/sessiond-comm.h>
+#include <common/sessiond-comm/sessiond-comm.hpp>
 #include <lttng/lttng-error.h>
 #include <lttng/snapshot.h>
-#include <lttng/snapshot-internal.h>
+#include <lttng/snapshot-internal.hpp>
 
-#include "lttng-ctl-helper.h"
+#include "lttng-ctl-helper.hpp"
 
 /*
  * Add an output object to a session identified by name.
@@ -33,7 +33,7 @@ int lttng_snapshot_add_output(const char *session_name,
        }
 
        memset(&lsm, 0, sizeof(lsm));
-       lsm.cmd_type = LTTNG_SNAPSHOT_ADD_OUTPUT;
+       lsm.cmd_type = LTTCOMM_SESSIOND_COMMAND_SNAPSHOT_ADD_OUTPUT;
 
        ret = lttng_strncpy(lsm.session.name, session_name,
                        sizeof(lsm.session.name));
@@ -74,7 +74,7 @@ int lttng_snapshot_del_output(const char *session_name,
        }
 
        memset(&lsm, 0, sizeof(lsm));
-       lsm.cmd_type = LTTNG_SNAPSHOT_DEL_OUTPUT;
+       lsm.cmd_type = LTTCOMM_SESSIOND_COMMAND_SNAPSHOT_DEL_OUTPUT;
 
        ret = lttng_strncpy(lsm.session.name, session_name,
                            sizeof(lsm.session.name));
@@ -111,7 +111,7 @@ int lttng_snapshot_list_output(const char *session_name,
        }
 
        memset(&lsm, 0, sizeof(lsm));
-       lsm.cmd_type = LTTNG_SNAPSHOT_LIST_OUTPUT;
+       lsm.cmd_type = LTTCOMM_SESSIOND_COMMAND_SNAPSHOT_LIST_OUTPUT;
 
        ret = lttng_strncpy(lsm.session.name, session_name,
                            sizeof(lsm.session.name));
@@ -120,7 +120,7 @@ int lttng_snapshot_list_output(const char *session_name,
                goto error;
        }
 
-       new_list = (lttng_snapshot_output_list *) zmalloc(sizeof(*new_list));
+       new_list = zmalloc<lttng_snapshot_output_list>();
        if (!new_list) {
                ret = -LTTNG_ERR_NOMEM;
                goto error;
@@ -196,7 +196,8 @@ void lttng_snapshot_output_list_destroy(struct lttng_snapshot_output_list *list)
  * Return 0 on success or else a negative LTTNG_ERR value.
  */
 int lttng_snapshot_record(const char *session_name,
-               struct lttng_snapshot_output *output, int wait)
+               struct lttng_snapshot_output *output,
+               int wait __attribute__((unused)))
 {
        int ret;
        struct lttcomm_session_msg lsm;
@@ -207,7 +208,7 @@ int lttng_snapshot_record(const char *session_name,
        }
 
        memset(&lsm, 0, sizeof(lsm));
-       lsm.cmd_type = LTTNG_SNAPSHOT_RECORD;
+       lsm.cmd_type = LTTCOMM_SESSIOND_COMMAND_SNAPSHOT_RECORD;
 
        ret = lttng_strncpy(lsm.session.name, session_name,
                        sizeof(lsm.session.name));
@@ -239,7 +240,7 @@ struct lttng_snapshot_output *lttng_snapshot_output_create(void)
 {
        struct lttng_snapshot_output *output;
 
-       output = (lttng_snapshot_output *) zmalloc(sizeof(struct lttng_snapshot_output));
+       output = zmalloc<lttng_snapshot_output>();
        if (!output) {
                goto error;
        }