From ab0f87ffc4f6bc0388749299728a4ef9696b65c5 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 19 Aug 2004 16:55:05 +0000
Subject: [PATCH] Error messages cleanup

---
 src/time.c | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/time.c b/src/time.c
index abcadba..4448b77 100644
--- a/src/time.c
+++ b/src/time.c
@@ -12,6 +12,7 @@ extern int optind;
 
 
 /* time */
+static int _time_error(char * error, int ret);
 static int _time(int argc, char * argv[])
 {
 	pid_t pid;
@@ -20,43 +21,25 @@ static int _time(int argc, char * argv[])
 	clock_t cbefore, cafter;
 
 	if((cbefore = times(NULL)) == -1)
-	{
-		fprintf(stderr, "%s", "time: ");
-		perror("times");
-		return 2;
-	}
+		return _time_error("times", 2);
 	if((pid = fork()) == -1)
-	{
-		fprintf(stderr, "%s", "time: ");
-		perror("fork");
-		return 2;
-	}
+		return _time_error("fork", 2);
 	if(pid == 0)
 	{
 		execvp(argv[0], argv);
-		fprintf(stderr, "%s", "time: ");
-		perror(argv[0]);
 		if(errno == ENOENT)
-			return 127;
-		return 126;
+			return _time_error(argv[0], 127);
+		return _time_error(argv[0], 126);
 	}
 	for(;;)
 	{
 		if(waitpid(pid, &status, 0) == -1)
-		{
-			fprintf(stderr, "%s", "time: ");
-			perror("waitpid");
-			return 2;
-		}
+			return _time_error("waitpid", 2);
 		if(WIFEXITED(status))
 			break;
 	}
 	if((cafter = times(&tmsbuf)) == -1)
-	{
-		fprintf(stderr, "%s", "time: ");
-		perror("times");
-		return 2;
-	}
+		return _time_error("times", 2);
 	/* FIXME */
 	fprintf(stderr, "real %ld\nuser %ld\nsys %ld\n",
 			cafter - cbefore,
@@ -65,6 +48,13 @@ static int _time(int argc, char * argv[])
 	return 0;
 }
 
+static int _time_error(char * message, int ret)
+{
+	fprintf(stderr, "%s", "time: ");
+	perror(message);
+	return ret;
+}
+
 
 /* usage */
 static int _usage(void)