From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 21 Nov 2011 16:26:40 +0000 (+0100)
Subject: Report errors in write_config
X-Git-Tag: v2.0-pre15~90
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=a079cd4d3fdd188b539f9525001dc9c7ea41089b;p=lttng-tools.git

Report errors in write_config

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng/conf.c b/lttng/conf.c
index 526988468..5479a3cd0 100644
--- a/lttng/conf.c
+++ b/lttng/conf.c
@@ -102,21 +102,26 @@ error:
  *
  *  Append data to the config file in file_path
  */
-static void write_config(char *file_path, size_t size, char *data)
+static int write_config(char *file_path, size_t size, char *data)
 {
 	FILE *fp;
+	size_t len;
+	int ret = 0;
 
 	fp = open_config(file_path, "a");
 	if (fp == NULL) {
-		goto error;
+		ret = -1;
+		goto end;
 	}
 
 	/* Write session name into config file */
-	fwrite(data, size, 1, fp);
+	len = fwrite(data, size, 1, fp);
+	if (len < 1) {
+		ret = -1;
+	}
 	fclose(fp);
-
-error:
-	return;
+end:
+	return ret;
 }
 
 /*
@@ -209,10 +214,7 @@ int config_add_session_name(char *path, char *name)
 	if (ret < 0) {
 		goto error;
 	}
-
-	write_config(path, ret, session_name);
-	ret = 0;
-
+	ret = write_config(path, ret, session_name);
 error:
 	return ret;
 }