misc-utils: use new xmalloc() wrapper

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index 9873cda95615d841c88b8a08cfbe254a20497eb4..0342a08cb2f9ec9465bc02f6f0d44b63c26c83f8 100644 (file)
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -19,6 +19,7 @@
  *     Arkadiusz Mikiewicz (1999-02-22)
  *     Li Zefan (2007-09-10).
  */
+
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
@@ -34,6 +35,7 @@
 #include <grp.h>
 
 #include "c.h"
+#include "xalloc.h"
 #include "nls.h"
 #include "widechar.h"
 
@@ -194,9 +196,7 @@ readlink_to_namei(struct namei *nm, const char *path)
                if (nm->relstart)
                        sz += nm->relstart + 1;
        }
-       nm->abslink = malloc(sz + 1);
-       if (!nm->abslink)
-               err(EXIT_FAILURE, _("out of memory?"));
+       nm->abslink = xmalloc(sz + 1);
 
        if (*sym != '/' && nm->relstart) {
                /* create the absolute path from the relative symlink */

diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index 87262b80048d1eb2fca194c79640e467ad7c7e12..495e511c97cd2dad649566ba02af7fac7ffa20b3 100644 (file)
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -17,7 +17,9 @@ for i in $@; do N=`echo "$i" | sed "s/$FROM/$TO/g"`; mv "$i" "$N"; done
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
+
 #include "nls.h"
+#include "xalloc.h"
 
 static char *progname;
 
@@ -33,11 +35,7 @@ do_rename(char *from, char *to, char *s) {
        flen = strlen(from);
        tlen = strlen(to);
        slen = strlen(s);
-       newname = malloc(tlen+slen+1);
-       if (newname == NULL) {
-               fprintf(stderr, _("%s: out of memory\n"), progname);
-               exit(1);
-       }
+       newname = xmalloc(tlen+slen+1);
 
        p = s;
        q = newname;

diff --git a/misc-utils/setterm.c b/misc-utils/setterm.c
index 2601ffc6fc1abcf0dff49267beefe1021c212053..14b2c3df47550fc1aa49a7040b3a507093c47e21 100644 (file)
--- a/misc-utils/setterm.c
+++ b/misc-utils/setterm.c
@@ -117,6 +117,7 @@
 #endif
 
 #include "c.h"
+#include "xalloc.h"
 #include "nls.h"
 
 #if __GNU_LIBRARY__ < 5

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index c0b29f0ec12a444c6bd35090eac8c37792703e23..dbfabc4a16c0c0a682585e3cbf605b83f1faada7 100644 (file)
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -34,6 +34,7 @@
 #include <blkid.h>
 
 #include "nls.h"
+#include "xalloc.h"
 #include "strtosize.h"
 
 struct wipe_desc {
@@ -135,15 +136,6 @@ add_offset(struct wipe_desc *wp0, loff_t offset, int zap)
        return wp;
 }
 
-static inline void *
-xmalloc(size_t sz)
-{
-       void *x = malloc(sz);
-       if (!x)
-               err(EXIT_FAILURE, _("malloc failed"));
-       return x;
-}
-
 static inline char *
 xstrdup(const char *s)
 {