X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=4a7e2610510cd805722315add867db300ea66823;hp=f64f51c280d670b9b83070abb6e2666d97ce51e2;hb=2d97a0067600335f07eecb2c1d9ba68fc164583e;hpb=0dda67289b8a86fd3f117d644f00f2985d399208

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index f64f51c28..4a7e26105 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -918,8 +918,8 @@ int trace_ust_track_id(enum lttng_tracker_type tracker_type,
 	struct ust_id_tracker *id_tracker;
 	struct lttng_tracker_list *tracker_list;
 	int value;
-	struct lttng_tracker_id *saved_ids;
-	ssize_t saved_ids_count, i;
+	struct lttng_tracker_id **saved_ids;
+	ssize_t saved_ids_count;
 
 	if (tracker_type == LTTNG_TRACKER_PID) {
 		DBG("Backward compatible behavior: translate PID tracker to VPID tracker for UST domain.");
@@ -1002,9 +1002,7 @@ end_restore:
 		ERR("Error on tracker add error handling.\n");
 	}
 end:
-	for (i = 0; i < saved_ids_count; i++) {
-		free(saved_ids[i].string);
-	}
+	lttng_tracker_ids_destroy(saved_ids, saved_ids_count);
 	free(saved_ids);
 	return retval;
 }
@@ -1021,8 +1019,8 @@ int trace_ust_untrack_id(enum lttng_tracker_type tracker_type,
 	struct ust_id_tracker *id_tracker;
 	struct lttng_tracker_list *tracker_list;
 	int value;
-	struct lttng_tracker_id *saved_ids;
-	ssize_t saved_ids_count, i;
+	struct lttng_tracker_id **saved_ids;
+	ssize_t saved_ids_count;
 
 	if (tracker_type == LTTNG_TRACKER_PID) {
 		DBG("Backward compatible behavior: translate PID tracker to VPID tracker for UST domain.");
@@ -1107,9 +1105,7 @@ end_restore:
 		ERR("Error on tracker remove error handling.\n");
 	}
 end:
-	for (i = 0; i < saved_ids_count; i++) {
-		free(saved_ids[i].string);
-	}
+	lttng_tracker_ids_destroy(saved_ids, saved_ids_count);
 	free(saved_ids);
 	return retval;
 }
@@ -1119,7 +1115,7 @@ end:
  */
 ssize_t trace_ust_list_tracker_ids(enum lttng_tracker_type tracker_type,
 		struct ltt_ust_session *session,
-		struct lttng_tracker_id **_ids)
+		struct lttng_tracker_id ***_ids)
 {
 	struct lttng_tracker_list *tracker_list;