From bf33eb0b522801792a6663b0360bc94b9e9b77c2 Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Mon, 16 Feb 2009 23:48:04 +0000 Subject: [PATCH] update copyright notice --- bin/check/named-checkconf.c | 26 +++++++++++++------------- bin/check/named-checkzone.c | 4 ++-- bin/dig/dighost.c | 6 +++--- bin/named/unix/os.c | 6 +++--- lib/dns/rdata/generic/soa_6.c | 18 +++++++++--------- lib/dns/rdata/in_1/wks_11.c | 4 ++-- lib/isc/unix/dir.c | 4 ++-- lib/isc/unix/file.c | 8 ++++---- lib/isc/unix/strerror.c | 4 ++-- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c index 22eb6b5222..4ed050bc51 100644 --- a/bin/check/named-checkconf.c +++ b/bin/check/named-checkconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkconf.c,v 1.47 2009/02/16 02:01:15 marka Exp $ */ +/* $Id: named-checkconf.c,v 1.48 2009/02/16 23:48:04 tbox Exp $ */ /*! \file */ @@ -61,9 +61,9 @@ isc_log_t *logc = NULL; /*% usage */ static void usage(void) { - fprintf(stderr, "usage: %s [-h] [-j] [-v] [-z] [-t directory] " + fprintf(stderr, "usage: %s [-h] [-j] [-v] [-z] [-t directory] " "[named.conf]\n", program); - exit(1); + exit(1); } /*% directory callback */ @@ -173,9 +173,9 @@ configure_zone(const char *vclass, const char *view, zname = cfg_obj_asstring(cfg_tuple_get(zconfig, "name")); classobj = cfg_tuple_get(zconfig, "class"); - if (!cfg_obj_isstring(classobj)) - zclass = vclass; - else + if (!cfg_obj_isstring(classobj)) + zclass = vclass; + else zclass = cfg_obj_asstring(classobj); zoptions = cfg_tuple_get(zconfig, "options"); @@ -194,9 +194,9 @@ configure_zone(const char *vclass, const char *view, return (ISC_R_FAILURE); if (strcasecmp(cfg_obj_asstring(typeobj), "master") != 0) return (ISC_R_SUCCESS); - cfg_map_get(zoptions, "database", &dbobj); - if (dbobj != NULL) - return (ISC_R_SUCCESS); + cfg_map_get(zoptions, "database", &dbobj); + if (dbobj != NULL) + return (ISC_R_SUCCESS); cfg_map_get(zoptions, "file", &fileobj); if (fileobj == NULL) return (ISC_R_FAILURE); @@ -287,8 +287,8 @@ configure_zone(const char *vclass, const char *view, } else INSIST(0); } else { - zone_options |= DNS_ZONEOPT_CHECKNAMES; - zone_options |= DNS_ZONEOPT_CHECKNAMESFAIL; + zone_options |= DNS_ZONEOPT_CHECKNAMES; + zone_options |= DNS_ZONEOPT_CHECKNAMESFAIL; } masterformat = dns_masterformat_text; @@ -399,7 +399,7 @@ main(int argc, char **argv) { int exit_status = 0; isc_entropy_t *ectx = NULL; isc_boolean_t load_zones = ISC_FALSE; - + isc_commandline_errprint = ISC_FALSE; while ((c = isc_commandline_parse(argc, argv, "dhjt:vz")) != EOF) { diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c index 02df7c605c..5232e0f3b1 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkzone.c,v 1.52 2009/02/16 02:01:15 marka Exp $ */ +/* $Id: named-checkzone.c,v 1.53 2009/02/16 23:48:04 tbox Exp $ */ /*! \file */ diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 3621c8fea2..8883bd3ff8 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.319 2009/02/16 00:01:37 marka Exp $ */ +/* $Id: dighost.c,v 1.320 2009/02/16 23:48:04 tbox Exp $ */ /*! \file * \note @@ -406,7 +406,7 @@ hex_dump(isc_buffer_t *b) { for (i = len - 15; i <= len; i++) { if (r.base[i] >= '!' && r.base[i] <= '}') putchar(r.base[i]); - else + else putchar('.'); } printf("\n"); @@ -419,7 +419,7 @@ hex_dump(isc_buffer_t *b) { for (i = ((len>>4)<<4); i < len; i++) { if (r.base[i] >= '!' && r.base[i] <= '}') putchar(r.base[i]); - else + else putchar('.'); } printf("\n"); diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index bfb8340f26..d59ccb330e 100644 --- a/bin/named/unix/os.c +++ b/bin/named/unix/os.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: os.c,v 1.93 2009/02/16 05:08:43 marka Exp $ */ +/* $Id: os.c,v 1.94 2009/02/16 23:48:04 tbox Exp $ */ /*! \file */ @@ -682,7 +682,7 @@ mkdirpath(char *filename, void (*report)(const char *, ...)) { strbuf); goto error; } - if (mkdirpath(filename, report) == -1) + if (mkdirpath(filename, report) == -1) goto error; mode = S_IRUSR | S_IWUSR | S_IXUSR; /* u=rwx */ mode |= S_IRGRP | S_IXGRP; /* g=rx */ diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index c52641c7e7..b573a54606 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: soa_6.c,v 1.62 2009/02/16 02:01:16 marka Exp $ */ +/* $Id: soa_6.c,v 1.63 2009/02/16 23:48:04 tbox Exp $ */ /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */ @@ -105,7 +105,7 @@ totext_soa(ARGS_TOTEXT) { comment = ISC_TF((tctx->flags & DNS_STYLEFLAG_COMMENT) != 0); else comment = ISC_FALSE; - + dns_name_init(&mname, NULL); dns_name_init(&rname, NULL); @@ -160,8 +160,8 @@ totext_soa(ARGS_TOTEXT) { static inline isc_result_t fromwire_soa(ARGS_FROMWIRE) { - dns_name_t mname; - dns_name_t rname; + dns_name_t mname; + dns_name_t rname; isc_region_t sregion; isc_region_t tregion; @@ -172,11 +172,11 @@ fromwire_soa(ARGS_FROMWIRE) { dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14); - dns_name_init(&mname, NULL); - dns_name_init(&rname, NULL); + dns_name_init(&mname, NULL); + dns_name_init(&rname, NULL); - RETERR(dns_name_fromwire(&mname, source, dctx, options, target)); - RETERR(dns_name_fromwire(&rname, source, dctx, options, target)); + RETERR(dns_name_fromwire(&mname, source, dctx, options, target)); + RETERR(dns_name_fromwire(&rname, source, dctx, options, target)); isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 813e46f8b0..19bad0af2b 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: wks_11.c,v 1.55 2009/02/16 02:01:16 marka Exp $ */ +/* $Id: wks_11.c,v 1.56 2009/02/16 23:48:04 tbox Exp $ */ /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */ diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c index cd0e30cbb5..6ddb97bd30 100644 --- a/lib/isc/unix/dir.c +++ b/lib/isc/unix/dir.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: dir.c,v 1.28 2009/02/16 02:01:16 marka Exp $ */ +/* $Id: dir.c,v 1.29 2009/02/16 23:48:04 tbox Exp $ */ /*! \file * \author Principal Authors: DCL */ diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c index 958a0cea82..3760b9644d 100644 --- a/lib/isc/unix/file.c +++ b/lib/isc/unix/file.c @@ -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) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -48,7 +48,7 @@ * SUCH DAMAGE. */ -/* $Id: file.c,v 1.52 2009/02/16 02:01:16 marka Exp $ */ +/* $Id: file.c,v 1.53 2009/02/16 23:48:04 tbox Exp $ */ /*! \file */ @@ -393,7 +393,7 @@ isc_file_progname(const char *filename, char *buf, size_t buflen) { /* * Put the absolute name of the current directory into 'dirname', which is - * a buffer of at least 'length' characters. End the string with the + * a buffer of at least 'length' characters. End the string with the * appropriate path separator, such that the final product could be * concatenated with a relative pathname to make a valid pathname string. */ @@ -438,7 +438,7 @@ isc_result_t isc_file_truncate(const char *filename, isc_offset_t size) { isc_result_t result = ISC_R_SUCCESS; - if (truncate(filename, size) < 0) + if (truncate(filename, size) < 0) result = isc__errno2result(errno); return (result); } diff --git a/lib/isc/unix/strerror.c b/lib/isc/unix/strerror.c index 317c4f1a26..caa6659154 100644 --- a/lib/isc/unix/strerror.c +++ b/lib/isc/unix/strerror.c @@ -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) 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: strerror.c,v 1.9 2009/02/16 02:01:16 marka Exp $ */ +/* $Id: strerror.c,v 1.10 2009/02/16 23:48:04 tbox Exp $ */ /*! \file */