public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] perf tools: Add error handling
@ 2015-06-09  7:49 Firo Yang
  2015-06-09  8:05 ` Julia Lawall
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Firo Yang @ 2015-06-09  7:49 UTC (permalink / raw)
  To: kernel-janitors

Add error handling code for snprintf and rename in check_backup.

Signed-off-by: Firo Yang <firogm@gmail.com>
---
Since there is  no suitable error code snprintf, I just return the 
value returned by snprintf.

 tools/perf/util/data.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index 1921942..26ab45a 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -32,15 +32,26 @@ static bool check_pipe(struct perf_data_file *file)
 
 static int check_backup(struct perf_data_file *file)
 {
+	int ret;
 	struct stat st;
 
 	if (!stat(file->path, &st) && st.st_size) {
-		/* TODO check errors properly */
 		char oldname[PATH_MAX];
-		snprintf(oldname, sizeof(oldname), "%s.old",
+		ret = snprintf(oldname, sizeof(oldname), "%s.old",
 			 file->path);
+		if (ret < 0) {
+			pr_err("failed to make name %s.old\n", file->path);
+			return ret;
+		}
+
 		unlink(oldname);
-		rename(file->path, oldname);
+
+		ret = rename(file->path, oldname);
+		if (ret < 0) {
+			pr_err("failed to rename %s to %s\n", file->path,
+				oldname);
+			return -errno;
+		}
 	}
 
 	return 0;
-- 
2.4.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-06-09 12:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-09  7:49 [PATCH v2] perf tools: Add error handling Firo Yang
2015-06-09  8:05 ` Julia Lawall
2015-06-09  8:25 ` Firo Yang
2015-06-09  8:35 ` Julia Lawall
2015-06-09  8:54 ` Firo Yang
2015-06-09 12:37 ` walter harms

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox