X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Fsave.cpp;h=4cc2f8014ccc6c219e1a930ba126152823e079d3;hb=cd9adb8b829564212158943a0d279bb35322ab30;hp=45894277a04c15f47b480ac2a9c13fa69e0fee0a;hpb=4bd69c5f1161cd065f487da0f4c1aa03a73c47e4;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/save.cpp b/src/lib/lttng-ctl/save.cpp
index 45894277a..4cc2f8014 100644
--- a/src/lib/lttng-ctl/save.cpp
+++ b/src/lib/lttng-ctl/save.cpp
@@ -6,18 +6,19 @@
  */
 
 #define _LGPL_SOURCE
-#include <string.h>
+#include "lttng-ctl-helper.hpp"
+
+#include <common/sessiond-comm/sessiond-comm.hpp>
 
 #include <lttng/lttng-error.h>
+#include <lttng/save-internal.hpp>
 #include <lttng/save.h>
-#include <lttng/save-internal.h>
-#include <common/sessiond-comm/sessiond-comm.h>
 
-#include "lttng-ctl-helper.h"
+#include <string.h>
 
 struct lttng_save_session_attr *lttng_save_session_attr_create(void)
 {
-	return (lttng_save_session_attr *) zmalloc(sizeof(struct lttng_save_session_attr));
+	return zmalloc<lttng_save_session_attr>();
 }
 
 void lttng_save_session_attr_destroy(struct lttng_save_session_attr *output)
@@ -27,10 +28,9 @@ void lttng_save_session_attr_destroy(struct lttng_save_session_attr *output)
 	}
 }
 
-const char *lttng_save_session_attr_get_session_name(
-	struct lttng_save_session_attr *attr)
+const char *lttng_save_session_attr_get_session_name(struct lttng_save_session_attr *attr)
 {
-	const char *ret = NULL;
+	const char *ret = nullptr;
 
 	if (attr && attr->session_name[0]) {
 		ret = attr->session_name;
@@ -39,10 +39,9 @@ const char *lttng_save_session_attr_get_session_name(
 	return ret;
 }
 
-const char *lttng_save_session_attr_get_output_url(
-	struct lttng_save_session_attr *attr)
+const char *lttng_save_session_attr_get_output_url(struct lttng_save_session_attr *attr)
 {
-	const char *ret = NULL;
+	const char *ret = nullptr;
 
 	if (attr && attr->configuration_url[0]) {
 		ret = attr->configuration_url;
@@ -51,26 +50,23 @@ const char *lttng_save_session_attr_get_output_url(
 	return ret;
 }
 
-int lttng_save_session_attr_get_overwrite(
-	struct lttng_save_session_attr *attr)
+int lttng_save_session_attr_get_overwrite(struct lttng_save_session_attr *attr)
 {
 	return attr ? attr->overwrite : -LTTNG_ERR_INVALID;
 }
 
-int lttng_save_session_attr_get_omit_name(
-	struct lttng_save_session_attr *attr)
+int lttng_save_session_attr_get_omit_name(struct lttng_save_session_attr *attr)
 {
 	return attr ? attr->omit_name : -LTTNG_ERR_INVALID;
 }
 
-int lttng_save_session_attr_get_omit_output(
-	struct lttng_save_session_attr *attr)
+int lttng_save_session_attr_get_omit_output(struct lttng_save_session_attr *attr)
 {
 	return attr ? attr->omit_output : -LTTNG_ERR_INVALID;
 }
 
-int lttng_save_session_attr_set_session_name(
-	struct lttng_save_session_attr *attr, const char *session_name)
+int lttng_save_session_attr_set_session_name(struct lttng_save_session_attr *attr,
+					     const char *session_name)
 {
 	int ret = 0;
 
@@ -88,8 +84,7 @@ int lttng_save_session_attr_set_session_name(
 			goto error;
 		}
 
-		ret = lttng_strncpy(attr->session_name, session_name,
-				sizeof(attr->session_name));
+		ret = lttng_strncpy(attr->session_name, session_name, sizeof(attr->session_name));
 		if (ret) {
 			ret = -LTTNG_ERR_INVALID;
 			goto error;
@@ -101,13 +96,12 @@ error:
 	return ret;
 }
 
-int lttng_save_session_attr_set_output_url(
-	struct lttng_save_session_attr *attr, const char *url)
+int lttng_save_session_attr_set_output_url(struct lttng_save_session_attr *attr, const char *url)
 {
 	int ret = 0;
 	size_t len;
 	ssize_t size;
-	struct lttng_uri *uris = NULL;
+	struct lttng_uri *uris = nullptr;
 
 	if (!attr) {
 		ret = -LTTNG_ERR_INVALID;
@@ -126,15 +120,15 @@ int lttng_save_session_attr_set_output_url(
 		goto error;
 	}
 
-	size = uri_parse_str_urls(url, NULL, &uris);
+	size = uri_parse_str_urls(url, nullptr, &uris);
 	if (size <= 0 || uris[0].dtype != LTTNG_DST_PATH) {
 		ret = -LTTNG_ERR_INVALID;
 		goto error;
 	}
 
 	/* Copy string plus the NULL terminated byte. */
-	ret = lttng_strncpy(attr->configuration_url, uris[0].dst.path,
-			    sizeof(attr->configuration_url));
+	ret = lttng_strncpy(
+		attr->configuration_url, uris[0].dst.path, sizeof(attr->configuration_url));
 	if (ret) {
 		ret = -LTTNG_ERR_INVALID;
 		goto error;
@@ -146,8 +140,7 @@ error:
 	return ret;
 }
 
-int lttng_save_session_attr_set_overwrite(
-	struct lttng_save_session_attr *attr, int overwrite)
+int lttng_save_session_attr_set_overwrite(struct lttng_save_session_attr *attr, int overwrite)
 {
 	int ret = 0;
 
@@ -161,8 +154,7 @@ end:
 	return ret;
 }
 
-int lttng_save_session_attr_set_omit_name(
-	struct lttng_save_session_attr *attr, int omit_name)
+int lttng_save_session_attr_set_omit_name(struct lttng_save_session_attr *attr, int omit_name)
 {
 	int ret = 0;
 
@@ -176,8 +168,7 @@ end:
 	return ret;
 }
 
-int lttng_save_session_attr_set_omit_output(
-	struct lttng_save_session_attr *attr, int omit_output)
+int lttng_save_session_attr_set_omit_output(struct lttng_save_session_attr *attr, int omit_output)
 {
 	int ret = 0;
 
@@ -207,11 +198,10 @@ int lttng_save_session(struct lttng_save_session_attr *attr)
 	}
 
 	memset(&lsm, 0, sizeof(lsm));
-	lsm.cmd_type = LTTNG_SAVE_SESSION;
+	lsm.cmd_type = LTTCOMM_SESSIOND_COMMAND_SAVE_SESSION;
 
-	memcpy(&lsm.u.save_session.attr, attr,
-		sizeof(struct lttng_save_session_attr));
-	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
+	memcpy(&lsm.u.save_session.attr, attr, sizeof(struct lttng_save_session_attr));
+	ret = lttng_ctl_ask_sessiond(&lsm, nullptr);
 end:
 	return ret;
 }