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 'libopkg/xsystem.c')

diff --git a/libopkg/xsystem.c b/libopkg/xsystem.c
index 123510f..fc7db69 100644
--- a/libopkg/xsystem.c
+++ b/libopkg/xsystem.c
@@ -39,7 +39,7 @@ xsystem(const char *argv[])
 
 	switch (pid) {
 	case -1:
-		perror_msg("%s: %s: vfork", __FUNCTION__, argv[0]);
+		opkg_perror(ERROR, "%s: vfork", argv[0]);
 		return -1;
 	case 0:
 		/* child */
@@ -51,20 +51,20 @@ xsystem(const char *argv[])
 	}
 
 	if (waitpid(pid, &status, 0) == -1) {
-		perror_msg("%s: %s: waitpid", __FUNCTION__, argv[0]);
+		opkg_perror(ERROR, "%s: waitpid", argv[0]);
 		return -1;
 	}
 
 	if (WIFSIGNALED(status)) {
-		error_msg("%s: %s: Child killed by signal %d\n",
-			__FUNCTION__, argv[0], WTERMSIG(status));
+		opkg_msg(ERROR, "%s: Child killed by signal %d.\n",
+			argv[0], WTERMSIG(status));
 		return -1;
 	}
 
 	if (!WIFEXITED(status)) {
 		/* shouldn't happen */
-		error_msg("%s: %s: Your system is broken: got status %d "
-			"from waitpid\n", __FUNCTION__, argv[0], status);
+		opkg_msg(ERROR, "%s: Your system is broken: got status %d "
+			"from waitpid.\n", argv[0], status);
 		return -1;
 	}
 
--
cgit v0.9.1