From: Automatic Updater Date: Fri, 18 Mar 2011 23:46:09 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.6-ESV-R5b1~34 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=08d01c3a4fe1c4631c482c332940688a0dac192f;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c index a3847961912..e1f2a6ae45d 100644 --- a/bin/tests/tasks/t_tasks.c +++ b/bin/tests/tasks/t_tasks.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_tasks.c,v 1.40.332.5 2011/03/18 07:49:17 marka Exp $ */ +/* $Id: t_tasks.c,v 1.40.332.6 2011/03/18 23:46:08 tbox Exp $ */ #include @@ -1946,12 +1946,12 @@ t_tasks11(int purgable) { if (event1 == NULL) { t_info("isc_event_allocate failed\n"); isc_task_destroy(&task); - isc_taskmgr_destroy(&tmgr); - isc_mem_destroy(&mctx); - DESTROYLOCK(&T11_mx); - (void) isc_condition_destroy(&T11_cv); - return(T_UNRESOLVED); - } + isc_taskmgr_destroy(&tmgr); + isc_mem_destroy(&mctx); + DESTROYLOCK(&T11_mx); + (void) isc_condition_destroy(&T11_cv); + return(T_UNRESOLVED); + } isc_task_send(task, &event1); event2 = isc_event_allocate(mctx, (void *)1, (isc_eventtype_t)1, @@ -1959,12 +1959,12 @@ t_tasks11(int purgable) { if (event2 == NULL) { t_info("isc_event_allocate failed\n"); isc_task_destroy(&task); - isc_taskmgr_destroy(&tmgr); - isc_mem_destroy(&mctx); - DESTROYLOCK(&T11_mx); - (void) isc_condition_destroy(&T11_cv); - return(T_UNRESOLVED); - } + isc_taskmgr_destroy(&tmgr); + isc_mem_destroy(&mctx); + DESTROYLOCK(&T11_mx); + (void) isc_condition_destroy(&T11_cv); + return(T_UNRESOLVED); + } event2_clone = event2; if (purgable) event2->ev_attributes &= ~ISC_EVENTATTR_NOPURGE; diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h index 9fb85b06cae..0cc404f0d7d 100644 --- a/lib/isc/unix/include/isc/stdtime.h +++ b/lib/isc/unix/include/isc/stdtime.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2011 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: stdtime.h,v 1.14.332.1 2011/03/18 09:09:45 fdupont Exp $ */ +/* $Id: stdtime.h,v 1.14.332.2 2011/03/18 23:46:08 tbox Exp $ */ #ifndef ISC_STDTIME_H #define ISC_STDTIME_H 1 diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h index b172b2ff497..c2eb7415364 100644 --- a/lib/isc/win32/include/isc/stdtime.h +++ b/lib/isc/win32/include/isc/stdtime.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2011 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: stdtime.h,v 1.12.332.1 2011/03/18 09:09:45 fdupont Exp $ */ +/* $Id: stdtime.h,v 1.12.332.2 2011/03/18 23:46:09 tbox Exp $ */ #ifndef ISC_STDTIME_H #define ISC_STDTIME_H 1