get rid of err.h

svn:r218

diff --git a/event_tagging.c b/event_tagging.c
index b923ad3cbe584e896d753a2ca810066761c621cd..b60d722eff99aa7cdedb96f2df301b85ff564762 100644 (file)
--- a/event_tagging.c
+++ b/event_tagging.c
@@ -39,7 +39,6 @@
 #include <sys/time.h>
 #endif
 
-#include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,6 +47,7 @@
 #include <unistd.h>
 
 #include "event.h"
+#include "log.h"
 
 int decode_int(u_int32_t *pnumber, struct evbuffer *evbuf);
 
@@ -57,7 +57,7 @@ void
 evtag_init()
 {
        if ((_buf = evbuffer_new()) == NULL)
-               err(1, "%s: malloc", __func__);
+               event_err(1, "%s: malloc", __func__);
 }
 
 /* 
@@ -332,7 +332,7 @@ evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag,
 
        *pstring = calloc(EVBUFFER_LENGTH(_buf) + 1, 1);
        if (*pstring == NULL)
-               err(1, "%s: calloc", __func__);
+               event_err(1, "%s: calloc", __func__);
        evbuffer_remove(_buf, *pstring, EVBUFFER_LENGTH(_buf));
 
        return (0);

diff --git a/http.c b/http.c
index 97104f3fccf8a43f9ec5c0ccdf5e8936289f3e2c..42d609b47f3928f0aaf0373385e5c762394d2515 100644 (file)
--- a/http.c
+++ b/http.c
@@ -49,7 +49,6 @@
 #include <netdb.h>
 
 #include <assert.h>
-#include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>