From afaf69889691a4dad5f69628d8827b88059c144b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 24 Jan 2012 00:40:28 -0500
Subject: [PATCH] use helpers from c.h

A few files still use the C library helpers from err.h, so migrate
them to the local c.h helpers.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 include/xalloc.h | 8 ++++----
 proc/sig.c       | 3 ++-
 pwdx.c           | 2 +-
 skill.c          | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/xalloc.h b/include/xalloc.h
index bd02c750..37bf0efa 100644
--- a/include/xalloc.h
+++ b/include/xalloc.h
@@ -24,7 +24,7 @@ void *xmalloc(const size_t size)
 {
 	void *ret = malloc(size);
 	if (!ret && size)
-		err(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
+		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
 	return ret;
 }
 
@@ -33,7 +33,7 @@ void *xrealloc(void *ptr, const size_t size)
 {
 	void *ret = realloc(ptr, size);
 	if (!ret && size)
-		err(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
+		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
 	return ret;
 }
 
@@ -42,7 +42,7 @@ void *xcalloc(const size_t nelems, const size_t size)
 {
 	void *ret = calloc(nelems, size);
 	if (!ret && size && nelems)
-		err(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
+		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
 	return ret;
 }
 
@@ -53,7 +53,7 @@ static inline char *xstrdup(const char *str)
 		return NULL;
 	ret = strdup(str);
 	if (!ret)
-		err(XALLOC_EXIT_CODE, "cannot duplicate string");
+		xerrx(XALLOC_EXIT_CODE, "cannot duplicate string");
 	return ret;
 }
 
diff --git a/proc/sig.c b/proc/sig.c
index 1137fefa..b83e6458 100644
--- a/proc/sig.c
+++ b/proc/sig.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "sig.h"
+#include "c.h"
 
 /* Linux signals:
  *
@@ -221,7 +222,7 @@ char *strtosig(const char *restrict s){
 
   copy = strdup(s);
   if (!copy)
-    err(EXIT_FAILURE, "cannot duplicate string");
+    xerrx(EXIT_FAILURE, "cannot duplicate string");
   for (p = copy; *p != '\0'; p++)
     *p = toupper(*p);
   p = copy;
diff --git a/pwdx.c b/pwdx.c
index b4aa689c..3d8b71f7 100644
--- a/pwdx.c
+++ b/pwdx.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 		char buf[10 + strlen(argv[i]) + 1];
 
 		if (check_pid_argument(argv[i]))
-			errx(EXIT_FAILURE, _("invalid process id: %s"),
+			xerrx(EXIT_FAILURE, _("invalid process id: %s"),
 			     argv[i]);
 		/*
 		 * At this point, all arguments are in the form
diff --git a/skill.c b/skill.c
index de3ccb94..078624dd 100644
--- a/skill.c
+++ b/skill.c
@@ -131,7 +131,7 @@ static void check_proc(int pid, struct run_time_conf_t *run_time)
 	if (fd == -1) {
 		/* process exited maybe */
 		if (run_time->warnings)
-			warn(_("cannot open file %s"), buf);
+			xwarn(_("cannot open file %s"), buf);
 		return;
 	}
 	fstat(fd, &statbuf);