1 files changed, 13 insertions, 21 deletions

diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 00ad5b76..0f22fd8c 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -60,7 +60,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+
 #include "lp.h"
+#include "xalloc.h"
 #include "nls.h"
 
 struct command {
@@ -84,16 +86,6 @@ print_version(char *progname) {
   printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 }
 
-static void *
-mylloc(long size) {
-  void *ptr;
-  if(!(ptr = (void*)malloc(size))) {
-    perror(_("malloc error"));
-    exit(2);
-  }
-  return ptr;
-}
-
 static char *progname;
 
 static long
@@ -131,7 +123,7 @@ main (int argc, char ** argv) {
 
   if (argc < 2) print_usage(progname);
 
-  cmdst = cmds = mylloc(sizeof(struct command));
+  cmdst = cmds = xmalloc(sizeof(struct command));
   cmds->next = 0;
 
   show_irq = 1;
@@ -143,31 +135,31 @@ main (int argc, char ** argv) {
     case 'i':
       cmds->op = LPSETIRQ;
       cmds->val = get_val(optarg);
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
     case 't':
       cmds->op = LPTIME;
       cmds->val = get_val(optarg);
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
     case 'c':
       cmds->op = LPCHAR;
       cmds->val = get_val(optarg);
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
     case 'w':
       cmds->op = LPWAIT;
       cmds->val = get_val(optarg);
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
     case 'a':
       cmds->op = LPABORT;
       cmds->val = get_onoff(optarg);
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
     case 'q':
@@ -180,20 +172,20 @@ main (int argc, char ** argv) {
     case 'o':
       cmds->op = LPABORTOPEN;
       cmds->val = get_onoff(optarg);
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
     case 'C':
       cmds->op = LPCAREFUL;
       cmds->val = get_onoff(optarg);
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
     case 's':
       show_irq = 0;
       cmds->op = LPGETSTATUS;
       cmds->val = 0;
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
 #endif
@@ -201,7 +193,7 @@ main (int argc, char ** argv) {
     case 'r':
       cmds->op = LPRESET;
       cmds->val = 0;
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
 #endif
@@ -210,7 +202,7 @@ main (int argc, char ** argv) {
       /* Note: this will do the wrong thing on 2.0.36 when compiled under 2.2.x */
       cmds->op = LPTRUSTIRQ;
       cmds->val = get_onoff(optarg);
-      cmds->next = mylloc(sizeof(struct command));
+      cmds->next = xmalloc(sizeof(struct command));
       cmds = cmds->next; cmds->next = 0;
       break;
 #endif