hide ((isc_event_t **) (void *)) cast using a macro, ISC_EVENT_PTR.

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index c84ac6170f7f6f1a2500eb5082474e9f2131de12..ca7b9817c1cca457e348f8afcb3c601d826393e4 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.139.2.4 2004/04/15 01:38:04 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.139.2.5 2004/04/15 02:16:24 marka Exp $ */
 
 #include <config.h>
 
@@ -1241,7 +1241,7 @@ assignwork(isc_task_t *task, isc_task_t *worker) {
        sevent->node = node;
        sevent->fname = fname;
        sevent->fnextname = fnextname;
-       isc_task_send(worker, (isc_event_t **) (void *) &sevent);
+       isc_task_send(worker, ISC_EVENT_PTR(&sevent));
        assigned++;
 }
 
@@ -1308,7 +1308,7 @@ sign(isc_task_t *task, isc_event_t *event) {
                fatal("failed to allocate event\n");
        wevent->node = node;
        wevent->fname = fname;
-       isc_task_send(master, (isc_event_t **) (void*) &wevent);
+       isc_task_send(master, ISC_EVENT_PTR(&wevent));
 }
 
 /*

diff --git a/bin/named/query.c b/bin/named/query.c
index 5bafe3efe82b139cacb64aeb2d75d07cb4bce680..4c67fff0b9310c72821db94e5637f512742fdae9 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.198.2.18 2004/04/15 01:38:04 marka Exp $ */
+/* $Id: query.c,v 1.198.2.19 2004/04/15 02:16:25 marka Exp $ */
 
 #include <config.h>
 
@@ -3237,7 +3237,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                dns_db_detach(&zdb);
        }
        if (event != NULL)
-               isc_event_free((isc_event_t **) (void*)&event);
+               isc_event_free(ISC_EVENT_PTR(&event));
 
        /*
         * AA bit.

diff --git a/bin/named/update.c b/bin/named/update.c
index c13d862c25f5c02f3f87159d7c283053d6a58088..501bdaef64269b37d257c1c9b836397edde52a7a 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.88.2.7 2004/04/15 01:38:05 marka Exp $ */
+/* $Id: update.c,v 1.88.2.8 2004/04/15 02:16:25 marka Exp $ */
 
 #include <config.h>
 
@@ -1892,11 +1892,11 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) {
        event->ev_arg = evclient;
 
        dns_zone_gettask(zone, &zonetask);
-       isc_task_send(zonetask, (isc_event_t **) (void *)&event);
+       isc_task_send(zonetask, ISC_EVENT_PTR(&event));
 
  failure:
        if (event != NULL)
-               isc_event_free((isc_event_t **) (void *)&event);
+               isc_event_free(ISC_EVENT_PTR(&event));
        return (result);
 }
 
@@ -2547,7 +2547,7 @@ forward_callback(void *arg, isc_result_t result, dns_message_t *answer) {
                uev->ev_action = forward_done;
                uev->answer = answer;
        }
-       isc_task_send(client->task, (isc_event_t **) (void *)&uev);
+       isc_task_send(client->task, ISC_EVENT_PTR(&uev));
 }
 
 static void
@@ -2601,10 +2601,10 @@ send_forward_event(ns_client_t *client, dns_zone_t *zone) {
        event->ev_arg = evclient;
 
        dns_zone_gettask(zone, &zonetask);
-       isc_task_send(zonetask, (isc_event_t **) (void *)&event);
+       isc_task_send(zonetask, ISC_EVENT_PTR(&event));
 
  failure:
        if (event != NULL)
-               isc_event_free((isc_event_t **) (void *)&event);
+               isc_event_free(ISC_EVENT_PTR(&event));
        return (result);
 }

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 06a1e57d9d9aadfafc51d9df36ce9a4c53088ba4..ad4f30c346e5c61ce15e3b904d3b09df5ce70b17 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.101.2.9 2004/04/15 01:38:06 marka Exp $ */
+/* $Id: dispatch.c,v 1.101.2.10 2004/04/15 02:16:26 marka Exp $ */
 
 #include <config.h>
 
@@ -670,7 +670,7 @@ udp_recv(isc_task_t *task, isc_event_t *ev_in) {
                            rev, rev->buffer.base, rev->buffer.length,
                            resp->task);
                resp->item_out = ISC_TRUE;
