Module Name: src
Committed By: christos
Date: Sat Dec 25 18:23:39 UTC 2010
Modified Files:
src/external/bsd/bind/dist/bin/named: client.c
src/external/bsd/bind/dist/lib/dns: byaddr.c lookup.c request.c sdb.c
validator.c
Log Message:
fix type-punned warnings on gcc-3.3.3
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/bind/dist/bin/named/client.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/bind/dist/lib/dns/byaddr.c \
src/external/bsd/bind/dist/lib/dns/request.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/bind/dist/lib/dns/lookup.c
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/bind/dist/lib/dns/sdb.c
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/bind/dist/lib/dns/validator.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/named/client.c
diff -u src/external/bsd/bind/dist/bin/named/client.c:1.1.1.4 src/external/bsd/bind/dist/bin/named/client.c:1.2
--- src/external/bsd/bind/dist/bin/named/client.c:1.1.1.4 Thu Dec 2 09:22:26 2010
+++ src/external/bsd/bind/dist/bin/named/client.c Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.1.1.4 2010/12/02 14:22:26 christos Exp $ */
+/* $NetBSD: client.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
@@ -490,8 +490,8 @@
ns_query_free(client);
isc_mem_put(client->mctx, client->recvbuf, RECV_BUFFER_SIZE);
- isc_event_free((isc_event_t **)&client->sendevent);
- isc_event_free((isc_event_t **)&client->recvevent);
+ isc_event_free((isc_event_t **)(void *)&client->sendevent);
+ isc_event_free((isc_event_t **)(void *)&client->recvevent);
isc_timer_detach(&client->timer);
if (client->tcpbuf != NULL)
@@ -2139,13 +2139,13 @@
ns_query_free(client);
cleanup_recvevent:
- isc_event_free((isc_event_t **)&client->recvevent);
+ isc_event_free((isc_event_t **)(void *)&client->recvevent);
cleanup_recvbuf:
isc_mem_put(client->mctx, client->recvbuf, RECV_BUFFER_SIZE);
cleanup_sendevent:
- isc_event_free((isc_event_t **)&client->sendevent);
+ isc_event_free((isc_event_t **)(void *)&client->sendevent);
client->magic = 0;
Index: src/external/bsd/bind/dist/lib/dns/byaddr.c
diff -u src/external/bsd/bind/dist/lib/dns/byaddr.c:1.1.1.2 src/external/bsd/bind/dist/lib/dns/byaddr.c:1.2
--- src/external/bsd/bind/dist/lib/dns/byaddr.c:1.1.1.2 Sat Oct 24 20:02:27 2009
+++ src/external/bsd/bind/dist/lib/dns/byaddr.c Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: byaddr.c,v 1.1.1.2 2009/10/25 00:02:27 christos Exp $ */
+/* $NetBSD: byaddr.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -190,7 +190,7 @@
} else
byaddr->event->result = levent->result;
isc_event_free(&event);
- isc_task_sendanddetach(&byaddr->task, (isc_event_t **)&byaddr->event);
+ isc_task_sendanddetach(&byaddr->task, (isc_event_t **)(void *)&byaddr->event);
}
static void
Index: src/external/bsd/bind/dist/lib/dns/request.c
diff -u src/external/bsd/bind/dist/lib/dns/request.c:1.1.1.2 src/external/bsd/bind/dist/lib/dns/request.c:1.2
--- src/external/bsd/bind/dist/lib/dns/request.c:1.1.1.2 Sat Oct 24 20:02:33 2009
+++ src/external/bsd/bind/dist/lib/dns/request.c Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: request.c,v 1.1.1.2 2009/10/25 00:02:33 christos Exp $ */
+/* $NetBSD: request.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */
/*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
@@ -1415,7 +1415,7 @@
task = request->event->ev_sender;
request->event->ev_sender = request;
request->event->result = result;
- isc_task_sendanddetach(&task, (isc_event_t **)&request->event);
+ isc_task_sendanddetach(&task, (isc_event_t **)(void *)&request->event);
}
static void
@@ -1432,7 +1432,7 @@
if (request->answer != NULL)
isc_buffer_free(&request->answer);
if (request->event != NULL)
- isc_event_free((isc_event_t **)&request->event);
+ isc_event_free((isc_event_t **)(void *)&request->event);
if (request->dispentry != NULL)
dns_dispatch_removeresponse(&request->dispentry, NULL);
if (request->dispatch != NULL)
Index: src/external/bsd/bind/dist/lib/dns/lookup.c
diff -u src/external/bsd/bind/dist/lib/dns/lookup.c:1.1.1.1 src/external/bsd/bind/dist/lib/dns/lookup.c:1.2
--- src/external/bsd/bind/dist/lib/dns/lookup.c:1.1.1.1 Sun Mar 22 11:01:07 2009
+++ src/external/bsd/bind/dist/lib/dns/lookup.c Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lookup.c,v 1.1.1.1 2009/03/22 15:01:07 christos Exp $ */
+/* $NetBSD: lookup.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
@@ -347,7 +347,7 @@
lookup->event->result = result;
lookup->event->ev_sender = lookup;
isc_task_sendanddetach(&lookup->task,
- (isc_event_t **)&lookup->event);
+ (isc_event_t **)(void *)&lookup->event);
dns_view_detach(&lookup->view);
}
Index: src/external/bsd/bind/dist/lib/dns/sdb.c
diff -u src/external/bsd/bind/dist/lib/dns/sdb.c:1.1.1.5 src/external/bsd/bind/dist/lib/dns/sdb.c:1.2
--- src/external/bsd/bind/dist/lib/dns/sdb.c:1.1.1.5 Thu Dec 2 09:23:24 2010
+++ src/external/bsd/bind/dist/lib/dns/sdb.c Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdb.c,v 1.1.1.5 2010/12/02 14:23:24 christos Exp $ */
+/* $NetBSD: sdb.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
@@ -672,7 +672,7 @@
return (ISC_R_NOMEMORY);
node->sdb = NULL;
- attach((dns_db_t *)sdb, (dns_db_t **)&node->sdb);
+ attach((dns_db_t *)sdb, (dns_db_t **)(void *)&node->sdb);
ISC_LIST_INIT(node->lists);
ISC_LIST_INIT(node->buffers);
ISC_LINK_INIT(node, link);
Index: src/external/bsd/bind/dist/lib/dns/validator.c
diff -u src/external/bsd/bind/dist/lib/dns/validator.c:1.1.1.6 src/external/bsd/bind/dist/lib/dns/validator.c:1.2
--- src/external/bsd/bind/dist/lib/dns/validator.c:1.1.1.6 Thu Dec 2 09:23:25 2010
+++ src/external/bsd/bind/dist/lib/dns/validator.c Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: validator.c,v 1.1.1.6 2010/12/02 14:23:25 christos Exp $ */
+/* $NetBSD: validator.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
@@ -214,7 +214,7 @@
val->event->ev_type = DNS_EVENT_VALIDATORDONE;
val->event->ev_action = val->action;
val->event->ev_arg = val->arg;
- isc_task_sendanddetach(&task, (isc_event_t **)&val->event);
+ isc_task_sendanddetach(&task, (isc_event_t **)(void *)&val->event);
}
static inline isc_boolean_t
