X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7ec0c9a0229aa160d7419922d2f4ba7e87480cd6..4974d09cc659e2859fcf916ad020628c9695e2f8:/sbr/dtime.c

diff --git a/sbr/dtime.c b/sbr/dtime.c
index 53c56578..481cfe6e 100644
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -198,8 +198,8 @@ dctime (struct tws *tw)
  *	Mon, 16 Jun 1992 15:30:48 -700 (or)
  *	Mon, 16 Jun 1992 15:30:48 EDT
  *
- * for the current time, as specified by rfc822.
- * The first form is required by rfc1123.
+ * for the current time, as specified by RFC 822.
+ * The first form is required by RFC 1123.
  */
 
 char *
@@ -219,8 +219,8 @@ dtimenow (int alpha_timezone)
  *	Mon, 16 Jun 1992 15:30:48 -700  (or)
  *	Mon, 16 Jun 1992 15:30:48 EDT
  *
- * as specified by rfc822.  The first form is required
- * by rfc1123 for outgoing messages.
+ * as specified by RFC 822.  The first form is required
+ * by RFC 1123 for outgoing messages.
  */
 
 char *
@@ -241,7 +241,7 @@ dtime (time_t *clock, int alpha_timezone)
  *
  *	Mon, 16 Jun 1992 15:30:48 -0700
  *
- * as specified by rfc822 and rfc1123.
+ * as specified by RFC 822 and RFC 1123.
  */
 
 char *
@@ -298,10 +298,8 @@ dtimezone (int offset, int flags)
 	hours = offset / 60;
     }
 
-#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
     if (flags & TW_DST)
-	hours += 1;
-#endif /* ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST */
+	hours++;
     snprintf (buffer, sizeof(buffer), "%s%02d%02d",
 		offset < 0 ? "-" : "+", abs (hours), abs (mins));
     return buffer;
@@ -388,7 +386,8 @@ set_dotw (struct tws *tw)
     if (tw->tw_wday < 0)
 	tw->tw_wday += 7;
 
-    tw->tw_flags &= ~TW_SDAY, tw->tw_flags |= TW_SIMP;
+    tw->tw_flags &= ~TW_SDAY;
+    tw->tw_flags |= TW_SIMP;
 }