Merge commit 'grg' into HEAD

[oweals/opkg-lede.git] / libbb / gz_open.c

diff --git a/libbb/gz_open.c b/libbb/gz_open.c
index 3d07b58ab8d87bd33608bf33b68b11b087868fba..7c7c722d3cb640d4f768fa7ce2432ac4aff8045a 100644 (file)
--- 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;
        }