From e7c19ac871dadb318d4c4c3b609c8aba763d592c Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Fri, 26 Apr 2013 23:45:14 +0000 Subject: [PATCH] update copyright notice --- bin/tests/named.conf | 2 +- bin/tests/rdata_test.c | 2 +- lib/dns/acache.c | 2 +- lib/dns/include/dns/acache.h | 10 +++++----- lib/dns/rdata/generic/hip_55.c | 20 ++++++++++---------- lib/dns/rdata/generic/hip_55.h | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bin/tests/named.conf b/bin/tests/named.conf index 5766b3a7601..6360e04892f 100644 --- a/bin/tests/named.conf +++ b/bin/tests/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/rdata_test.c b/bin/tests/rdata_test.c index 4fb9eb14389..f13b3d19c9a 100644 --- a/bin/tests/rdata_test.c +++ b/bin/tests/rdata_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/acache.c b/lib/dns/acache.c index c10d5cd906a..61f96ef27da 100644 --- a/lib/dns/acache.c +++ b/lib/dns/acache.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008, 2012, 2013 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/dns/include/dns/acache.h b/lib/dns/include/dns/acache.h index d97dd64669b..c372ed95a37 100644 --- a/lib/dns/include/dns/acache.h +++ b/lib/dns/include/dns/acache.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006, 2007, 2013 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -25,7 +25,7 @@ /* * Acache - * + * * The Additional Cache Object * * This module manages internal caching entries that correspond to @@ -131,7 +131,7 @@ * - 76 bytes for each additional cache entry * - if the entry has a DNS name and associated RRset, * * 44 bytes + size of the name (1-255 bytes) - * * 52 bytes x number_of_RRs + * * 52 bytes x number_of_RRs * - 28 bytes for each DB related to this module * * Using the additional cache also requires extra memory consumption in @@ -418,7 +418,7 @@ dns_acache_attachentry(dns_acacheentry_t *source, dns_acacheentry_t **targetp); * * *targetp is attached to 'source'. */ - + void dns_acache_detachentry(dns_acacheentry_t **entryp); /* @@ -432,7 +432,7 @@ dns_acache_detachentry(dns_acacheentry_t **entryp); * * *entryp is NULL. * - * If '*entryp' is the last reference to the entry, + * If '*entryp' is the last reference to the entry, * cache does not have an outstanding task, all resources used by the * entry (including the entry object itself) will be freed. */ diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c index 4e3bbe0286a..a7fca52010f 100644 --- a/lib/dns/rdata/generic/hip_55.c +++ b/lib/dns/rdata/generic/hip_55.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -133,7 +133,7 @@ totext_hip(ARGS_TOTEXT) { hit_len = uint8_fromregion(®ion); isc_region_consume(®ion, 1); - + algorithm = uint8_fromregion(®ion); isc_region_consume(®ion, 1); @@ -142,7 +142,7 @@ totext_hip(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) RETERR(str_totext("( ", target)); - + /* * Algorithm */ @@ -277,7 +277,7 @@ fromstruct_hip(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(hip->key_len, target)); RETERR(mem_tobuffer(target, hip->hit, hip->hit_len)); RETERR(mem_tobuffer(target, hip->key, hip->key_len)); - + myhip = *hip; for (result = dns_rdata_hip_first(&myhip); result == ISC_R_SUCCESS; @@ -336,11 +336,11 @@ tostruct_hip(ARGS_TOSTRUCT) { cleanup: if (hip->hit != NULL) - isc_mem_free(mctx, hip->hit); + isc_mem_free(mctx, hip->hit); if (hip->key != NULL) - isc_mem_free(mctx, hip->key); + isc_mem_free(mctx, hip->key); if (hip->servers != NULL) - isc_mem_free(mctx, hip->servers); + isc_mem_free(mctx, hip->servers); return (ISC_R_NOMEMORY); } @@ -354,10 +354,10 @@ freestruct_hip(ARGS_FREESTRUCT) { if (hip->mctx == NULL) return; - isc_mem_free(hip->mctx, hip->hit); - isc_mem_free(hip->mctx, hip->key); + isc_mem_free(hip->mctx, hip->hit); + isc_mem_free(hip->mctx, hip->key); if (hip->servers != NULL) - isc_mem_free(hip->mctx, hip->servers); + isc_mem_free(hip->mctx, hip->servers); hip->mctx = NULL; } diff --git a/lib/dns/rdata/generic/hip_55.h b/lib/dns/rdata/generic/hip_55.h index 69f2eba8804..85791488046 100644 --- a/lib/dns/rdata/generic/hip_55.h +++ b/lib/dns/rdata/generic/hip_55.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above -- 2.47.3