Commit afaf6988 authored by Mike Frysinger's avatar Mike Frysinger Committed by Sami Kerola

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: default avatarMike Frysinger <vapier@gentoo.org>
parent 13d8cc06
......@@ -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;
}
......
......@@ -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;
......
......@@ -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
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment