X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=f38cf3d8d0a6f96a48250cafd58b96a8f53feb36;hp=4d2870addacbcb515e0fe1a8042752c2d5fb158f;hb=e7fe706f887aa4d753b102a610f802f7dd816655;hpb=3e230f922d67f7a47b66631f7a8cf458002b3727

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index 4d2870add..f38cf3d8d 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -85,7 +85,6 @@ error:
  */
 struct ltt_kernel_session *trace_kernel_create_session(char *path)
 {
-	int ret;
 	struct ltt_kernel_session *lks = NULL;
 
 	/* Allocate a new ltt kernel session */
@@ -117,6 +116,8 @@ struct ltt_kernel_session *trace_kernel_create_session(char *path)
 	lks->tmp_consumer = NULL;
 
 	if (path && strlen(path) > 0) {
+		int ret;
+
 		/* Use the default consumer output which is the tracing session path. */
 		ret = snprintf(lks->consumer->dst.trace_path, PATH_MAX,
 				"%s" DEFAULT_KERNEL_TRACE_DIR, path);
@@ -243,7 +244,6 @@ struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev)
 	lke->fd = -1;
 	lke->event = attr;
 	lke->enabled = 1;
-	lke->ctx = NULL;
 
 	return lke;
 
@@ -331,11 +331,11 @@ error:
  */
 void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
 {
-	int ret;
-
 	DBG("[trace] Closing stream fd %d", stream->fd);
 	/* Close kernel fd */
 	if (stream->fd >= 0) {
+		int ret;
+
 		ret = close(stream->fd);
 		if (ret) {
 			PERROR("close");
@@ -352,9 +352,9 @@ void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
  */
 void trace_kernel_destroy_event(struct ltt_kernel_event *event)
 {
-	int ret;
-
 	if (event->fd >= 0) {
+		int ret;
+
 		DBG("[trace] Closing event fd %d", event->fd);
 		/* Close kernel fd */
 		ret = close(event->fd);
@@ -369,7 +369,6 @@ void trace_kernel_destroy_event(struct ltt_kernel_event *event)
 	cds_list_del(&event->list);
 
 	free(event->event);
-	free(event->ctx);
 	free(event);
 }
 
@@ -414,11 +413,11 @@ void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
  */
 void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata)
 {
-	int ret;
-
 	DBG("[trace] Closing metadata fd %d", metadata->fd);
 	/* Close kernel fd */
 	if (metadata->fd >= 0) {
+		int ret;
+
 		ret = close(metadata->fd);
 		if (ret) {
 			PERROR("close");