Delete mh_xfree(), changing callers to call free(3) instead.

[nmh] / uip / mhical.c

diff --git a/uip/mhical.c b/uip/mhical.c
index 650b982131c226d48dd00682b7d98ecc029a4fff..d62fce95d7049b4e37f17611cd913cdb46e28370 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -29,7 +29,7 @@ static void convert_common (contentline *, act);
 static void dump_unfolded (FILE *, contentline *);
 static void output (FILE *, contentline *, int);
 static void display (FILE *, contentline *, char *);
 static void dump_unfolded (FILE *, contentline *);
 static void output (FILE *, contentline *, int);
 static void display (FILE *, contentline *, char *);

-static const char *identity (const contentline *);
+static const char *identity (const contentline *) PURE;

 static char *format_params (char *, param_list *);
 static char *fold (char *, int);
 
 static char *format_params (char *, param_list *);
 static char *fold (char *, int);
 


@@ -535,11 +535,10 @@ output (FILE *file, contentline *clines, int contenttype) {
             line = fold (add (node->value, line),
                          clines->cr_before_lf == CR_BEFORE_LF);
 
             line = fold (add (node->value, line),
                          clines->cr_before_lf == CR_BEFORE_LF);
 

-            if (clines->cr_before_lf == LF_ONLY) {
-                fprintf (file, "%s\n", line);
-            } else {
-                fprintf (file, "%s\r\n", line);
-            }
+            fputs(line, file);
+            if (clines->cr_before_lf != LF_ONLY)
+                putc('\r', file);
+            putc('\n', file);

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


@@ -714,7 +713,7 @@ display (FILE *file, contentline *clines, char *nfs) {
     }
 
     /* Don't call on the END:VCALENDAR line. */
     }
 
     /* Don't call on the END:VCALENDAR line. */

-    if (clines->next) {
+    if (clines  &&  clines->next) {

       (void) fmt_scan (fmt, buffer, INT_MAX, dat, NULL);
       fputs (charstring_buffer (buffer), file);
       fmt_free (fmt, 1);
       (void) fmt_scan (fmt, buffer, INT_MAX, dat, NULL);
       fputs (charstring_buffer (buffer), file);
       fmt_free (fmt, 1);