1930. [port] HPUX: ia64 support. [RT #15473]

1929.   [port]          FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM.

diff --git a/CHANGES b/CHANGES
index 11a339ccee08bc49b587a45073ef4b6732f82ffc..fbcbc870d5b63f025cd7ec92347297a606100998 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 
        --- 9.3.2b2 released ---
 
+1930.  [port]          HPUX: ia64 support. [RT #15473]
+
+1929.  [port]          FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM.
+
 1926.  [bug]           The Windows installer did not check for empty
                        passwords.  BINDinstall was being installed in
                        the wrong place. [RT #15483]

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 5c646196c929f5eaf821ab8b87660a18c5067ae5..52df6608685bf5010e7a669ce83a50d4c5a64702 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.157.2.13.2.28 2005/07/04 03:29:44 marka Exp $ */
+/* $Id: dig.c,v 1.157.2.13.2.29 2005/10/14 01:38:40 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -790,7 +790,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
                        break;
                case 'l': /* cl */
                        FULLCHECK("cl");
-                       noclass = !state;
+                       noclass = ISC_TF(!state);
                        break;
                case 'm': /* cmd */
                        FULLCHECK("cmd");
@@ -1026,7 +1026,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
                        break;
                case 't': /* ttlid */
                        FULLCHECK("ttlid");
-                       nottl = !state;
+                       nottl = ISC_TF(!state);
                        break;
                default:
                        goto invalid_option;

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 83bc1f7bb35b7967239580744a5c9c12aa817763..6129fedb6c64c471c4363d762f12bf1bec79aadc 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.221.2.19.2.30 2005/09/09 00:29:10 marka Exp $ */
+/* $Id: dighost.c,v 1.221.2.19.2.31 2005/10/14 01:38:40 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -2092,7 +2092,7 @@ send_udp(dig_query_t *query) {
  */
 static void
 connect_timeout(isc_task_t *task, isc_event_t *event) {
-       dig_lookup_t *l = NULL, *n;
+       dig_lookup_t *l = NULL;
        dig_query_t *query = NULL, *cq;
 
        UNUSED(task);
@@ -2128,7 +2128,7 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
                        debug("making new TCP request, %d tries left",
                              l->retries);
                        l->retries--;
-                       n = requeue_lookup(l, ISC_TRUE);
+                       requeue_lookup(l, ISC_TRUE);
                        cancel_lookup(l);
                        check_next_lookup(l);
                }

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index f03697ff36a945746c58385035a3c639afda8d21..93caf497e2661ffb348ef53dfbf64067e805787c 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.2.4.20 2005/03/17 03:58:24 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.139.2.2.4.21 2005/10/14 01:38:41 marka Exp $ */
 
 #include <config.h>
 
@@ -787,7 +787,6 @@ signname(dns_dbnode_t *node, dns_name_t *name) {
        dns_rdatasetiter_t *rdsiter;
        isc_boolean_t isdelegation = ISC_FALSE;
        isc_boolean_t hasds = ISC_FALSE;
-       isc_boolean_t atorigin;
        isc_boolean_t changed = ISC_FALSE;
        dns_diff_t del, add;
        char namestr[DNS_NAME_FORMATSIZE];
@@ -795,8 +794,6 @@ signname(dns_dbnode_t *node, dns_name_t *name) {
 
        dns_name_format(name, namestr, sizeof(namestr));
 
-       atorigin = dns_name_equal(name, gorigin);
-
        /*
         * Determine if this is a delegation point.
         */
@@ -1453,7 +1450,6 @@ warnifallksk(dns_db_t *db) {
        dns_dbnode_t *node = NULL;
        dns_rdataset_t rdataset;
        dns_rdata_t rdata = DNS_RDATA_INIT;
-       dst_key_t *pubkey;
        isc_result_t result;
        dns_rdata_key_t key;
        isc_boolean_t have_non_ksk = ISC_FALSE;
@@ -1474,7 +1470,6 @@ warnifallksk(dns_db_t *db) {
        result = dns_rdataset_first(&rdataset);
        check_result(result, "dns_rdataset_first");
        while (result == ISC_R_SUCCESS) {
-               pubkey = NULL;
                dns_rdata_reset(&rdata);
                dns_rdataset_current(&rdataset, &rdata);
                result = dns_rdata_tostruct(&rdata, &key, NULL);

diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 9fb2697a45d6f0e985fdc52c06dcd26b69c5aeef..e36d4ebcdf596b31992ca99da5ad67d76cd0a93e 100644 (file)
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.101.2.5.2.10 2004/04/02 06:08:17 marka Exp $ */
+/* $Id: xfrout.c,v 1.101.2.5.2.11 2005/10/14 01:38:42 marka Exp $ */
 
 #include <config.h>
 
@@ -868,7 +868,7 @@ xfrout_log1(ns_client_t *client, dns_name_t *zonename,
            const char *fmt, ...) ISC_FORMAT_PRINTF(5, 6);
 
 static void
-xfrout_log(xfrout_ctx_t *xfr, unsigned int level, const char *fmt, ...)
+xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...)
           ISC_FORMAT_PRINTF(3, 4);
 
 /**************************************************************************/
@@ -1710,7 +1710,7 @@ xfrout_log1(ns_client_t *client, dns_name_t *zonename,
  * Logging function for use when there is a xfrout_ctx_t.
  */
 static void
-xfrout_log(xfrout_ctx_t *xfr, unsigned int level, const char *fmt, ...) {
+xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...) {
        va_list ap;
        va_start(ap, fmt);
        xfrout_logv(xfr->client, xfr->qname, xfr->qclass, level, fmt, ap);

diff --git a/configure.in b/configure.in
index 1acfe2822496dd5a86e0d6bca7aa4c928afbdc03..8bb2a6c9889d5f6d6c622780717a8aff14735ea4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.294.2.23.2.49 $)
+AC_REVISION($Revision: 1.294.2.23.2.50 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -640,7 +640,11 @@ then
                *-freebsd*)
                        AC_CHECK_LIB(c_r, sigwait, AC_DEFINE(HAVE_SIGWAIT),)
                        case $host in
-                       *-freebsd5.3|*-freebsd5.3.*)
+                       *-freebsd5.[[012]]|*-freebsd5.[[012]].*);;
+                       *-freebsd5.[[3456789]]|*-freebsd5.[[3456789]].*)
+                               AC_DEFINE(NEED_PTHREAD_SCOPE_SYSTEM)
+                               ;;
+                       *-freebsd6.*)
                                AC_DEFINE(NEED_PTHREAD_SCOPE_SYSTEM)
                                ;;
                        esac
@@ -810,7 +814,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530"
+                       STD_CWARNINGS="+w1 +W 474,530,2193,2236"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"

diff --git a/lib/bind/configure b/lib/bind/configure
index 77fafa6536d542a019f292ed2286f4d7f5971262..95714405cfda4af507f408f8da4fe118a435a1eb 100644 (file)
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -6423,7 +6423,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530,2193"
+                       STD_CWARNINGS="+w1 +W 474,530,2193,2236"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 670d1187894589bda835d50bda92693a6facf8e6..50ffe82ab18b86c597ffd0ea38896e2af8c91493 100644 (file)
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.83.2.5.2.21 $)
+AC_REVISION($Revision: 1.83.2.5.2.22 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -533,7 +533,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530,2193"
+                       STD_CWARNINGS="+w1 +W 474,530,2193,2236"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"

diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c
index fafc0a6df29e49cb384994845f8f208c030bec95..16b607e010a6441d2e3c3b48cc3bbbc5571a6366 100644 (file)
--- a/lib/bind9/getaddresses.c
+++ b/lib/bind9/getaddresses.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddresses.c,v 1.13.126.6 2004/09/16 01:00:58 marka Exp $ */
+/* $Id: getaddresses.c,v 1.13.126.7 2005/10/14 01:38:47 marka Exp $ */
 
 #include <config.h>
 #include <string.h>
@@ -65,8 +65,8 @@ bind9_getaddresses(const char *hostname, in_port_t port,
        REQUIRE(addrcount != NULL);
        REQUIRE(addrsize > 0);
 
-       have_ipv4 = (isc_net_probeipv4() == ISC_R_SUCCESS);
-       have_ipv6 = (isc_net_probeipv6() == ISC_R_SUCCESS);
+       have_ipv4 = ISC_TF((isc_net_probeipv4() == ISC_R_SUCCESS));
+       have_ipv6 = ISC_TF((isc_net_probeipv6() == ISC_R_SUCCESS));
 
        /*
         * Try IPv4, then IPv6.  In order to handle the extended format

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 30e0d9b080fb2586fbff95f0915247a78ad29dbb..5f26c665fb16d2e4ce10c2d289a670828e04bc43 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.181.2.11.2.22 2005/03/17 03:58:29 marka Exp $ */
+/* $Id: adb.c,v 1.181.2.11.2.23 2005/10/14 01:38:47 marka Exp $ */
 
 /*
  * Implementation notes
@@ -1784,7 +1784,7 @@ shutdown_task(isc_task_t *task, isc_event_t *ev) {
 static isc_boolean_t
 check_expire_name(dns_adbname_t **namep, isc_stdtime_t now) {
        dns_adbname_t *name;
-       isc_result_t result = ISC_FALSE;
+       isc_boolean_t result = ISC_FALSE;
 
        INSIST(namep != NULL && DNS_ADBNAME_VALID(*namep));
        name = *namep;
@@ -3366,7 +3366,7 @@ dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, dns_name_t *zone,
  unlock:
        UNLOCK(&adb->entrylocks[bucket]);
 
-       return (ISC_R_SUCCESS);
+       return (result);
 }
 
 void

diff --git a/lib/dns/name.c b/lib/dns/name.c
index bebb15884317d27b4bfb43849ed0edf6dd11cae8..116a56a8186785da248a4dff73f8f3f814031367 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.127.2.7.2.13 2005/07/23 04:34:37 marka Exp $ */
+/* $Id: name.c,v 1.127.2.7.2.14 2005/10/14 01:38:48 marka Exp $ */
 
 #include <config.h>
 
@@ -945,9 +945,9 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
        unsigned char *ndata, *label;
        char *tdata;
        char c;
-       ft_state state, kind;
-       unsigned int value, count, tbcount, bitlength, maxlength;
-       unsigned int n1, n2, vlen, tlen, nrem, nused, digits, labels, tused;
+       ft_state state;
+       unsigned int value, count;
+       unsigned int n1, n2, tlen, nrem, nused, digits, labels, tused;
        isc_boolean_t done;
        unsigned char *offsets;
        dns_offsets_t odata;
@@ -985,15 +985,10 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
         */
        n1 = 0;
        n2 = 0;
-       vlen = 0;
        label = NULL;
        digits = 0;
        value = 0;
        count = 0;
-       tbcount = 0;
-       bitlength = 0;
-       maxlength = 0;
-       kind = ft_init;
 
        /*
         * Make 'name' empty in case of failure.
@@ -1051,7 +1046,6 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
                                state = ft_initialescape;
                                break;
                        }
-                       kind = ft_ordinary;
                        state = ft_ordinary;
                        if (nrem == 0)
                                return (ISC_R_NOSPACE);
@@ -1094,7 +1088,6 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
                                 */
                                return (DNS_R_BADLABELTYPE);
                        }
-                       kind = ft_ordinary;
                        state = ft_escape;
                        /* FALLTHROUGH */
                case ft_escape:

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index d2da6343f058f13bebe8969871f42889091944a4..f399dd17bcea50c0ff1859e8d91632cee7430527 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.168.2.11.2.21 2005/07/07 02:58:53 marka Exp $ */
+/* $Id: rbtdb.c,v 1.168.2.11.2.22 2005/10/14 01:38:48 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -2758,10 +2758,9 @@ find_coveringnsec(rbtdb_search_t *search, dns_dbnode_t **nodep,
        isc_result_t result;
        dns_fixedname_t fname, forigin;
        dns_name_t *name, *origin;
-       rbtdb_rdatatype_t matchtype, sigmatchtype, nsectype;
+       rbtdb_rdatatype_t matchtype, sigmatchtype;
 
        matchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_nsec, 0);
-       nsectype = RBTDB_RDATATYPE_VALUE(0, dns_rdatatype_nsec);
        sigmatchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig,
                                             dns_rdatatype_nsec);
        

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 8d1dbd7d4889482221aaaa4a25145fa3403fd0aa..6f803eb192f4eb0841292f20a656c27dc46ed6ce 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.18.4.55 2005/08/25 01:54:32 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.56 2005/10/14 01:38:48 marka Exp $ */
 
 #include <config.h>
 
@@ -1890,7 +1890,6 @@ fctx_getaddresses(fetchctx_t *fctx) {
        isc_boolean_t pruned, all_bad;
        dns_rdata_ns_t ns;
        isc_boolean_t need_alternate = ISC_FALSE;
-       isc_boolean_t unshared;
 
        FCTXTRACE("getaddresses");
 
@@ -1906,7 +1905,6 @@ fctx_getaddresses(fetchctx_t *fctx) {
        res = fctx->res;
        pruned = ISC_FALSE;
        stdoptions = 0;         /* Keep compiler happy. */
-       unshared = ISC_TF((fctx->options | DNS_FETCHOPT_UNSHARED) != 0);
 
        /*
         * Forwarders.
@@ -3483,7 +3481,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo,
        /*
         * Cache or validate each cacheable rdataset.
         */
-       fail = (fctx->res->options & DNS_RESOLVER_CHECKNAMESFAIL) != 0;
+       fail = ISC_TF((fctx->res->options & DNS_RESOLVER_CHECKNAMESFAIL) != 0);
        for (rdataset = ISC_LIST_HEAD(name->list);
             rdataset != NULL;
             rdataset = ISC_LIST_NEXT(rdataset, link)) {

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index d65d33e5edae4d41dde0a8cff41980860bd93ad5..17b5bcc583a58e446bd082fd335b59c2c7306b4c 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.5.8.19 2005/08/25 01:54:33 marka Exp $ */
+/* $Id: validator.c,v 1.91.2.5.8.20 2005/10/14 01:38:49 marka Exp $ */
 
 #include <config.h>
 
@@ -323,7 +323,6 @@ static void
 dsfetched2(isc_task_t *task, isc_event_t *event) {
        dns_fetchevent_t *devent;
        dns_validator_t *val;
-       dns_rdataset_t *rdataset;
        dns_name_t *tname;
        isc_boolean_t want_destroy;
        isc_result_t result;
@@ -333,7 +332,6 @@ dsfetched2(isc_task_t *task, isc_event_t *event) {
        INSIST(event->ev_type == DNS_EVENT_FETCHDONE);
        devent = (dns_fetchevent_t *)event;
        val = devent->ev_arg;
-       rdataset = &val->frdataset;
        eresult = devent->result;
 
        dns_resolver_destroyfetch(&val->fetch);
@@ -622,7 +620,7 @@ static void
 authvalidated(isc_task_t *task, isc_event_t *event) {
        dns_validatorevent_t *devent;
        dns_validator_t *val;
-       dns_rdataset_t *rdataset, *sigrdataset;
+       dns_rdataset_t *rdataset;
        isc_boolean_t want_destroy;
        isc_result_t result;
        isc_boolean_t exists, data;
@@ -632,7 +630,6 @@ authvalidated(isc_task_t *task, isc_event_t *event) {
 
        devent = (dns_validatorevent_t *)event;
        rdataset = devent->rdataset;
-       sigrdataset = devent->sigrdataset;
        val = devent->ev_arg;
        result = devent->result;
        dns_validator_destroy(&val->subvalidator);

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index aa4d054ca331b7a841e8de6422f4138b790343a9..8f2770bec6a2410ad87d25f493c20c39bd0de114 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.4.2.9 2004/10/13 22:28:42 marka Exp $ */
+/* $Id: xfrin.c,v 1.124.2.4.2.10 2005/10/14 01:38:50 marka Exp $ */
 
 #include <config.h>
 
@@ -232,7 +232,7 @@ xfrin_log1(int level, dns_name_t *zonename, dns_rdataclass_t rdclass,
      ISC_FORMAT_PRINTF(5, 6);
 
 static void
-xfrin_log(dns_xfrin_ctx_t *xfr, unsigned int level, const char *fmt, ...)
+xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...)
      ISC_FORMAT_PRINTF(3, 4);
 
 /**************************************************************************/
@@ -1391,7 +1391,7 @@ xfrin_log1(int level, dns_name_t *zonename, dns_rdataclass_t rdclass,
  */
 
 static void
-xfrin_log(dns_xfrin_ctx_t *xfr, unsigned int level, const char *fmt, ...)
+xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...)
 {
        va_list ap;
 

diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c
index 5a566a256a5b8ba039377e211979251e8ca58873..6d5b7ff82385f5f1445d24627dcb163ed05cd89d 100644 (file)
--- a/lib/isc/lfsr.c
+++ b/lib/isc/lfsr.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr.c,v 1.11.2.2.2.5 2005/06/09 23:54:30 marka Exp $ */
+/* $Id: lfsr.c,v 1.11.2.2.2.6 2005/10/14 01:38:50 marka Exp $ */
 
 #include <config.h>
 
@@ -56,9 +56,6 @@ isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits,
 static inline isc_uint32_t
 lfsr_generate(isc_lfsr_t *lfsr)
 {
-       unsigned int highbit;
-
-       highbit = 1 << (lfsr->bits - 1);
 
        /*
         * If the previous state is zero, we must fill it with something

diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 6842c1f3525864e5c529f8a58333ad561752a539..9f46630b1ecb98a81d60910534b297074cb31e54 100644 (file)
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.19.2.5.2.15 2004/11/10 22:22:49 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.19.2.5.2.16 2005/10/14 01:38:50 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@@ -896,7 +896,9 @@ internal_current(isc_interfaceiter_t *iter) {
  */
 static isc_result_t
 internal_next4(isc_interfaceiter_t *iter) {
+#ifdef ISC_PLATFORM_HAVESALEN
        struct ifreq *ifrp;
+#endif
 
        REQUIRE (iter->pos < (unsigned int) iter->ifc.ifc_len);
 
@@ -906,14 +908,14 @@ internal_next4(isc_interfaceiter_t *iter) {
        if (!iter->first)
                return (ISC_R_SUCCESS);
 #endif
+#ifdef ISC_PLATFORM_HAVESALEN
        ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos);
 
-#ifdef ISC_PLATFORM_HAVESALEN
        if (ifrp->ifr_addr.sa_len > sizeof(struct sockaddr))
                iter->pos += sizeof(ifrp->ifr_name) + ifrp->ifr_addr.sa_len;
        else
 #endif
-               iter->pos += sizeof(*ifrp);
+               iter->pos += sizeof(struct ifreq);
 
        if (iter->pos >= (unsigned int) iter->ifc.ifc_len)
                return (ISC_R_NOMORE);
@@ -924,21 +926,23 @@ internal_next4(isc_interfaceiter_t *iter) {
 #if defined(SIOCGLIFCONF) && defined(SIOCGLIFADDR)
 static isc_result_t
 internal_next6(isc_interfaceiter_t *iter) {
+#ifdef ISC_PLATFORM_HAVESALEN
        struct LIFREQ *ifrp;
+#endif
        
        if (iter->result6 != ISC_R_SUCCESS && iter->result6 != ISC_R_IGNORE)
                return (iter->result6);
 
        REQUIRE(iter->pos6 < (unsigned int) iter->lifc.lifc_len);
 
+#ifdef ISC_PLATFORM_HAVESALEN
        ifrp = (struct LIFREQ *)((char *) iter->lifc.lifc_req + iter->pos6);
 
-#ifdef ISC_PLATFORM_HAVESALEN
        if (ifrp->lifr_addr.sa_len > sizeof(struct sockaddr))
                iter->pos6 += sizeof(ifrp->lifr_name) + ifrp->lifr_addr.sa_len;
        else
 #endif
-               iter->pos6 += sizeof(*ifrp);
+               iter->pos6 += sizeof(struct LIFREQ);
 
        if (iter->pos6 >= (unsigned int) iter->lifc.lifc_len)
                return (ISC_R_NOMORE);

diff --git a/lib/isc/unix/os.c b/lib/isc/unix/os.c
index 0838e12770a06ccddf35b6239429b8ce23cbcac7..4073c46c824ce2cf60d5c9b94e3c499e11df11cd 100644 (file)
--- a/lib/isc/unix/os.c
+++ b/lib/isc/unix/os.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.11.12.4 2004/05/18 01:39:20 marka Exp $ */
+/* $Id: os.c,v 1.11.12.5 2005/10/14 01:38:51 marka Exp $ */
 
 #include <config.h>
 
@@ -26,6 +26,7 @@
 
 #include <unistd.h>
 
+#ifndef __hpux
 static inline long
 sysconf_ncpus(void) {
 #if defined(_SC_NPROCESSORS_ONLN)
@@ -36,6 +37,7 @@ sysconf_ncpus(void) {
        return (0);
 #endif
 }
+#endif
 #endif /* HAVE_SYSCONF */
 
 

diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index 9bf3f187d97abd0914534e8c3fbb904e7edbff15..15522284e5d5867e4d62cef00c59cb5405dd22df 100644 (file)
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.2.4.6 2005/06/08 02:08:31 marka Exp $ */
+/* $Id: print.c,v 1.2.4.7 2005/10/14 01:38:51 marka Exp $ */
 
 #include <config.h>
 
@@ -72,7 +72,6 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
        int left;
        int plus;
        int space;
-       int neg;
        long long tmpi;
        unsigned long long tmpui;
        unsigned long width;
@@ -112,7 +111,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                /*
                 * Reset flags.
                 */
-               dot = neg = space = plus = left = zero = alt = h = l = q = 0;
+               dot = space = plus = left = zero = alt = h = l = q = 0;
                width = precision = 0;
                head = "";
                length = pad = zeropad = 0;