From 2fdb3fc0b67757afd6fe7a244b6e14d2a546af0e Mon Sep 17 00:00:00 2001
From: graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Date: Tue, 08 Dec 2009 20:20:03 -0500
Subject: Merge commit 'grg' into HEAD

git-svn-id: http://opkg.googlecode.com/svn/trunk@471 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
---
(limited to 'libbb/gz_open.c')

diff --git a/libbb/gz_open.c b/libbb/gz_open.c
index 3d07b58..7c7c722 100644
--- a/libbb/gz_open.c
+++ b/libbb/gz_open.c
@@ -35,11 +35,11 @@ gz_open(FILE *compressed_file, int *pid)
 	int unzip_pipe[2];
 
 	if (pipe(unzip_pipe)!=0) {
-		perror_msg("%s: pipe", __FUNCTION__);
+		perror_msg("pipe");
 		return(NULL);
 	}
 	if ((*pid = fork()) == -1) {
-		perror_msg("%s: fork", __FUNCTION__);
+		perror_msg("fork");
 		return(NULL);
 	}
 	if (*pid==0) {
@@ -62,26 +62,26 @@ gz_close(int gunzip_pid)
 	int ret;
 
 	if (waitpid(gunzip_pid, &status, 0) == -1) {
-		perror_msg("%s: waitpid", __FUNCTION__);
+		perror_msg("waitpid");
 		return -1;
 	}
 	
 	if (WIFSIGNALED(status)) {
-		error_msg("%s: unzip process killed by signal %d\n",
-			__FUNCTION__, WTERMSIG(status));
+		error_msg("Unzip process killed by signal %d.\n",
+			WTERMSIG(status));
 		return -1;
 	}
 
 	if (!WIFEXITED(status)) {
 		/* shouldn't happen */
-		error_msg("%s: Your system is broken: got status %d from waitpid\n",
-				__FUNCTION__, status);
+		error_msg("Your system is broken: got status %d from waitpid.\n",
+				status);
 		return -1;
 	}
 
 	if ((ret = WEXITSTATUS(status))) {
-		error_msg("%s: unzip process failed with return code %d.\n",
-				__FUNCTION__, ret);
+		error_msg("Unzip process failed with return code %d.\n",
+				ret);
 		return -1;
 	}
 
--
cgit v0.9.1