mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
1929.   [port]          FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM.
This commit is contained in:
Mark Andrews
2005-10-14 01:18:47 +00:00
parent 16ee4fe11b
commit 216030f284
13 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
configure vendored
View File

@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# #
# $Id: configure,v 1.383 2005/10/11 22:34:09 marka Exp $ # $Id: configure,v 1.384 2005/10/14 01:18:45 marka Exp $
# #
# Portions Copyright (C) 1996-2001 Nominum, Inc. # Portions Copyright (C) 1996-2001 Nominum, Inc.
# #
@@ -29,7 +29,7 @@
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# From configure.in Revision: 1.394 . # From configure.in Revision: 1.395 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59. # Generated by GNU Autoconf 2.59.
# #
@@ -6578,7 +6578,14 @@ _ACEOF
fi fi
case $host in case $host in
*-freebsd5.3|*-freebsd5.3.*) *-freebsd5.[012]|*-freebsd5.[012].*);;
*-freebsd5.[3456789]|*-freebsd5.[3456789].*)
cat >>confdefs.h <<\_ACEOF
#define NEED_PTHREAD_SCOPE_SYSTEM 1
_ACEOF
;;
*-freebsd6.*)
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define NEED_PTHREAD_SCOPE_SYSTEM 1 #define NEED_PTHREAD_SCOPE_SYSTEM 1
_ACEOF _ACEOF
@@ -7227,7 +7234,7 @@ else
;; ;;
*) *)
# Turn off the pointlessly noisy warnings. # Turn off the pointlessly noisy warnings.
STD_CWARNINGS="+w1 +W 474,530" STD_CWARNINGS="+w1 +W 474,530,2193,2236"
;; ;;
esac esac
CCOPT="$CCOPT -Ae -z" CCOPT="$CCOPT -Ae -z"
@@ -8161,7 +8168,7 @@ ia64-*-hpux*)
;; ;;
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 8164 "configure"' > conftest.$ac_ext echo '#line 8171 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@@ -9158,7 +9165,7 @@ fi
# Provide some information about the compiler. # Provide some information about the compiler.
echo "$as_me:9161:" \ echo "$as_me:9168:" \
"checking for Fortran 77 compiler version" >&5 "checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2` ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -10219,11 +10226,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:10222: $lt_compile\"" >&5) (eval echo "\"\$as_me:10229: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:10226: \$? = $ac_status" >&5 echo "$as_me:10233: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
@@ -10462,11 +10469,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:10465: $lt_compile\"" >&5) (eval echo "\"\$as_me:10472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:10469: \$? = $ac_status" >&5 echo "$as_me:10476: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
@@ -10522,11 +10529,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:10525: $lt_compile\"" >&5) (eval echo "\"\$as_me:10532: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:10529: \$? = $ac_status" >&5 echo "$as_me:10536: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@@ -12707,7 +12714,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12710 "configure" #line 12717 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@@ -12805,7 +12812,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12808 "configure" #line 12815 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@@ -15002,11 +15009,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15005: $lt_compile\"" >&5) (eval echo "\"\$as_me:15012: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:15009: \$? = $ac_status" >&5 echo "$as_me:15016: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
@@ -15062,11 +15069,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15065: $lt_compile\"" >&5) (eval echo "\"\$as_me:15072: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:15069: \$? = $ac_status" >&5 echo "$as_me:15076: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@@ -16423,7 +16430,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 16426 "configure" #line 16433 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@@ -16521,7 +16528,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 16524 "configure" #line 16531 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@@ -17358,11 +17365,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17361: $lt_compile\"" >&5) (eval echo "\"\$as_me:17368: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:17365: \$? = $ac_status" >&5 echo "$as_me:17372: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
@@ -17418,11 +17425,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17421: $lt_compile\"" >&5) (eval echo "\"\$as_me:17428: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:17425: \$? = $ac_status" >&5 echo "$as_me:17432: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@@ -19457,11 +19464,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:19460: $lt_compile\"" >&5) (eval echo "\"\$as_me:19467: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:19464: \$? = $ac_status" >&5 echo "$as_me:19471: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
@@ -19700,11 +19707,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:19703: $lt_compile\"" >&5) (eval echo "\"\$as_me:19710: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:19707: \$? = $ac_status" >&5 echo "$as_me:19714: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
@@ -19760,11 +19767,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:19763: $lt_compile\"" >&5) (eval echo "\"\$as_me:19770: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:19767: \$? = $ac_status" >&5 echo "$as_me:19774: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@@ -21945,7 +21952,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 21948 "configure" #line 21955 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@@ -22043,7 +22050,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 22046 "configure" #line 22053 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H

2
lib/bind/configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.113 . # From configure.in Revision: 1.114 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59. # Generated by GNU Autoconf 2.59.
# #

6
lib/bind9/getaddresses.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: getaddresses.c,v 1.19 2005/04/29 00:22:42 marka Exp $ */ /* $Id: getaddresses.c,v 1.20 2005/10/14 01:14:08 marka Exp $ */
/*! \file */ /*! \file */
@@ -67,8 +67,8 @@ bind9_getaddresses(const char *hostname, in_port_t port,
REQUIRE(addrcount != NULL); REQUIRE(addrcount != NULL);
REQUIRE(addrsize > 0); REQUIRE(addrsize > 0);
have_ipv4 = (isc_net_probeipv4() == ISC_R_SUCCESS); have_ipv4 = ISC_TF((isc_net_probeipv4() == ISC_R_SUCCESS));
have_ipv6 = (isc_net_probeipv6() == ISC_R_SUCCESS); have_ipv6 = ISC_TF((isc_net_probeipv6() == ISC_R_SUCCESS));
/* /*
* Try IPv4, then IPv6. In order to handle the extended format * Try IPv4, then IPv6. In order to handle the extended format

6
lib/dns/adb.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: adb.c,v 1.223 2005/07/12 01:00:14 marka Exp $ */ /* $Id: adb.c,v 1.224 2005/10/14 01:14:08 marka Exp $ */
/*! \file /*! \file
* *
@@ -1790,7 +1790,7 @@ shutdown_task(isc_task_t *task, isc_event_t *ev) {
static isc_boolean_t static isc_boolean_t
check_expire_name(dns_adbname_t **namep, isc_stdtime_t now) { check_expire_name(dns_adbname_t **namep, isc_stdtime_t now) {
dns_adbname_t *name; dns_adbname_t *name;
isc_result_t result = ISC_FALSE; isc_boolean_t result = ISC_FALSE;
INSIST(namep != NULL && DNS_ADBNAME_VALID(*namep)); INSIST(namep != NULL && DNS_ADBNAME_VALID(*namep));
name = *namep; name = *namep;
@@ -3377,7 +3377,7 @@ dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, dns_name_t *qname,
unlock: unlock:
UNLOCK(&adb->entrylocks[bucket]); UNLOCK(&adb->entrylocks[bucket]);
return (ISC_R_SUCCESS); return (result);
} }
void void

15
lib/dns/name.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: name.c,v 1.155 2005/09/18 07:16:21 marka Exp $ */ /* $Id: name.c,v 1.156 2005/10/14 01:14:08 marka Exp $ */
/*! \file */ /*! \file */
@@ -1027,9 +1027,9 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
unsigned char *ndata, *label; unsigned char *ndata, *label;
char *tdata; char *tdata;
char c; char c;
ft_state state, kind; ft_state state;
unsigned int value, count, tbcount, bitlength, maxlength; unsigned int value, count;
unsigned int n1, n2, vlen, tlen, nrem, nused, digits, labels, tused; unsigned int n1, n2, tlen, nrem, nused, digits, labels, tused;
isc_boolean_t done; isc_boolean_t done;
unsigned char *offsets; unsigned char *offsets;
dns_offsets_t odata; dns_offsets_t odata;
@@ -1067,15 +1067,10 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
*/ */
n1 = 0; n1 = 0;
n2 = 0; n2 = 0;
vlen = 0;
label = NULL; label = NULL;
digits = 0; digits = 0;
value = 0; value = 0;
count = 0; count = 0;
tbcount = 0;
bitlength = 0;
maxlength = 0;
kind = ft_init;
/* /*
* Make 'name' empty in case of failure. * Make 'name' empty in case of failure.
@@ -1133,7 +1128,6 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
state = ft_initialescape; state = ft_initialescape;
break; break;
} }
kind = ft_ordinary;
state = ft_ordinary; state = ft_ordinary;
if (nrem == 0) if (nrem == 0)
return (ISC_R_NOSPACE); return (ISC_R_NOSPACE);
@@ -1176,7 +1170,6 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
*/ */
return (DNS_R_BADLABELTYPE); return (DNS_R_BADLABELTYPE);
} }
kind = ft_ordinary;
state = ft_escape; state = ft_escape;
/* FALLTHROUGH */ /* FALLTHROUGH */
case ft_escape: case ft_escape:

