Attachment 607190 Details for Bug 851636 – add time zone indication in the comment

[patch] add time zone indication in the comment

dhcp-4.2.4-P1-timezone.patch (text/plain), 1.52 KB, created by Jiri Popelka on 2012-08-27 12:19:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2012-08-27 12:19:06 UTC

Size: 1.52 KB

patch

obsolete

>diff -up dhcp-4.2.4-P1/common/print.c.timezone dhcp-4.2.4-P1/common/print.c
>--- dhcp-4.2.4-P1/common/print.c.timezone	2012-07-13 08:17:54.000000000 +0200
>+++ dhcp-4.2.4-P1/common/print.c	2012-08-27 13:52:47.636776821 +0200
>@@ -1472,10 +1472,10 @@ const char *
> print_time(TIME t)
> {
> 	static char buf[sizeof("epoch 9223372036854775807; "
>-			       "# Wed Jun 30 21:49:08 2147483647")];
>-	static char buf1[sizeof("# Wed Jun 30 21:49:08 2147483647")];
>+			       "# Wed Jun 30 21:49:08 2147483647 AZOST")];
>+	static char buf1[sizeof("# Wed Jun 30 21:49:08 2147483647 AZOST")];
> 	time_t since_epoch;
>-	/* The string: 	       "6 2147483647/12/31 23:59:60;"
>+	/* The string: 	       "6 2147483647/12/31 23:59:60; # UTC"
> 	 * is smaller than the other, used to declare the buffer size, so
> 	 * we can use one buffer for both.
> 	 */
>@@ -1498,7 +1498,7 @@ print_time(TIME t)
> 	if (db_time_format == LOCAL_TIME_FORMAT) {
> 		since_epoch = mktime(localtime(&t));
> 		if ((strftime(buf1, sizeof(buf1),
>-			      "# %a %b %d %H:%M:%S %Y",
>+			      "# %a %b %d %H:%M:%S %Y %Z",
> 			      localtime(&t)) == 0) ||
> 		    (snprintf(buf, sizeof(buf), "epoch %lu; %s",
> 			      (unsigned long)since_epoch, buf1) >= sizeof(buf)))
>@@ -1508,7 +1508,7 @@ print_time(TIME t)
> 		/* No bounds check for the year is necessary - in this case,
> 		 * strftime() will run out of space and assert an error.
> 		 */
>-		if (strftime(buf, sizeof(buf), "%w %Y/%m/%d %H:%M:%S;",
>+		if (strftime(buf, sizeof(buf), "%w %Y/%m/%d %H:%M:%S; # UTC",
> 			     gmtime(&t)) == 0)
> 			return NULL;
> 	}

Actions: View | Diff

Attachments on bug 851636: 607190