diff options
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | pingu.c | 25 | ||||
-rw-r--r-- | xlib.c | 31 | ||||
-rw-r--r-- | xlib.h | 8 |
4 files changed, 42 insertions, 25 deletions
@@ -3,8 +3,9 @@ TARGETS = pingu mtu CFLAGS ?= -g pingu_OBJS = \ + log.o \ pingu.o \ - log.o + xlib.o mtu_OBJS = \ mtu.o @@ -7,6 +7,7 @@ #include <unistd.h> #include "pingu.h" +#include "xlib.h" int pingu_verbose = 0; @@ -19,30 +20,6 @@ struct provider { int status; }; -void *xmalloc(size_t size) -{ - void *p = malloc(size); - if (p == NULL) - err(EXIT_FAILURE, "malloc"); - return p; -} - -void *xrealloc(void *ptr, size_t size) -{ - void *p = realloc(ptr, size); - if (p == NULL) - err(EXIT_FAILURE, "realloc"); - return p; -} - -char *xstrdup(const char *str) -{ - char *s = strdup(str); - if (s == NULL) - err(EXIT_FAILURE, "strdup"); - return s; -} - #if 0 int skip(char **str, int whitespace) { @@ -0,0 +1,31 @@ + +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "xlib.h" + +void *xmalloc(size_t size) +{ + void *p = malloc(size); + if (p == NULL) + err(EXIT_FAILURE, "malloc"); + return p; +} + +void *xrealloc(void *ptr, size_t size) +{ + void *p = realloc(ptr, size); + if (p == NULL) + err(EXIT_FAILURE, "realloc"); + return p; +} + +char *xstrdup(const char *str) +{ + char *s = strdup(str); + if (s == NULL) + err(EXIT_FAILURE, "strdup"); + return s; +} + @@ -0,0 +1,8 @@ +#ifndef XLIB_H +#define XLIB_H + +void *xmalloc(size_t size); +void *xrealloc(void *ptr, size_t size); +char *xstrdup(const char *str); + +#endif |