5
lib/dns/rbtdb.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rbtdb.c,v 1.222 2005/10/13 01:58:31 marka Exp $ */ /* $Id: rbtdb.c,v 1.223 2005/10/14 01:14:08 marka Exp $ */
/*! \file */ /*! \file */
@@ -3155,12 +3155,11 @@ find_coveringnsec(rbtdb_search_t *search, dns_dbnode_t **nodep,
isc_result_t result; isc_result_t result;
dns_fixedname_t fname, forigin; dns_fixedname_t fname, forigin;
dns_name_t *name, *origin; dns_name_t *name, *origin;
rbtdb_rdatatype_t matchtype, sigmatchtype, nsectype; rbtdb_rdatatype_t matchtype, sigmatchtype;
nodelock_t *lock; nodelock_t *lock;
isc_rwlocktype_t locktype; isc_rwlocktype_t locktype;
matchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_nsec, 0); matchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_nsec, 0);
nsectype = RBTDB_RDATATYPE_VALUE(0, dns_rdatatype_nsec);
sigmatchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, sigmatchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig,
dns_rdatatype_nsec); dns_rdatatype_nsec);

6
lib/dns/resolver.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: resolver.c,v 1.317 2005/09/18 07:04:41 marka Exp $ */ /* $Id: resolver.c,v 1.318 2005/10/14 01:14:09 marka Exp $ */
/*! \file */ /*! \file */
@@ -1935,7 +1935,6 @@ fctx_getaddresses(fetchctx_t *fctx) {
isc_boolean_t all_bad; isc_boolean_t all_bad;
dns_rdata_ns_t ns; dns_rdata_ns_t ns;
isc_boolean_t need_alternate = ISC_FALSE; isc_boolean_t need_alternate = ISC_FALSE;
isc_boolean_t unshared;
FCTXTRACE("getaddresses"); FCTXTRACE("getaddresses");
@@ -1950,7 +1949,6 @@ fctx_getaddresses(fetchctx_t *fctx) {
res = fctx->res; res = fctx->res;
stdoptions = 0; /* Keep compiler happy. */ stdoptions = 0; /* Keep compiler happy. */
unshared = ISC_TF((fctx->options | DNS_FETCHOPT_UNSHARED) != 0);
/* /*
* Forwarders. * Forwarders.
@@ -3527,7 +3525,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo,
/* /*
* Cache or validate each cacheable rdataset. * 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); for (rdataset = ISC_LIST_HEAD(name->list);
rdataset != NULL; rdataset != NULL;
rdataset = ISC_LIST_NEXT(rdataset, link)) { rdataset = ISC_LIST_NEXT(rdataset, link)) {

7
lib/dns/validator.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: validator.c,v 1.132 2005/09/05 02:54:37 marka Exp $ */ /* $Id: validator.c,v 1.133 2005/10/14 01:14:09 marka Exp $ */
/*! \file */ /*! \file */
@@ -325,7 +325,6 @@ static void
dsfetched2(isc_task_t *task, isc_event_t *event) { dsfetched2(isc_task_t *task, isc_event_t *event) {
dns_fetchevent_t *devent; dns_fetchevent_t *devent;
dns_validator_t *val; dns_validator_t *val;
dns_rdataset_t *rdataset;
dns_name_t *tname; dns_name_t *tname;
isc_boolean_t want_destroy; isc_boolean_t want_destroy;
isc_result_t result; isc_result_t result;
@@ -335,7 +334,6 @@ dsfetched2(isc_task_t *task, isc_event_t *event) {
INSIST(event->ev_type == DNS_EVENT_FETCHDONE); INSIST(event->ev_type == DNS_EVENT_FETCHDONE);
devent = (dns_fetchevent_t *)event; devent = (dns_fetchevent_t *)event;
val = devent->ev_arg; val = devent->ev_arg;
rdataset = &val->frdataset;
eresult = devent->result; eresult = devent->result;
dns_resolver_destroyfetch(&val->fetch); dns_resolver_destroyfetch(&val->fetch);
@@ -624,7 +622,7 @@ static void
authvalidated(isc_task_t *task, isc_event_t *event) { authvalidated(isc_task_t *task, isc_event_t *event) {
dns_validatorevent_t *devent; dns_validatorevent_t *devent;
dns_validator_t *val; dns_validator_t *val;
dns_rdataset_t *rdataset, *sigrdataset; dns_rdataset_t *rdataset;
isc_boolean_t want_destroy; isc_boolean_t want_destroy;
isc_result_t result; isc_result_t result;
isc_boolean_t exists, data; isc_boolean_t exists, data;
@@ -634,7 +632,6 @@ authvalidated(isc_task_t *task, isc_event_t *event) {
devent = (dns_validatorevent_t *)event; devent = (dns_validatorevent_t *)event;
rdataset = devent->rdataset; rdataset = devent->rdataset;
sigrdataset = devent->sigrdataset;
val = devent->ev_arg; val = devent->ev_arg;
result = devent->result; result = devent->result;
dns_validator_destroy(&val->subvalidator); dns_validator_destroy(&val->subvalidator);

6
lib/dns/xfrin.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: xfrin.c,v 1.140 2005/04/29 00:22:53 marka Exp $ */ /* $Id: xfrin.c,v 1.141 2005/10/14 01:14:09 marka Exp $ */
/*! \file */ /*! \file */
@@ -234,7 +234,7 @@ xfrin_log1(int level, dns_name_t *zonename, dns_rdataclass_t rdclass,
ISC_FORMAT_PRINTF(5, 6); ISC_FORMAT_PRINTF(5, 6);
static void 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); ISC_FORMAT_PRINTF(3, 4);
/**************************************************************************/ /**************************************************************************/
@@ -1393,7 +1393,7 @@ xfrin_log1(int level, dns_name_t *zonename, dns_rdataclass_t rdclass,
*/ */
static void 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; va_list ap;

5
lib/isc/lfsr.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: lfsr.c,v 1.17 2005/06/08 02:06:59 marka Exp $ */ /* $Id: lfsr.c,v 1.18 2005/10/14 01:14:10 marka Exp $ */
/*! \file */ /*! \file */
@@ -58,9 +58,6 @@ isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits,
static inline isc_uint32_t static inline isc_uint32_t
lfsr_generate(isc_lfsr_t *lfsr) 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 * If the previous state is zero, we must fill it with something

14
lib/isc/unix/ifiter_ioctl.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: ifiter_ioctl.c,v 1.52 2005/04/29 00:23:51 marka Exp $ */ /* $Id: ifiter_ioctl.c,v 1.53 2005/10/14 01:14:10 marka Exp $ */
/*! \file /*! \file
* \brief * \brief
@@ -897,7 +897,9 @@ internal_current(isc_interfaceiter_t *iter) {
*/ */
static isc_result_t static isc_result_t
internal_next4(isc_interfaceiter_t *iter) { internal_next4(isc_interfaceiter_t *iter) {
#ifdef ISC_PLATFORM_HAVESALEN
struct ifreq *ifrp; struct ifreq *ifrp;
#endif
REQUIRE (iter->pos < (unsigned int) iter->ifc.ifc_len); REQUIRE (iter->pos < (unsigned int) iter->ifc.ifc_len);
@@ -907,14 +909,14 @@ internal_next4(isc_interfaceiter_t *iter) {
if (!iter->first) if (!iter->first)
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
#endif #endif
#ifdef ISC_PLATFORM_HAVESALEN
ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos); ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos);
#ifdef ISC_PLATFORM_HAVESALEN
if (ifrp->ifr_addr.sa_len > sizeof(struct sockaddr)) if (ifrp->ifr_addr.sa_len > sizeof(struct sockaddr))
iter->pos += sizeof(ifrp->ifr_name) + ifrp->ifr_addr.sa_len; iter->pos += sizeof(ifrp->ifr_name) + ifrp->ifr_addr.sa_len;
else else
#endif #endif
iter->pos += sizeof(*ifrp); iter->pos += sizeof(struct ifreq);
if (iter->pos >= (unsigned int) iter->ifc.ifc_len) if (iter->pos >= (unsigned int) iter->ifc.ifc_len)
return (ISC_R_NOMORE); return (ISC_R_NOMORE);
@@ -925,21 +927,23 @@ internal_next4(isc_interfaceiter_t *iter) {
#if defined(SIOCGLIFCONF) && defined(SIOCGLIFADDR) #if defined(SIOCGLIFCONF) && defined(SIOCGLIFADDR)
static isc_result_t static isc_result_t
internal_next6(isc_interfaceiter_t *iter) { internal_next6(isc_interfaceiter_t *iter) {
#ifdef ISC_PLATFORM_HAVESALEN
struct LIFREQ *ifrp; struct LIFREQ *ifrp;
#endif
if (iter->result6 != ISC_R_SUCCESS && iter->result6 != ISC_R_IGNORE) if (iter->result6 != ISC_R_SUCCESS && iter->result6 != ISC_R_IGNORE)
return (iter->result6); return (iter->result6);
REQUIRE(iter->pos6 < (unsigned int) iter->lifc.lifc_len); REQUIRE(iter->pos6 < (unsigned int) iter->lifc.lifc_len);
#ifdef ISC_PLATFORM_HAVESALEN
ifrp = (struct LIFREQ *)((char *) iter->lifc.lifc_req + iter->pos6); ifrp = (struct LIFREQ *)((char *) iter->lifc.lifc_req + iter->pos6);
#ifdef ISC_PLATFORM_HAVESALEN
if (ifrp->lifr_addr.sa_len > sizeof(struct sockaddr)) if (ifrp->lifr_addr.sa_len > sizeof(struct sockaddr))
iter->pos6 += sizeof(ifrp->lifr_name) + ifrp->lifr_addr.sa_len; iter->pos6 += sizeof(ifrp->lifr_name) + ifrp->lifr_addr.sa_len;
else else
#endif #endif
iter->pos6 += sizeof(*ifrp); iter->pos6 += sizeof(struct LIFREQ);
if (iter->pos6 >= (unsigned int) iter->lifc.lifc_len) if (iter->pos6 >= (unsigned int) iter->lifc.lifc_len)
return (ISC_R_NOMORE); return (ISC_R_NOMORE);

4
lib/isc/unix/os.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: os.c,v 1.14 2004/05/12 23:01:36 explorer Exp $ */ /* $Id: os.c,v 1.15 2005/10/14 01:14:10 marka Exp $ */
#include <config.h> #include <config.h>
@@ -26,6 +26,7 @@
#include <unistd.h> #include <unistd.h>
#ifndef __hpux
static inline long static inline long
sysconf_ncpus(void) { sysconf_ncpus(void) {
#if defined(_SC_NPROCESSORS_ONLN) #if defined(_SC_NPROCESSORS_ONLN)
@@ -36,6 +37,7 @@ sysconf_ncpus(void) {
return (0); return (0);
#endif #endif
} }
#endif
#endif /* HAVE_SYSCONF */ #endif /* HAVE_SYSCONF */

5
lib/lwres/print.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: print.c,v 1.7 2005/06/08 02:07:02 marka Exp $ */ /* $Id: print.c,v 1.8 2005/10/14 01:14:10 marka Exp $ */
#include <config.h> #include <config.h>
@@ -72,7 +72,6 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
int left; int left;
int plus; int plus;
int space; int space;
int neg;
long long tmpi; long long tmpi;
unsigned long long tmpui; unsigned long long tmpui;
unsigned long width; unsigned long width;
@@ -112,7 +111,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
/* /*
* Reset flags. * 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; width = precision = 0;
head = ""; head = "";
length = pad = zeropad = 0; length = pad = zeropad = 0;