diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in index 9740bfdc72..6d65697810 100644 --- a/bin/nsupdate/Makefile.in +++ b/bin/nsupdate/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006-2008 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.28 2008/08/29 03:16:14 marka Exp $ +# $Id: Makefile.in,v 1.29 2008/08/29 23:47:22 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c index 2522954f06..1981a53e92 100644 --- a/lib/isc/win32/time.c +++ b/lib/isc/win32/time.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001, 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: time.c,v 1.44 2008/08/29 03:57:38 marka Exp $ */ +/* $Id: time.c,v 1.45 2008/08/29 23:47:22 tbox Exp $ */ #include @@ -235,9 +235,9 @@ isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) { SYSTEMTIME st; char DateBuf[50]; char TimeBuf[50]; - + static const char badtime[] = "99-Bad-9999 99:99:99.999"; - + REQUIRE(len > 0); if (FileTimeToLocalFileTime(&t->absolute, &localft) && FileTimeToSystemTime(&localft, &st)) { @@ -245,10 +245,10 @@ isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) { DateBuf, 50); GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOTIMEMARKER| TIME_FORCE24HOURFORMAT, &st, NULL, TimeBuf, 50); - + snprintf(buf, len, "%s %s.%03u", DateBuf, TimeBuf, st.wMilliseconds); - + } else snprintf(buf, len, badtime); } @@ -258,7 +258,7 @@ isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) { SYSTEMTIME st; char DateBuf[50]; char TimeBuf[50]; - + REQUIRE(len > 0); if (FileTimeToSystemTime(&t->absolute, &st)) { GetDateFormat(LOCALE_USER_DEFAULT, 0, &st, "ddd',', dd-MMM-yyyy", @@ -266,7 +266,7 @@ isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) { GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOTIMEMARKER | TIME_FORCE24HOURFORMAT, &st, "hh':'mm':'ss", TimeBuf, 50); - + snprintf(buf, len, "%s %s GMT", DateBuf, TimeBuf); } else { buf[0] = 0;