--- a/src/spbot/signals.c	Wed May 27 23:57:48 2009 +0300
+++ b/src/spbot/signals.c	Thu May 28 00:35:02 2009 +0300
@@ -1,6 +1,6 @@
 
 #include "signals.h"
-#include "log.h"
+#include <lib/log.h>
 
 #define _GNU_SOURCE
 
@@ -27,7 +27,8 @@
 void signals_loopexit (int signal, short event, void *arg) 
 {
     struct signals *signals = arg;
-
+    
+    (void) signal;
     (void) event;
 
     log_info("caught %s: exiting", /* strsignal(signal) */ "xxx");
@@ -48,12 +49,12 @@
     /* ignore */
 }
 
-err_t signals_create (struct signals **signals_ptr, struct event_base *ev_base)
+err_t signals_create (struct signals **signals_ptr, struct event_base *ev_base, error_t *err)
 {
     struct signals *signals;
 
     if ((signals = calloc(1, sizeof(*signals))) == NULL)
-        return ERR_CALLOC;
+        return SET_ERROR(err, &general_errors, ERR_MEM);
     
     // simple attributes
     signals->ev_base = ev_base;
@@ -83,7 +84,7 @@
     return SUCCESS;
 }
 
-err_t signal_ignore (int signum, struct error_info *err)
+err_t signal_ignore (int signum, error_t *err)
 {
     struct sigaction act = {
         .sa_handler     = SIG_IGN,
@@ -91,7 +92,7 @@
     
     // signall the handler
     if (sigaction(signum, &act, NULL))
-        RETURN_SET_ERROR_ERRNO(err, ERR_SIGACTION);
+        return SET_ERROR_ERRNO(err, &libc_errors, ERR_SIGACTION);
 
     // ok
     return SUCCESS;
@@ -100,10 +101,10 @@
 struct signals *signals_default (struct event_base *ev_base) 
 {
     struct signals *signals = NULL;
-    struct error_info err;
+    error_t err;
     
     // alloc signals
-    if (signals_create(&signals, ev_base))
+    if (signals_create(&signals, ev_base, &err))
         return NULL;
     
     // add the set of default signals