sbr/utils.c: Delete dead-code open_form(); not called.

[nmh] / sbr / dtime.c

diff --git a/sbr/dtime.c b/sbr/dtime.c
index 6039b5f1076ba7e5469a25c54fdb20a5b2536280..481cfe6e504b8d8bb6e61e0312afc472ee6a7dc5 100644 (file)
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -1,6 +1,4 @@
-
-/*
- * dtime.c -- time/date routines
+/* dtime.c -- time/date routines

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -115,7 +113,6 @@ dlocaltime (time_t *clock)
 
     tw.tw_flags &= ~TW_SDAY;
     tw.tw_flags |= TW_SEXP;
 
     tw.tw_flags &= ~TW_SDAY;
     tw.tw_flags |= TW_SEXP;

-    tw.tw_flags &= ~TW_SZONE;

     tw.tw_flags |= TW_SZEXP;
 
     tw.tw_clock = *clock;
     tw.tw_flags |= TW_SZEXP;
 
     tw.tw_clock = *clock;


@@ -163,7 +160,6 @@ dgmtime (time_t *clock)
 
     tw.tw_flags &= ~TW_SDAY;
     tw.tw_flags |= TW_SEXP;
 
     tw.tw_flags &= ~TW_SDAY;
     tw.tw_flags |= TW_SEXP;

-    tw.tw_flags &= ~TW_SZONE;

     tw.tw_flags |= TW_SZEXP;
 
     tw.tw_clock = *clock;
     tw.tw_flags |= TW_SZEXP;
 
     tw.tw_clock = *clock;


@@ -202,8 +198,8 @@ dctime (struct tws *tw)
  *     Mon, 16 Jun 1992 15:30:48 -700 (or)
  *     Mon, 16 Jun 1992 15:30:48 EDT
  *
  *     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 *
  */
 
 char *


@@ -223,8 +219,8 @@ dtimenow (int alpha_timezone)
  *     Mon, 16 Jun 1992 15:30:48 -700  (or)
  *     Mon, 16 Jun 1992 15:30:48 EDT
  *
  *     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 *
  */
 
 char *


@@ -245,7 +241,7 @@ dtime (time_t *clock, int alpha_timezone)
  *
  *     Mon, 16 Jun 1992 15:30:48 -0700
  *
  *
  *     Mon, 16 Jun 1992 15:30:48 -0700
  *

- * as specified by rfc822 and rfc1123.
+ * as specified by RFC 822 and RFC 1123.

  */
 
 char *
  */
 
 char *


@@ -253,28 +249,29 @@ dasctime (struct tws *tw, int flags)
 {
     char buffer[80];
     static char result[80];
 {
     char buffer[80];
     static char result[80];

+    int twf;

 
     if (!tw)
        return NULL;
 
     /* Display timezone if known */
 
     if (!tw)
        return NULL;
 
     /* Display timezone if known */

-    if ((tw->tw_flags & TW_SZONE) == TW_SZNIL)
-       result[0] = '\0';
-    else
+    if (tw->tw_flags & TW_SZEXP)

        snprintf(result, sizeof(result), " %s", dtimezone(tw->tw_zone, tw->tw_flags | flags));
        snprintf(result, sizeof(result), " %s", dtimezone(tw->tw_zone, tw->tw_flags | flags));

+    else
+       result[0] = '\0';

 
     snprintf(buffer, sizeof(buffer), "%02d %s %0*d %02d:%02d:%02d%s",
            tw->tw_mday, tw_moty[tw->tw_mon],
            tw->tw_year < 100 ? 2 : 4, tw->tw_year,
            tw->tw_hour, tw->tw_min, tw->tw_sec, result);
 
 
     snprintf(buffer, sizeof(buffer), "%02d %s %0*d %02d:%02d:%02d%s",
            tw->tw_mday, tw_moty[tw->tw_mon],
            tw->tw_year < 100 ? 2 : 4, tw->tw_year,
            tw->tw_hour, tw->tw_min, tw->tw_sec, result);
 

-    if ((tw->tw_flags & TW_SDAY) == TW_SEXP)
-       snprintf (result, sizeof(result), "%s, %s", tw_dotw[tw->tw_wday], buffer);
-    else
-       if ((tw->tw_flags & TW_SDAY) == TW_SNIL)
-           strncpy (result, buffer, sizeof(result));
-       else
-           snprintf (result, sizeof(result), "%s (%s)", buffer, tw_dotw[tw->tw_wday]);
+    if ((twf = tw->tw_flags & TW_SDAY)) {
+        if (twf == TW_SEXP)
+            snprintf(result, sizeof(result), "%s, %s", tw_dotw[tw->tw_wday], buffer);
+        else
+           snprintf(result, sizeof(result), "%s (%s)", buffer, tw_dotw[tw->tw_wday]);
+    } else
+        strncpy(result, buffer, sizeof(result));

 
     return result;
 }
 
     return result;
 }


@@ -301,10 +298,8 @@ dtimezone (int offset, int flags)
        hours = offset / 60;
     }
 
        hours = offset / 60;
     }
 

-#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST

     if (flags & TW_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;
     snprintf (buffer, sizeof(buffer), "%s%02d%02d",
                offset < 0 ? "-" : "+", abs (hours), abs (mins));
     return buffer;


@@ -391,18 +386,8 @@ set_dotw (struct tws *tw)
     if (tw->tw_wday < 0)
        tw->tw_wday += 7;
 
     if (tw->tw_wday < 0)
        tw->tw_wday += 7;
 

-    tw->tw_flags &= ~TW_SDAY, tw->tw_flags |= TW_SIMP;
-}
-
-
-/*
- * Copy nmh time structure
- */
-
-void
-twscopy (struct tws *tb, struct tws *tw)
-{
-    *tb = *tw;  /* struct copy */
+    tw->tw_flags &= ~TW_SDAY;
+    tw->tw_flags |= TW_SIMP;

 }
 
 
 }