-               isc_task_send(resp->task, (isc_event_t **) (void *)&rev);
+               isc_task_send(resp->task, ISC_EVENT_PTR(&rev));
        }
 
        /*
@@ -846,7 +846,7 @@ tcp_recv(isc_task_t *task, isc_event_t *ev_in) {
                            rev, rev->buffer.base, rev->buffer.length,
                            resp->task);
                resp->item_out = ISC_TRUE;
-               isc_task_send(resp->task, (isc_event_t **) (void *)&rev);
+               isc_task_send(resp->task, ISC_EVENT_PTR(&rev));
        }
 
        /*
@@ -1984,7 +1984,7 @@ do_cancel(dns_dispatch_t *disp, dns_dispentry_t *resp) {
                    "cancel: failsafe event %p -> task %p",
                    ev, resp->task);
        resp->item_out = ISC_TRUE;
-       isc_task_send(resp->task, (isc_event_t **) (void *)&ev);
+       isc_task_send(resp->task, ISC_EVENT_PTR(&ev));
 }
 
 isc_socket_t *
@@ -2080,7 +2080,7 @@ dns_dispatch_importrecv(dns_dispatch_t *disp, isc_event_t *event) {
 
        buf = allocate_udp_buffer(disp);
        if (buf == NULL) {
-               isc_event_free((isc_event_t **) (void *)&newsevent);
+               isc_event_free(ISC_EVENT_PTR(&newsevent));
                return;
        }
        memcpy(buf, sevent->region.base, sevent->n);
@@ -2093,7 +2093,7 @@ dns_dispatch_importrecv(dns_dispatch_t *disp, isc_event_t *event) {
        newsevent->pktinfo = sevent->pktinfo;
        newsevent->attributes = sevent->attributes;
        
-       isc_task_send(disp->task, (isc_event_t **) (void*)&newsevent);
+       isc_task_send(disp->task, ISC_EVENT_PTR(&newsevent));
 }
 
 #if 0

diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index 173d6fbaafef1964a323bb2bbc157f49e4ea49f1..37cf1a54df3fa179407c41b6dd0baf919fc9abd8 100644 (file)
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lookup.c,v 1.9.2.2 2004/04/15 01:38:07 marka Exp $ */
+/* $Id: lookup.c,v 1.9.2.3 2004/04/15 02:16:27 marka Exp $ */
 
 #include <config.h>
 
@@ -321,7 +321,7 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) {
                                dns_db_detachnode(event->db, &event->node);
                        if (event->db != NULL)
                                dns_db_detach(&event->db);
-                       isc_event_free((isc_event_t **) (void *)&event);
+                       isc_event_free(ISC_EVENT_PTR(&event));
                }
 
                /*

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index b1fc4cdd7d9ae774e35f9163c97541fc5275ee28..27588c2709e322b7530344e96a527843c86c7759 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.30 2004/04/15 01:38:07 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.31 2004/04/15 02:16:27 marka Exp $ */
 
 #include <config.h>
 
@@ -627,7 +627,7 @@ fctx_sendevents(fetchctx_t *fctx, isc_result_t result) {
                       fctx->type == dns_rdatatype_any ||
                       fctx->type == dns_rdatatype_sig);
 
-               isc_task_sendanddetach(&task, (isc_event_t **) (void *)&event);
+               isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event));
        }
 }
 
@@ -5263,7 +5263,7 @@ dns_resolver_cancelfetch(dns_fetch_t *fetch) {
                etask = event->ev_sender;
                event->ev_sender = fctx;
                event->result = ISC_R_CANCELED;
-               isc_task_sendanddetach(&etask, (isc_event_t **) (void *)&event);
+               isc_task_sendanddetach(&etask, ISC_EVENT_PTR(&event));
        }
        /*
         * The fctx continues running even if no fetches remain;

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 35323337a1cfd05cbcaf831ca21dd765aebfa3a6..34165819438b9b4f2735a4027e20aba287dba6cc 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.91.2.7 2004/04/15 01:38:08 marka Exp $ */
+/* $Id: validator.c,v 1.91.2.8 2004/04/15 02:16:28 marka Exp $ */
 
 #include <config.h>
 
@@ -1546,7 +1546,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
        ISC_LINK_INIT(val, link);
        val->magic = VALIDATOR_MAGIC;
 
