Imported Upstream version 2.6.0

[debian/amanda] / common-src / event.c

diff --git a/common-src/event.c b/common-src/event.c
index 0959c721ebb47c58d9b8ce4ffc9e91dbeac99871..11bad8bf576575ef3d58c2b9e514328d4e71fd3a 100644 (file)
--- a/common-src/event.c
+++ b/common-src/event.c
@@ -36,10 +36,10 @@
 #include "queue.h"
 #include "conffile.h"
 
-#define event_debug(i,x) do {                          \
-       if ((i) <= debug_event) {       \
-           dbprintf(x);                                \
-       }                                               \
+#define event_debug(i, ...) do {       \
+       if ((i) <= debug_event) {       \
+           dbprintf(__VA_ARGS__);      \
+       }                               \
 } while (0)
 
 /*
@@ -110,23 +110,23 @@ event_register(
 
     if ((type == EV_READFD) || (type == EV_WRITEFD)) {
        /* make sure we aren't given a high fd that will overflow a fd_set */
-       if (data >= FD_SETSIZE) {
-           error("event_register: Invalid file descriptor %lu", data);
+       if (data >= (int)FD_SETSIZE) {
+           error(_("event_register: Invalid file descriptor %lu"), data);
            /*NOTREACHED*/
        }
 #if !defined(__lint) /* Global checking knows that these are never called */
     } else if (type == EV_SIG) {
        /* make sure signals are within range */
        if (data >= NSIG) {
-           error("event_register: Invalid signal %lu", data);
+           error(_("event_register: Invalid signal %lu"), data);
            /*NOTREACHED*/
        }
        if (sigtable[data].handle != NULL) { 
-           error("event_register: signal %lu already registered", data);
+           error(_("event_register: signal %lu already registered"), data);
            /*NOTREACHED*/
        }
     } else if (type >= EV_DEAD) {
-       error("event_register: Invalid event type %d", type);
+       error(_("event_register: Invalid event type %d"), type);
        /*NOTREACHED*/
 #endif
     }
@@ -140,9 +140,8 @@ event_register(
     eventq_add(eventq, handle);
     eventq.qlength++;
 
-    event_debug(1, ("%s: event: register: %p->data=%lu, type=%s\n",
-                   debug_prefix_time(NULL), handle, handle->data,
-                   event_type2str(handle->type)));
+    event_debug(1, _("event: register: %p->data=%lu, type=%s\n"),
+                   handle, handle->data, event_type2str(handle->type));
     return (handle);
 }
 
@@ -158,9 +157,9 @@ event_release(
 
     assert(handle != NULL);
 
-    event_debug(1, ("%s: event: release (mark): %p data=%lu, type=%s\n",
-                   debug_prefix_time(NULL), handle, handle->data,
-                   event_type2str(handle->type)));
+    event_debug(1, _("event: release (mark): %p data=%lu, type=%s\n"),
+                   handle, handle->data,
+                   event_type2str(handle->type));
     assert(handle->type != EV_DEAD);
 
     /*
@@ -198,14 +197,12 @@ event_wakeup(
     event_handle_t *eh;
     int nwaken = 0;
 
-    event_debug(1, ("%s: event: wakeup: enter (%lu)\n",
-                   debug_prefix_time(NULL), id));
+    event_debug(1, _("event: wakeup: enter (%lu)\n"), id);
 
     for (eh = eventq_first(eventq); eh != NULL; eh = eventq_next(eh)) {
 
        if (eh->type == EV_WAIT && eh->data == id) {
-           event_debug(1, ("%s: event: wakeup: %p id=%lu\n",
-                           debug_prefix_time(NULL), eh, id));
+           event_debug(1, _("event: wakeup: %p id=%lu\n"), eh, id);
            fire(eh);
            nwaken++;
        }
@@ -258,9 +255,8 @@ event_loop_wait(
     int event_wait_fired = 0;
     int see_event;
 
-    event_debug(1, ("%s: event: loop: enter: dontblock=%d, qlength=%d, eh=%p\n",
-                   debug_prefix_time(NULL),
-                   dontblock, eventq.qlength, wait_eh));
+    event_debug(1, _("event: loop: enter: dontblock=%d, qlength=%d, eh=%p\n"),
+                   dontblock, eventq.qlength, wait_eh);
 
     /*
      * If we have no events, we have nothing to do
@@ -283,14 +279,12 @@ event_loop_wait(
 
     do {
        if (debug_event >= 1) {
-           event_debug(1, ("%s: event: loop: dontblock=%d, qlength=%d eh=%p\n",
-                           debug_prefix_time(NULL), dontblock, eventq.qlength,
-                           wait_eh));
+           event_debug(1, _("event: loop: dontblock=%d, qlength=%d eh=%p\n"),
+                           dontblock, eventq.qlength, wait_eh);
            for (eh = eventq_first(eventq); eh != NULL; eh = eventq_next(eh)) {
-               event_debug(1, ("%s: %p): %s data=%lu fn=%p arg=%p\n",
-                               debug_prefix_time(NULL), eh,
-                               event_type2str(eh->type), eh->data, eh->fn,
-                               eh->arg));
+               event_debug(1, _("%p): %s data=%lu fn=%p arg=%p\n"),
+                               eh, event_type2str(eh->type), eh->data, eh->fn,
+                               eh->arg);
            }
        }
        /*
@@ -427,12 +421,11 @@ event_loop_wait(
         * Let 'er rip
         */
        event_debug(1,
-                   ("%s: event: select: dontblock=%d, maxfd=%d, timeout=%ld\n",
-                    debug_prefix_time(NULL), dontblock, maxfd,
-                    tvptr != NULL ? timeout.tv_sec : -1));
+                   _("event: select: dontblock=%d, maxfd=%d, timeout=%ld\n"),
+                    dontblock, maxfd,
+                    tvptr != NULL ? timeout.tv_sec : -1);
        rc = select(maxfd + 1, &readfds, &writefds, &errfds, tvptr);
-       event_debug(1, ("%s: event: select returns %d\n",
-                       debug_prefix_time(NULL), rc));
+       event_debug(1, _("event: select returns %d\n"), rc);
 
        /*
         * Select errors can mean many things.  Interrupted events should
@@ -442,7 +435,7 @@ event_loop_wait(
        if (rc < 0) {
            if (errno != EINTR) {
                if (++ntries > 5) {
-                   error("select failed: %s", strerror(errno));
+                   error(_("select failed: %s"), strerror(errno));
                    /*NOTREACHED*/
                }
                continue;
@@ -623,5 +616,5 @@ event_type2str(
     for (i = 0; i < (size_t)(sizeof(event_types) / sizeof(event_types[0])); i++)
        if (type == event_types[i].type)
            return (event_types[i].name);
-    return ("BOGUS EVENT TYPE");
+    return (_("BOGUS EVENT TYPE"));
 }