diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-12 14:02:39 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-12 14:02:39 +0100 |
commit | 03e9f2891d17643e603f3fd5f88dc61556e38802 (patch) | |
tree | 6dbdbad916543b0ebb95a4da0bf28d5247a26a78 | |
parent | 9ba3489123c6de58f70fc05379644c2ccedbe870 (diff) | |
download | nldev-03e9f2891d17643e603f3fd5f88dc61556e38802.tar.bz2 nldev-03e9f2891d17643e603f3fd5f88dc61556e38802.tar.xz |
move edie, die and dbg functions to log.c
So it can be reused by the handler.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | log.c | 48 | ||||
-rw-r--r-- | log.h | 10 | ||||
-rw-r--r-- | nldev.c | 44 |
4 files changed, 61 insertions, 43 deletions
@@ -4,7 +4,7 @@ include config.mk SRC = ${NAME}.c -OBJ = ${SRC:.c=.o} +OBJ = ${SRC:.c=.o} log.o all: options ${NAME} @@ -0,0 +1,48 @@ + +#include <stdio.h> +#include <stdlib.h> + +#include "log.h" + +int dodebug = 0; + +void +edie(char *fmt, ...) +{ + va_list fmtargs; + + va_start(fmtargs, fmt); + vfprintf(stderr, fmt, fmtargs); + va_end(fmtargs); + fprintf(stderr, ": "); + + perror(NULL); + + exit(1); +} + +void +die(char *fmt, ...) +{ + va_list fmtargs; + + va_start(fmtargs, fmt); + vfprintf(stderr, fmt, fmtargs); + va_end(fmtargs); + + exit(1); +} + +void +dbg(char *fmt, ...) +{ + va_list fmtargs; + + if (dodebug) { + fprintf(stderr, "%s: ", argv0); + va_start(fmtargs, fmt); + vfprintf(stderr, fmt, fmtargs); + va_end(fmtargs); + fprintf(stderr, "\n"); + } +} @@ -0,0 +1,10 @@ + +#include <stdarg.h> + +#include "arg.h" + +void edie(char *fmt, ...); +void die(char *fmt, ...); +void dbg(char *fmt, ...); + +extern int dodebug; @@ -22,51 +22,11 @@ #include <linux/netlink.h> #include "arg.h" +#include "log.h" char *argv0; int listfd = -1; -int dofork = 0, dodebug = 0; - -void -edie(char *fmt, ...) -{ - va_list fmtargs; - - va_start(fmtargs, fmt); - vfprintf(stderr, fmt, fmtargs); - va_end(fmtargs); - fprintf(stderr, ": "); - - perror(NULL); - - exit(1); -} - -void -die(char *fmt, ...) -{ - va_list fmtargs; - - va_start(fmtargs, fmt); - vfprintf(stderr, fmt, fmtargs); - va_end(fmtargs); - - exit(1); -} - -void -dbg(char *fmt, ...) -{ - va_list fmtargs; - - if (dodebug) { - fprintf(stderr, "%s: ", argv0); - va_start(fmtargs, fmt); - vfprintf(stderr, fmt, fmtargs); - va_end(fmtargs); - fprintf(stderr, "\n"); - } -} +int dofork = 0; void disableoom(void) |