-       isc_task_send(task, (isc_event_t **) (void *)&event);
+       isc_task_send(task, ISC_EVENT_PTR(&event));
 
        *validatorp = val;
 

diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h
index 75ba64e3bd08fdcf79f31588c971521a298abcba..f3cca874c78789da5d1594119892d96084674c59 100644 (file)
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: event.h,v 1.24.2.3 2004/03/09 06:11:55 marka Exp $ */
+/* $Id: event.h,v 1.24.2.4 2004/04/15 02:16:29 marka Exp $ */
 
 #ifndef ISC_EVENT_H
 #define ISC_EVENT_H 1
@@ -82,6 +82,8 @@ struct isc_event {
 #define ISC_EVENTTYPE_FIRSTEVENT       0x00000000
 #define ISC_EVENTTYPE_LASTEVENT                0xffffffff
 
+#define ISC_EVENT_PTR(p) ((isc_event_t **)(void *)(p))
+
 ISC_LANG_BEGINDECLS
 
 isc_event_t *

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index eb7d9aafe1570cc94010723aab2b603d5c3ffb7c..3e66b058b4b711a88e3afdb5fee551d59c603cbe 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.207.2.25 2004/04/15 01:38:09 marka Exp $ */
+/* $Id: socket.c,v 1.207.2.26 2004/04/15 02:16:29 marka Exp $ */
 
 #include <config.h>
 
@@ -1958,7 +1958,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
        task = dev->ev_sender;
        dev->ev_sender = sock;
 
-       isc_task_sendanddetach(&task, (isc_event_t **) (void *)&dev);
+       isc_task_sendanddetach(&task, ISC_EVENT_PTR(&dev));
        return;
 
  soft_error:
@@ -2964,7 +2964,7 @@ isc_socket_accept(isc_socket_t *sock,
 
        ret = allocate_socket(manager, sock->type, &nsock);
        if (ret != ISC_R_SUCCESS) {
-               isc_event_free((isc_event_t **) (void *)&dev);
+               isc_event_free(ISC_EVENT_PTR(&dev));
                UNLOCK(&sock->lock);
                return (ret);
        }
@@ -3064,12 +3064,12 @@ isc_socket_connect(isc_socket_t *sock, isc_sockaddr_t *addr,
                UNEXPECTED_ERROR(__FILE__, __LINE__, "%d/%s", errno, strbuf);
 
                UNLOCK(&sock->lock);
-               isc_event_free((isc_event_t **) (void *)&dev);
+               isc_event_free(ISC_EVENT_PTR(&dev));
                return (ISC_R_UNEXPECTED);
 
        err_exit:
                sock->connected = 0;
-               isc_task_send(task, (isc_event_t **) (void *)&dev);
+               isc_task_send(task, ISC_EVENT_PTR(&dev));
 
                UNLOCK(&sock->lock);
                return (ISC_R_SUCCESS);
@@ -3082,7 +3082,7 @@ isc_socket_connect(isc_socket_t *sock, isc_sockaddr_t *addr,
                sock->connected = 1;
                sock->bound = 1;
                dev->result = ISC_R_SUCCESS;
-               isc_task_send(task, (isc_event_t **) (void *)&dev);
+               isc_task_send(task, ISC_EVENT_PTR(&dev));
 
                UNLOCK(&sock->lock);
                return (ISC_R_SUCCESS);
@@ -3220,7 +3220,7 @@ internal_connect(isc_task_t *me, isc_event_t *ev) {
 
        task = dev->ev_sender;
        dev->ev_sender = sock;
-       isc_task_sendanddetach(&task, (isc_event_t **) (void *)&dev);
+       isc_task_sendanddetach(&task, ISC_EVENT_PTR(&dev));
 }
 
 isc_result_t
@@ -3368,7 +3368,7 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) {
                                dev->result = ISC_R_CANCELED;
                                dev->ev_sender = sock;
                                isc_task_sendanddetach(&current_task,
-                                               (isc_event_t **) (void *)&dev);
+                                               ISC_EVENT_PTR(&dev));
                        }
 
                        dev = next;
@@ -3395,7 +3395,7 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) {
                        dev->result = ISC_R_CANCELED;
                        dev->ev_sender = sock;
                        isc_task_sendanddetach(&current_task,
-                                              (isc_event_t **) (void *)&dev);
+                                              ISC_EVENT_PTR(&dev));
                }
        }