update copyright notice

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index a31ebb502d1c56cf6dbf46ef2fd336beae43efb3..3672947037d438c223d55157bf0d2cefbb9efa48 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.236 2009/09/25 14:30:10 each Exp $ */
+/* $Id: dnssec-signzone.c,v 1.237 2009/09/25 23:48:10 tbox Exp $ */
 
 /*! \file */
 
@@ -3045,7 +3045,7 @@ set_nsec3params(isc_boolean_t update_chain, isc_boolean_t set_salt,
        dns_rdataset_init(&rdataset);
 
        orig_saltlen = sizeof(orig_salt);
-       result = dns_db_getnsec3parameters(gdb, ver, &orig_hash, NULL, 
+       result = dns_db_getnsec3parameters(gdb, ver, &orig_hash, NULL,
                                           &orig_iter, orig_salt,
                                           &orig_saltlen);
        if (result != ISC_R_SUCCESS)
@@ -3077,7 +3077,7 @@ set_nsec3params(isc_boolean_t update_chain, isc_boolean_t set_salt,
         */
 
        dns_fixedname_init(&fname);
-        hashname = dns_fixedname_name(&fname);
+       hashname = dns_fixedname_name(&fname);
        result = dns_nsec3_hashname(&fname, NULL, NULL,
                                    gorigin, gorigin, dns_hash_sha1,
                                    orig_iter, orig_salt, orig_saltlen);
@@ -3090,7 +3090,7 @@ set_nsec3params(isc_boolean_t update_chain, isc_boolean_t set_salt,
        result = dns_db_findrdataset(gdb, node, ver, dns_rdatatype_nsec3,
                                     0, 0, &rdataset, NULL);
        if (result != ISC_R_SUCCESS)
-                goto cleanup;
+               goto cleanup;
 
        result = dns_rdataset_first(&rdataset);
        check_result(result, "dns_rdataset_first");
@@ -3111,11 +3111,11 @@ set_nsec3params(isc_boolean_t update_chain, isc_boolean_t set_salt,
        dns_rdata_freestruct(&nsec3);
 
  cleanup:
-        if (dns_rdataset_isassociated(&rdataset))
-                dns_rdataset_disassociate(&rdataset);
-        if (node != NULL)
-                dns_db_detachnode(gdb, &node);
-        dns_db_closeversion(gdb, &ver, ISC_FALSE);
+       if (dns_rdataset_isassociated(&rdataset))
+               dns_rdataset_disassociate(&rdataset);
+       if (node != NULL)
+               dns_db_detachnode(gdb, &node);
+       dns_db_closeversion(gdb, &ver, ISC_FALSE);
 }
 
 static void
@@ -3406,7 +3406,7 @@ main(int argc, char *argv[]) {
        isc_boolean_t set_salt = ISC_FALSE;
        isc_boolean_t set_optout = ISC_FALSE;
        isc_boolean_t set_iter = ISC_FALSE;
-  
+
 #define CMDLINE_FLAGS \
        "3:AaCc:Dd:e:f:FghH:i:I:j:K:k:l:m:n:N:o:O:pPr:s:ST:tuUv:z"
 

diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index a463686d5183744667803a50bda3693fb6ab6410..73759ee23c5a26083c83c801110990dfba7d43cd 100644 (file)
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.23 2009/09/25 05:48:17 marka Exp $ */
+/* $Id: thread.h,v 1.24 2009/09/25 23:48:13 tbox Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1
@@ -37,18 +37,18 @@ inline BOOL IsValidHandle( HANDLE hHandle) {
 /* validate wait return codes... */
 inline BOOL WaitSucceeded( DWORD dwWaitResult, DWORD dwHandleCount) {
     return ((dwWaitResult >= WAIT_OBJECT_0) &&
-            (dwWaitResult < WAIT_OBJECT_0 + dwHandleCount));
+           (dwWaitResult < WAIT_OBJECT_0 + dwHandleCount));
 }
 
 inline BOOL WaitAbandoned( DWORD dwWaitResult, DWORD dwHandleCount) {
     return ((dwWaitResult >= WAIT_ABANDONED_0) &&
-            (dwWaitResult < WAIT_ABANDONED_0 + dwHandleCount));
+           (dwWaitResult < WAIT_ABANDONED_0 + dwHandleCount));
 }
 
 inline BOOL WaitTimeout( DWORD dwWaitResult) {
     return (dwWaitResult == WAIT_TIMEOUT);
 }
-    
+
 inline BOOL WaitFailed( DWORD dwWaitResult) {
     return (dwWaitResult == WAIT_FAILED);
 }

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 10c76ec3157cd11d14e663d841e2cf732ba84453..2cd69abfdf802750f7e7346a0ff5c5d8c8a39660 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.79 2009/09/25 02:44:06 marka Exp $ */
+/* $Id: socket.c,v 1.80 2009/09/25 23:48:11 tbox Exp $ */
 
 /* This code uses functions which are only available on Server 2003 and
  * higher, and Windows XP and higher.
@@ -1990,7 +1990,7 @@ internal_accept(isc_socket_t *sock, IoCompletionInfo *lpo, int accept_errno) {
        INSIST(result == ISC_R_SUCCESS);
 
        INSIST(setsockopt(nsock->fd, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT,
-                         (char *)&sock->fd, sizeof(sock->fd)) == 0);
+                         (char *)&sock->fd, sizeof(sock->fd)) == 0);
 
        /*
         * Hook it up into the manager.