silence compiler warning

(cherry picked from commit 01b7d52a9f)

bin/check/check-tool.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

bin/dnssec/dnssec-signzone.c

@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

doc/private/SRCID

@@ -1,4 +1,4 @@
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
-SRCID="( 2012/09/12 08:15:00 UTC )"
+SRCID="( 2012/09/28 00:15:00 UTC )"

lib/dns/journal.c

@@ -1216,9 +1216,7 @@ dns_journal_destroy(dns_journal_t **journalp) {
 /* XXX Share code with incoming IXFR? */
 
 static isc_result_t
-roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options,
-	     isc_uint32_t resign)
-{
+roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options) {
 	isc_buffer_t source;		/* Transaction data from disk */
 	isc_buffer_t target;		/* Ditto after _fromwire check */
 	isc_uint32_t db_serial;		/* Database SOA serial */
@@ -1368,6 +1366,8 @@ dns_journal_rollforward2(isc_mem_t *mctx, dns_db_t *db, unsigned int options,
 	REQUIRE(DNS_DB_VALID(db));
 	REQUIRE(filename != NULL);
 
+	UNUSED(resign);
+
 	j = NULL;
 	result = dns_journal_open(mctx, filename, ISC_FALSE, &j);
 	if (result == ISC_R_NOTFOUND) {
@@ -1380,7 +1380,7 @@ dns_journal_rollforward2(isc_mem_t *mctx, dns_db_t *db, unsigned int options,
 	if (JOURNAL_EMPTY(&j->header))
 		result = DNS_R_UPTODATE;
 	else
-		result = roll_forward(j, db, options, resign);
+		result = roll_forward(j, db, options);
 
 	dns_journal_destroy(&j);
 

lib/isc/include/isc/file.h

@@ -107,8 +107,8 @@ isc_result_t
 isc_file_bopenunique(char *templet, FILE **fp);
 /*!<
  * \brief Create and open a file with a unique name based on 'templet'.
- *	isc_file_bopen*() open the file in binary mode in Windows. 
- *	isc_file_open*() open the file in text mode in Windows. 
+ *	isc_file_bopen*() open the file in binary mode in Windows.
+ *	isc_file_open*() open the file in text mode in Windows.
  *
  * Notes:
  *\li	'template' is a reserved work in C++.  If you want to complain

lib/isc/parseint.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

util/copyrights

@@ -13,7 +13,7 @@
 ./bin/Makefile.in				MAKE	1998,1999,2000,2001,2004,2007,2009,2012
 ./bin/check/.gitignore				X	2012
 ./bin/check/Makefile.in				MAKE	2000,2001,2002,2003,2004,2005,2006,2007,2009,2012
-./bin/check/check-tool.c			C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010
+./bin/check/check-tool.c			C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2012
 ./bin/check/check-tool.h			C	2000,2001,2002,2004,2005,2007,2010
 ./bin/check/named-checkconf.8			MAN	DOCBOOK
 ./bin/check/named-checkconf.c			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011
@@ -107,7 +107,7 @@
 ./bin/dnssec/dnssec-settime.docbook		SGML	2009,2010,2011
 ./bin/dnssec/dnssec-settime.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-signzone.8			MAN	DOCBOOK
-./bin/dnssec/dnssec-signzone.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
+./bin/dnssec/dnssec-signzone.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
 ./bin/dnssec/dnssec-signzone.docbook		SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
 ./bin/dnssec/dnssec-signzone.html		HTML	DOCBOOK
 ./bin/dnssec/dnssectool.c			C	2000,2001,2003,2004,2005,2007,2009,2010,2011
@@ -2417,7 +2417,7 @@
 ./lib/isc/nothreads/mutex.c			C	2000,2001,2004,2006,2007
 ./lib/isc/nothreads/thread.c			C	2000,2001,2004,2007
 ./lib/isc/ondestroy.c				C	2000,2001,2004,2005,2007
-./lib/isc/parseint.c				C	2001,2002,2003,2004,2005,2007
+./lib/isc/parseint.c				C	2001,2002,2003,2004,2005,2007,2012
 ./lib/isc/portset.c				C	2008
 ./lib/isc/powerpc/Makefile.in			MAKE	2007,2012
 ./lib/isc/powerpc/include/Makefile.in		MAKE	2007,2012