X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=fea51b761c8ea2f0b224f2dfd2dc8589a9c8ad8b;hb=799e2c4f4ecb595fcb52c3e6affd3b4ec7b5b24e;hp=0922c3d490918f3a177a48cecd1b5b94772aa8cb;hpb=df0f840ba686e3fe670c9906fd46330fff65da07;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 0922c3d49..fea51b761 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -491,7 +491,10 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 	while ((ret = kernctl_create_stream(channel->fd)) >= 0) {
 		lks = trace_kernel_create_stream();
 		if (lks == NULL) {
-			close(ret);
+			ret = close(ret);
+			if (ret) {
+				PERROR("close");
+			}
 			goto error;
 		}
 
@@ -555,7 +558,7 @@ error:
  */
 ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 {
-	int fd, pos;
+	int fd, pos, ret;
 	char *event;
 	size_t nbmem, count = 0;
 	ssize_t size;
@@ -603,11 +606,17 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 	*events = elist;
 	DBG("Kernel list events done (%zu events)", count);
 end:
-	fclose(fp);	/* closes both fp and fd */
+	ret = fclose(fp);	/* closes both fp and fd */
+	if (ret) {
+		PERROR("fclose");
+	}
 	return count;
 
 error_fp:
-	close(fd);
+	ret = close(fd);
+	if (ret) {
+		PERROR("close");
+	}
 error:
 	return -1;
 }
@@ -669,8 +678,10 @@ int init_kernel_workarounds(void)
 			/* Ignore error, we don't really care */
 		}
 	}
-	fclose(fp);
+	ret = fclose(fp);
+	if (ret) {
+		PERROR("fclose");
+	}
 end_boot_id:
-
 	return 0;
 }