X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=83a884c178fa07ad7b70d31b75a14a23df9415dd;hb=e32a3d0f431b41123e001abcbce329da6532f903;hp=46d9cb1c3a805067ac3c37af45fd30ace416a63f;hpb=a0377dfefe40662ba7d68617bce6ff467114136c;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 46d9cb1c3..83a884c17 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 
 #include <common/bytecode/bytecode.h>
+#include <common/align.h>
 #include <common/common.h>
 #include <common/compat/errno.h>
 #include <common/compat/string.h>
@@ -81,7 +82,6 @@ int lttng_opt_mi;
  *
  * If domain is unknown, default domain will be the kernel.
  */
-LTTNG_HIDDEN
 void lttng_ctl_copy_lttng_domain(struct lttng_domain *dst,
 		struct lttng_domain *src)
 {
@@ -244,7 +244,6 @@ end:
  *
  * If yes return 1, else return -1.
  */
-LTTNG_HIDDEN
 int lttng_check_tracing_group(void)
 {
 	gid_t *grp_list, tracing_gid;
@@ -434,7 +433,7 @@ error:
  *
  * On success, return the socket's file descriptor. On error, return -1.
  */
-LTTNG_HIDDEN int connect_sessiond(void)
+int connect_sessiond(void)
 {
 	int ret;
 
@@ -533,7 +532,6 @@ end:
  *
  * Return size of data (only payload, not header) or a negative error code.
  */
-LTTNG_HIDDEN
 int lttng_ctl_ask_sessiond_fds_varlen(struct lttcomm_session_msg *lsm,
 		const int *fds, size_t nb_fd, const void *vardata,
 		size_t vardata_len, void **user_payload_buf,
@@ -605,7 +603,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_ctl_ask_sessiond_payload(struct lttng_payload_view *message,
 	struct lttng_payload *reply)
 {
@@ -2460,7 +2457,7 @@ int lttng_list_events(struct lttng_handle *handle,
 			storage_req += ext_comm->nb_exclusions *
 					LTTNG_SYMBOL_NAME_LEN;
 			/* Padding to ensure the flat probe is aligned. */
-			storage_req = ALIGN_TO(storage_req, sizeof(uint64_t));
+			storage_req = lttng_align_ceil(storage_req, sizeof(uint64_t));
 			storage_req += probe_storage_req;
 		}
 	}
@@ -2551,7 +2548,7 @@ int lttng_list_events(struct lttng_handle *handle,
 
 			/* Insert padding to align to 64-bits. */
 			ret = lttng_dynamic_buffer_set_size(&listing,
-					ALIGN_TO(listing.size,
+					lttng_align_ceil(listing.size,
 							sizeof(uint64_t)));
 			if (ret) {
 				ret = -LTTNG_ERR_NOMEM;
@@ -2617,15 +2614,26 @@ end:
  */
 int lttng_set_tracing_group(const char *name)
 {
+	int ret = 0;
+	char *new_group;
+
 	if (name == NULL) {
-		return -LTTNG_ERR_INVALID;
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
 	}
 
-	if (asprintf(&tracing_group, "%s", name) < 0) {
-		return -LTTNG_ERR_FATAL;
+	new_group = strdup(name);
+	if (!new_group) {
+		ret = -LTTNG_ERR_FATAL;
+		goto end;
 	}
 
-	return 0;
+	free(tracing_group);
+	tracing_group = new_group;
+	new_group = NULL;
+
+end:
+	return ret;
 }
 
 int lttng_calibrate(struct lttng_handle *handle,