seq_setunseen.c: Flip if-condition so return moves from else block.

[nmh] / sbr / datetime.c

diff --git a/sbr/datetime.c b/sbr/datetime.c
index ba64e4d4d9b82a1cd61b075f84c0fff8492244e9..9357532ba2db7a700ed6d126e98161b9eca79482 100644 (file)
--- a/sbr/datetime.c
+++ b/sbr/datetime.c
@@ -1,5 +1,4 @@
-/*
- * datetime.c -- functions for manipulating RFC 5545 date-time values
+/* datetime.c -- functions for manipulating RFC 5545 date-time values

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


@@ -11,6 +10,7 @@
 #include <h/fmt_scan.h>
 #include "h/tws.h"
 #include "h/utils.h"
 #include <h/fmt_scan.h>
 #include "h/tws.h"
 #include "h/utils.h"

+#include "unquote.h"

 
 /*
  * This doesn't try to support all of the myriad date-time formats
 
 /*
  * This doesn't try to support all of the myriad date-time formats


@@ -58,13 +58,13 @@ struct tzdesc {
  * struct tws.
  */
 static int
  * struct tws.
  */
 static int

-parse_datetime (const char *datetime, const char *zone, int dst,
+parse_datetime (const char *datetime, const char *zone, bool dst,

                 struct tws *tws) {
     char utc_indicator;
                 struct tws *tws) {
     char utc_indicator;

-    int form_1 = 0;
+    bool form_1;

     int items_matched;
 
     int items_matched;
 

-    memset(tws, 0, sizeof *tws);
+    ZERO(tws);

     items_matched =
         sscanf (datetime, "%4d%2d%2dT%2d%2d%2d%c",
                 &tws->tw_year, &tws->tw_mon, &tws->tw_mday,
     items_matched =
         sscanf (datetime, "%4d%2d%2dT%2d%2d%2d%c",
                 &tws->tw_year, &tws->tw_mon, &tws->tw_mday,


@@ -72,23 +72,22 @@ parse_datetime (const char *datetime, const char *zone, int dst,
                 &utc_indicator);
     tws->tw_flags = TW_NULL;
 
                 &utc_indicator);
     tws->tw_flags = TW_NULL;
 

+    form_1 = false;

     if (items_matched == 7) {
         /* The 'Z' must be capital according to RFC 5545 Sec. 3.3.5. */
         if (utc_indicator != 'Z') {
     if (items_matched == 7) {
         /* The 'Z' must be capital according to RFC 5545 Sec. 3.3.5. */
         if (utc_indicator != 'Z') {

-            inform("%s has invalid timezone indicator of 0x%x",
+            inform("%s has invalid timezone-indicator byte: %#x",

                     datetime, utc_indicator);
             return NOTOK;
         }
     } else if (zone == NULL) {
                     datetime, utc_indicator);
             return NOTOK;
         }
     } else if (zone == NULL) {

-        form_1 = 1;
+        form_1 = true;

     }
 
     /* items_matched of 3 is for, e.g., 20151230.  Assume that means
        the entire day.  The time fields of the tws struct were
        initialized to 0 by the memset() above. */
     if (items_matched >= 6  ||  items_matched == 3) {
     }
 
     /* items_matched of 3 is for, e.g., 20151230.  Assume that means
        the entire day.  The time fields of the tws struct were
        initialized to 0 by the memset() above. */
     if (items_matched >= 6  ||  items_matched == 3) {

-        int offset = atoi (zone ? zone : "0");
-

         /* struct tws defines tw_mon over [0, 11]. */
         --tws->tw_mon;
 
         /* struct tws defines tw_mon over [0, 11]. */
         --tws->tw_mon;
 


@@ -96,7 +95,8 @@ parse_datetime (const char *datetime, const char *zone, int dst,
         set_dotw (tws);
         /* set_dotw() sets TW_SIMP.  Replace that with TW_SEXP so that
            dasctime() outputs the dotw before the date instead of after. */
         set_dotw (tws);
         /* set_dotw() sets TW_SIMP.  Replace that with TW_SEXP so that
            dasctime() outputs the dotw before the date instead of after. */

-        tws->tw_flags &= ~TW_SDAY, tws->tw_flags |= TW_SEXP;
+        tws->tw_flags &= ~TW_SDAY;
+        tws->tw_flags |= TW_SEXP;

 
         /* For the call to dmktime():
            - don't need tw_yday
 
         /* For the call to dmktime():
            - don't need tw_yday


@@ -104,7 +104,11 @@ parse_datetime (const char *datetime, const char *zone, int dst,
            - the only flag in tw_flags used is TW_DST
          */
         tws->tw_yday = tws->tw_clock = 0;
            - the only flag in tw_flags used is TW_DST
          */
         tws->tw_yday = tws->tw_clock = 0;

-        tws->tw_zone = 60 * (offset / 100)  +  offset % 100;
+        if (zone) {
+            int offset = atoi(zone);
+            tws->tw_zone = 60 * (offset / 100)  +  offset % 100;
+        } else
+            tws->tw_zone = 0;

         if (dst) {
             tws->tw_zone -= 60;  /* per dlocaltime() */
             tws->tw_flags |= TW_DST;
         if (dst) {
             tws->tw_zone -= 60;  /* per dlocaltime() */
             tws->tw_flags |= TW_DST;


@@ -151,12 +155,12 @@ parse_datetime (const char *datetime, const char *zone, int dst,
 tzdesc_t
 load_timezones (const contentline *clines) {
     tzdesc_t timezones = NULL, timezone = NULL;
 tzdesc_t
 load_timezones (const contentline *clines) {
     tzdesc_t timezones = NULL, timezone = NULL;

-    int in_vtimezone, in_standard, in_daylight;
+    bool in_vtimezone, in_standard, in_daylight;

     tzparams *params = NULL;
     const contentline *node;
 
     /* Interpret each VTIMEZONE section. */
     tzparams *params = NULL;
     const contentline *node;
 
     /* Interpret each VTIMEZONE section. */

-    in_vtimezone = in_standard = in_daylight = 0;
+    in_vtimezone = in_standard = in_daylight = false;

     for (node = clines; node; node = node->next) {
         /* node->name will be NULL if the line was "deleted". */
         if (! node->name) { continue; }
     for (node = clines; node; node = node->next) {
         /* node->name will be NULL if the line was "deleted". */
         if (! node->name) { continue; }


@@ -167,10 +171,10 @@ load_timezones (const contentline *clines) {
                  (in_daylight  &&  ! strcasecmp ("DAYLIGHT", node->value)))) {
                 struct tws tws;
 
                  (in_daylight  &&  ! strcasecmp ("DAYLIGHT", node->value)))) {
                 struct tws tws;
 

-                if (in_standard) { in_standard = 0; }
-                else if (in_daylight) { in_daylight = 0; }
+                if (in_standard) { in_standard = false; }
+                else if (in_daylight) { in_daylight = false; }

                 if (parse_datetime (params->dtstart, params->offsetfrom,
                 if (parse_datetime (params->dtstart, params->offsetfrom,

-                                    in_daylight ? 1 : 0,
+                                    in_daylight,

                                     &tws) == OK) {
                     if (tws.tw_year >= 1970) {
                         /* dmktime() falls apart for, e.g., the year 1601. */
                                     &tws) == OK) {
                     if (tws.tw_year >= 1970) {
                         /* dmktime() falls apart for, e.g., the year 1601. */


@@ -179,7 +183,7 @@ load_timezones (const contentline *clines) {
                 } else {
                     inform("failed to parse start time %s for %s",
                             params->dtstart,
                 } else {
                     inform("failed to parse start time %s for %s",
                             params->dtstart,

-                            in_standard ? "standard" : "daylight");
+                            in_daylight ? "daylight" : "standard");

                     return NULL;
                 }
                 params = NULL;
                     return NULL;
                 }
                 params = NULL;


@@ -196,14 +200,14 @@ load_timezones (const contentline *clines) {
         } else if (in_vtimezone) {
             if (! strcasecmp ("END", node->name)  &&
                 ! strcasecmp ("VTIMEZONE", node->value)) {
         } else if (in_vtimezone) {
             if (! strcasecmp ("END", node->name)  &&
                 ! strcasecmp ("VTIMEZONE", node->value)) {

-                in_vtimezone = 0;
+                in_vtimezone = false;

             } else if (! strcasecmp ("BEGIN", node->name)  &&
                 ! strcasecmp ("STANDARD", node->value)) {
             } else if (! strcasecmp ("BEGIN", node->name)  &&
                 ! strcasecmp ("STANDARD", node->value)) {

-                in_standard = 1;
+                in_standard = true;

                 params = &timezone->standard_params;
             } else if (! strcasecmp ("BEGIN", node->name)  &&
                 ! strcasecmp ("DAYLIGHT", node->value)) {
                 params = &timezone->standard_params;
             } else if (! strcasecmp ("BEGIN", node->name)  &&
                 ! strcasecmp ("DAYLIGHT", node->value)) {

-                in_daylight = 1;
+                in_daylight = true;

                 params = &timezone->daylight_params;
             } else if (! strcasecmp ("TZID", node->name)) {
                 /* See comment below in format_datetime() about removing any enclosing quotes from a
                 params = &timezone->daylight_params;
             } else if (! strcasecmp ("TZID", node->name)) {
                 /* See comment below in format_datetime() about removing any enclosing quotes from a


@@ -216,7 +220,7 @@ load_timezones (const contentline *clines) {
             if (! strcasecmp ("BEGIN", node->name)  &&
                 ! strcasecmp ("VTIMEZONE", node->value)) {
 
             if (! strcasecmp ("BEGIN", node->name)  &&
                 ! strcasecmp ("VTIMEZONE", node->value)) {
 

-                in_vtimezone = 1;
+                in_vtimezone = true;

                 NEW0(timezone);
                 if (timezones) {
                     tzdesc_t t;
                 NEW0(timezone);
                 if (timezones) {
                     tzdesc_t t;


@@ -321,9 +325,8 @@ rrule_clock (const char *rrule, const char *starttime, const char *zone,
 
 fail:
     if (clock == 0) {
 
 fail:
     if (clock == 0) {

-        admonish (NULL,
-                  "Unsupported RRULE format: %s, assume local timezone",
-                  rrule);
+        inform("Unsupported RRULE format: %s, assume local timezone, continuing...",
+           rrule);

     }
 
     return clock;
     }
 
     return clock;


@@ -357,7 +360,7 @@ format_datetime (tzdesc_t timezones, const contentline *node) {
     if (! dt_timezone) {
         /* Form #1: DATE WITH LOCAL TIME, i.e., no time zone, or
            Form #2: DATE WITH UTC TIME */
     if (! dt_timezone) {
         /* Form #1: DATE WITH LOCAL TIME, i.e., no time zone, or
            Form #2: DATE WITH UTC TIME */

-        if (parse_datetime (node->value, NULL, 0, &tws[0]) == OK) {
+        if (parse_datetime (node->value, NULL, false, &tws[0]) == OK) {

             return strdup (dasctime (&tws[0], 0));
         }
         inform("unable to parse datetime %s", node->value);
             return strdup (dasctime (&tws[0], 0));
         }
         inform("unable to parse datetime %s", node->value);


@@ -371,7 +374,7 @@ format_datetime (tzdesc_t timezones, const contentline *node) {
 
     /* Find the corresponding tzdesc. */
     for (tz = timezones; dt_timezone && tz; tz = tz->next) {
 
     /* Find the corresponding tzdesc. */
     for (tz = timezones; dt_timezone && tz; tz = tz->next) {

-        /* Property parameter values are case insenstive (RFC 5545
+        /* Property parameter values are case insensitive (RFC 5545

            Sec. 2) and time zone identifiers are property parameters
            (RFC 5545 Sec. 3.8.2.4), though it would seem odd to use
            different case in the same file for identifiers that are
            Sec. 2) and time zone identifiers are property parameters
            (RFC 5545 Sec. 3.8.2.4), though it would seem odd to use
            different case in the same file for identifiers that are


@@ -431,7 +434,7 @@ format_datetime (tzdesc_t timezones, const contentline *node) {
         }
 
         if (parse_datetime (node->value, tz->standard_params.offsetto,
         }
 
         if (parse_datetime (node->value, tz->standard_params.offsetto,

-                            0, &tws[0]) == OK) {
+                            false, &tws[0]) == OK) {

             dt[0] = tws[0].tw_clock;
         } else {
             inform("unable to parse datetime %s", node->value);
             dt[0] = tws[0].tw_clock;
         } else {
             inform("unable to parse datetime %s", node->value);


@@ -443,7 +446,7 @@ format_datetime (tzdesc_t timezones, const contentline *node) {
                 dst = 0;
             } else {
                 if (parse_datetime (node->value,
                 dst = 0;
             } else {
                 if (parse_datetime (node->value,

-                                    tz->daylight_params.offsetto, 1,
+                                    tz->daylight_params.offsetto, true,

                                     &tws[1]) == OK) {
                     dt[1] = tws[1].tw_clock;
                 } else {
                                     &tws[1]) == OK) {
                     dt[1] = tws[1].tw_clock;
                 } else {


@@ -452,7 +455,7 @@ format_datetime (tzdesc_t timezones, const contentline *node) {
                     return NULL;
                 }
 
                     return NULL;
                 }
 

-                dst = dt[1] > transition[0]  ?  0  :  1;
+                dst = dt[1] <= transition[0];

             }
         }
 
             }
         }