suppress compiler warnings [RT #20203]

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 4e97857b3aa486ceb6327cf6e6099521f5351554..934694f618ad157e7b6a8497c7bf3598bd63101a 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.151 2009/09/01 23:47:44 tbox Exp $ */
+/* $Id: mem.c,v 1.152 2009/09/02 04:25:19 jinmei Exp $ */
 
 /*! \file */
 
@@ -323,8 +323,10 @@ static struct isc__memmethods {
        /*%
         * The following are defined just for avoiding unused static functions.
         */
+#ifndef BIND9
        void *createx, *create, *create2, *ondestroy, *stats,
                *setquota, *getquota, *setname, *getname, *gettag;
+#endif
 } memmethods = {
        {
                isc__mem_attach,
@@ -341,11 +343,15 @@ static struct isc__memmethods {
                isc__mem_waterack,
                isc__mem_inuse,
                isc__mempool_create
-       },
-       isc__mem_createx, isc__mem_create, isc__mem_create2,
-       isc__mem_ondestroy, isc__mem_stats,
-       isc__mem_setquota, isc__mem_getquota, isc__mem_setname,
-       isc__mem_getname, isc__mem_gettag
+       }
+#ifndef BIND9
+       ,
+       (void *)isc__mem_createx, (void *)isc__mem_create,
+       (void *)isc__mem_create2, (void *)isc__mem_ondestroy,
+       (void *)isc__mem_stats, (void *)isc__mem_setquota,
+       (void *)isc__mem_getquota, (void *)isc__mem_setname,
+       (void *)isc__mem_getname, (void *)isc__mem_gettag
+#endif
 };
 
 static struct isc__mempoolmethods {
@@ -354,7 +360,9 @@ static struct isc__mempoolmethods {
        /*%
         * The following are defined just for avoiding unused static functions.
         */
+#ifndef BIND9
        void *getfreemax, *getfreecount, *getmaxalloc, *getfillcount;
+#endif
 } mempoolmethods = {
        {
                isc__mempool_destroy,
@@ -366,9 +374,12 @@ static struct isc__mempoolmethods {
                isc__mempool_setname,
                isc__mempool_associatelock,
                isc__mempool_setfillcount
-       },
-       isc__mempool_getfreemax, isc__mempool_getfreecount,
-       isc__mempool_getmaxalloc, isc__mempool_getfillcount
+       }
+#ifndef BIND9
+       ,
+       (void *)isc__mempool_getfreemax, (void *)isc__mempool_getfreecount,
+       (void *)isc__mempool_getmaxalloc, (void *)isc__mempool_getfillcount
+#endif
 };
 
 /*!

diff --git a/lib/isc/task.c b/lib/isc/task.c
index 27b1a508f9d1c1ab7f62c392580f558f90ef3a06..839900771a1c002031117a31efa5eeecf8b74990 100644 (file)
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.108 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: task.c,v 1.109 2009/09/02 04:25:19 jinmei Exp $ */
 
 /*! \file
  * \author Principal Author: Bob Halley
@@ -228,9 +228,11 @@ static struct isc__taskmethods {
        /*%
         * The following are defined just for avoiding unused static functions.
         */
+#ifndef BIND9
        void *purgeevent, *unsendrange,
                *getname, *gettag, *getcurrenttime, *beginexclusive,
                *endexclusive;
+#endif
 } taskmethods = {
        {
                isc__task_attach,
@@ -244,11 +246,14 @@ static struct isc__taskmethods {
                isc__task_setname,
                isc__task_purge,
                isc__task_purgerange
-       },
-       isc__task_purgeevent, isc__task_unsendrange,
-       isc__task_getname, isc__task_gettag,
-       isc__task_getcurrenttime, isc__task_beginexclusive,
-       isc__task_endexclusive
+       }
+#ifndef BIND9
+       ,
+       (void *)isc__task_purgeevent, (void *)isc__task_unsendrange,
+       (void *)isc__task_getname, (void *)isc__task_gettag,
+       (void *)isc__task_getcurrenttime, (void *)isc__task_beginexclusive,
+       (void *)isc__task_endexclusive
+#endif
 };
 
 static isc_taskmgrmethods_t taskmgrmethods = {

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index d5352cddb8be04f2f7d1a29f7f59fc4753addc2c..ef6996d8a863a994d0ba450bc2f2059f40f6f41b 100644 (file)
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.92 2009/09/01 23:47:44 tbox Exp $ */
+/* $Id: timer.c,v 1.93 2009/09/02 04:25:19 jinmei Exp $ */
 
 /*! \file */
 
@@ -154,15 +154,20 @@ static struct isc__timermethods {
        /*%
         * The following are defined just for avoiding unused static functions.
         */
+#ifndef BIND9
        void *gettype;
+#endif
 } timermethods = {
        {
                isc__timer_attach,
                isc__timer_detach,
                isc__timer_reset,
                isc__timer_touch
-       },
-       isc__timer_gettype
+       }
+#ifndef BIND9
+       ,
+       (void *)isc__timer_gettype
+#endif
 };
 
 static struct isc__timermgrmethods {
@@ -172,8 +177,11 @@ static struct isc__timermgrmethods {
        {
                isc__timermgr_destroy,
                isc__timer_create
-       },
-       isc__timermgr_poke
+       }
+#ifdef BIND9
+       ,
+       (void *)isc__timermgr_poke
+#endif
 };
 
 #ifdef USE_SHARED_MANAGER

diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index 10b99f05f9dee1806ec5481a8db0ec8d1fe37a43..ef4d48d0afbfc9bb7a66512e7389ad54228bbbc0 100644 (file)
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.c,v 1.61 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: app.c,v 1.62 2009/09/02 04:25:19 jinmei Exp $ */
 
 /*! \file */
 
@@ -156,8 +156,10 @@ static struct {
        /*%
         * The following are defined just for avoiding unused static functions.
         */
+#ifndef BIND9
        void *run, *shutdown, *start, *onrun, *reload, *finish,
                *block, *unblock;
+#endif
 } appmethods = {
        {
                isc__appctx_destroy,
@@ -169,10 +171,14 @@ static struct {
                isc__appctx_settaskmgr,
                isc__appctx_setsocketmgr,
                isc__appctx_settimermgr
-       },
-       isc__app_run, isc__app_shutdown,
-       isc__app_start, isc__app_onrun, isc__app_reload, isc__app_finish,
-       isc__app_block, isc__app_unblock
+       }
+#ifndef BIND9
+       ,
+       (void *)isc__app_run, (void *)isc__app_shutdown,
+       (void *)isc__app_start, (void *)isc__app_onrun, (void *)isc__app_reload,
+       (void *)isc__app_finish, (void *)isc__app_block,
+       (void *)isc__app_unblock
+#endif
 };
 
 #ifdef HAVE_LINUXTHREADS

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index db79d18edade2695c9d18d22e195b83478172f68..ccd495a856a17e52e5f643532781144cad485851 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.322 2009/09/01 23:47:45 tbox Exp $ */
+/* $Id: socket.c,v 1.323 2009/09/02 04:25:19 jinmei Exp $ */
 
 /*! \file */
 
@@ -541,8 +541,10 @@ static struct {
        /*%
         * The following are defined just for avoiding unused static functions.
         */
+#ifndef BIND9
        void *recvv, *send, *sendv, *sendto2, *cleanunix, *permunix, *filter,
                *listen, *accept, *getpeername, *isbound;
+#endif
 } socketmethods = {
        {
                isc__socket_attach,
@@ -555,11 +557,16 @@ static struct {
                isc__socket_getsockname,
                isc__socket_gettype,
                isc__socket_ipv6only
-       },
-       isc__socket_recvv, isc__socket_send, isc__socket_sendv,
-       isc__socket_sendto2, isc__socket_cleanunix, isc__socket_permunix,
-       isc__socket_filter, isc__socket_listen, isc__socket_accept,
-       isc__socket_getpeername, isc__socket_isbound
+       }
+#ifndef BIND9
+       ,
+       (void *)isc__socket_recvv, (void *)isc__socket_send,
+       (void *)isc__socket_sendv, (void *)isc__socket_sendto2,
+       (void *)isc__socket_cleanunix, (void *)isc__socket_permunix,
+       (void *)isc__socket_filter, (void *)isc__socket_listen,
+       (void *)isc__socket_accept, (void *)isc__socket_getpeername,
+       (void *)isc__socket_isbound
+#endif
 };
 
 static isc_socketmgrmethods_t socketmgrmethods = {