sizeof char is always 1, so don't bother to divide by it.

[nmh] / uip / mhical.c

diff --git a/uip/mhical.c b/uip/mhical.c
index 573d7cf41c31a6059faee04efdbfbf814f69150c..67ba90da57f3b67dec3ce8da1c14e08496baa6a8 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -1,5 +1,4 @@
-/*
- * mhical.c -- operate on an iCalendar request
+/* mhical.c -- operate on an iCalendar request

  *
  * 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


@@ -332,10 +331,10 @@ convert_to_reply (contentline *clines, act action) {
             (node = find_contentline (clines, "BEGIN", "VEVENT"))) {
             contentline *new_node = add_contentline (node, "ATTENDEE");
 
             (node = find_contentline (clines, "BEGIN", "VEVENT"))) {
             contentline *new_node = add_contentline (node, "ATTENDEE");
 

-            add_param_name (new_node, strdup ("PARTSTAT"));
-            add_param_value (new_node, strdup (partstat));
-            add_param_name (new_node, strdup ("CN"));
-            add_param_value (new_node, strdup (getfullname ()));
+            add_param_name (new_node, mh_xstrdup ("PARTSTAT"));
+            add_param_value (new_node, mh_xstrdup (partstat));
+            add_param_name (new_node, mh_xstrdup ("CN"));
+            add_param_value (new_node, mh_xstrdup (getfullname ()));

             new_node->value = concat ("MAILTO:", getlocalmbox (), NULL);
         }
     }
             new_node->value = concat ("MAILTO:", getlocalmbox (), NULL);
         }
     }


@@ -369,7 +368,7 @@ convert_to_cancellation (contentline *clines) {
     if ((node = find_contentline (clines, "STATUS", 0))  &&
         ! strcasecmp (node->value, "CONFIRMED")) {
         free (node->value);
     if ((node = find_contentline (clines, "STATUS", 0))  &&
         ! strcasecmp (node->value, "CONFIRMED")) {
         free (node->value);

-        node->value = strdup ("CANCELLED");
+        node->value = mh_xstrdup ("CANCELLED");

     }
 
     if ((node = find_contentline (clines, "SEQUENCE", 0))) {
     }
 
     if ((node = find_contentline (clines, "SEQUENCE", 0))) {


@@ -378,7 +377,7 @@ convert_to_cancellation (contentline *clines) {
 
         (void) snprintf (buf, sizeof buf, "%d", sequence + 1);
         free (node->value);
 
         (void) snprintf (buf, sizeof buf, "%d", sequence + 1);
         free (node->value);

-        node->value = strdup (buf);
+        node->value = mh_xstrdup (buf);

     }
 }
 
     }
 }
 


@@ -389,24 +388,25 @@ convert_common (contentline *clines, act action) {
 
     if ((node = find_contentline (clines, "METHOD", 0))) {
         free (node->value);
 
     if ((node = find_contentline (clines, "METHOD", 0))) {
         free (node->value);

-        node->value = strdup (action == ACT_CANCEL  ?  "CANCEL"  :  "REPLY");
+        node->value = mh_xstrdup (action == ACT_CANCEL  ?  "CANCEL"  :  "REPLY");

     }
 
     if ((node = find_contentline (clines, "PRODID", 0))) {
         free (node->value);
     }
 
     if ((node = find_contentline (clines, "PRODID", 0))) {
         free (node->value);

-        node->value = strdup ("nmh mhical v0.1");
+        node->value = mh_xstrdup ("nmh mhical v0.1");

     }
 
     if ((node = find_contentline (clines, "VERSION", 0))) {
         if (! node->value) {
     }
 
     if ((node = find_contentline (clines, "VERSION", 0))) {
         if (! node->value) {

-            admonish (NULL, "Version property is missing value, assume 2.0");
-            node->value = strdup ("2.0");
+            inform("Version property is missing value, assume 2.0, continuing...");
+            node->value = mh_xstrdup ("2.0");

         }
 
         if (strcmp (node->value, "2.0")) {
         }
 
         if (strcmp (node->value, "2.0")) {

-            admonish (NULL, "supports the Version 2.0 specified by RFC 5545 "
-                            "but iCalendar object has Version %s", node->value);
-            node->value = strdup ("2.0");
+            inform("supports the Version 2.0 specified by RFC 5545 "
+               "but iCalendar object has Version %s, continuing...",
+               node->value);
+            node->value = mh_xstrdup ("2.0");

         }
     }
 
         }
     }
 


@@ -458,12 +458,12 @@ convert_common (contentline *clines, act action) {
 
             if (strftime (buf, sizeof buf, "%Y%m%dT%H%M%SZ", &now_tm)) {
                 free (node->value);
 
             if (strftime (buf, sizeof buf, "%Y%m%dT%H%M%SZ", &now_tm)) {
                 free (node->value);

-                node->value = strdup (buf);
+                node->value = mh_xstrdup (buf);

             } else {
             } else {

-                admonish (NULL, "strftime unable to format current time");
+                inform("strftime unable to format current time, continuing...");

             }
         } else {
             }
         } else {

-            admonish (NULL, "gmtime_r failed on current time");
+            inform("gmtime_r failed on current time, continuing...");

         }
     }
 
         }
     }
 


@@ -523,7 +523,7 @@ output (FILE *file, contentline *clines, int contenttype) {
             char *line = NULL;
             size_t len;
 
             char *line = NULL;
             size_t len;
 

-            line = strdup (node->name);
+            line = mh_xstrdup (node->name);

             line = format_params (line, node->params);
 
             len = strlen (line);
             line = format_params (line, node->params);
 
             len = strlen (line);


@@ -576,20 +576,20 @@ display (FILE *file, contentline *clines, char *nfs) {
 
     if ((c = fmt_findcomp ("method"))) {
         if ((node = find_contentline (clines, "METHOD", 0))  &&  node->value) {
 
     if ((c = fmt_findcomp ("method"))) {
         if ((node = find_contentline (clines, "METHOD", 0))  &&  node->value) {

-            c->c_text = strdup (node->value);
+            c->c_text = mh_xstrdup (node->value);

         }
     }
 
     if ((c = fmt_findcomp ("organizer"))) {
         if ((node = find_contentline (clines, "ORGANIZER", 0))  &&
             node->value) {
         }
     }
 
     if ((c = fmt_findcomp ("organizer"))) {
         if ((node = find_contentline (clines, "ORGANIZER", 0))  &&
             node->value) {

-            c->c_text = strdup (identity (node));
+            c->c_text = mh_xstrdup (identity (node));

         }
     }
 
     if ((c = fmt_findcomp ("summary"))) {
         if ((node = find_contentline (clines, "SUMMARY", 0))  &&  node->value) {
         }
     }
 
     if ((c = fmt_findcomp ("summary"))) {
         if ((node = find_contentline (clines, "SUMMARY", 0))  &&  node->value) {

-            c->c_text = strdup (node->value);
+            c->c_text = mh_xstrdup (node->value);

         }
     }
 
         }
     }
 


@@ -601,7 +601,7 @@ display (FILE *file, contentline *clines, char *nfs) {
             if (node->name  &&  node->value  &&  ! in_valarm  &&
                 ! strcasecmp ("DESCRIPTION", node->name)  &&
                 strcasecmp (node->value, "\\n\\n")) {
             if (node->name  &&  node->value  &&  ! in_valarm  &&
                 ! strcasecmp ("DESCRIPTION", node->name)  &&
                 strcasecmp (node->value, "\\n\\n")) {

-                c->c_text = strdup (node->value);
+                c->c_text = mh_xstrdup (node->value);

             } else if (in_valarm) {
                 if (! strcasecmp ("END", node->name)  &&
                     ! strcasecmp ("VALARM", node->value)) {
             } else if (in_valarm) {
                 if (! strcasecmp ("END", node->name)  &&
                     ! strcasecmp ("VALARM", node->value)) {


@@ -619,7 +619,7 @@ display (FILE *file, contentline *clines, char *nfs) {
     if ((c = fmt_findcomp ("location"))) {
         if ((node = find_contentline (clines, "LOCATION", 0))  &&
             node->value) {
     if ((c = fmt_findcomp ("location"))) {
         if ((node = find_contentline (clines, "LOCATION", 0))  &&
             node->value) {

-            c->c_text = strdup (node->value);
+            c->c_text = mh_xstrdup (node->value);

         }
     }
 
         }
     }
 


@@ -642,7 +642,7 @@ display (FILE *file, contentline *clines, char *nfs) {
                 } else if (! strcasecmp ("DTSTART", node->name)) {
                     /* Got it:  DTSTART outside of a VTIMEZONE section. */
                     char *datetime = format_datetime (timezones, node);
                 } else if (! strcasecmp ("DTSTART", node->name)) {
                     /* Got it:  DTSTART outside of a VTIMEZONE section. */
                     char *datetime = format_datetime (timezones, node);

-                    c->c_text = datetime ? datetime : strdup(node->value);
+                    c->c_text = datetime ? datetime : mh_xstrdup(node->value);

                 }
             }
         }
                 }
             }
         }


@@ -809,7 +809,7 @@ fold (char *line, int uses_cr) {
 #endif
 
         charstring_push_back_chars (folded_line, cp, char_len, 1);
 #endif
 
         charstring_push_back_chars (folded_line, cp, char_len, 1);

-        remaining -= char_len > 0 ? char_len : 1;
+        remaining -= max(char_len, 1);

 
         /* remaining must be > 0 to pass the loop condition above, so
            if it's not > 1, it is == 1. */
 
         /* remaining must be > 0 to pass the loop condition above, so
            if it's not > 1, it is == 1. */


@@ -824,7 +824,7 @@ fold (char *line, int uses_cr) {
             }
         }
 
             }
         }
 

-        cp += char_len > 0 ? char_len : 1;
+        cp += max(char_len, 1);

     }
 
     free (line);
     }
 
     free (line);