Editing of man/mh-tailor.man.

[nmh] / sbr / fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 4f60cebbd4ea880e5f57db84b52fc2085293cfd1..f7fcff2b6afd545ae9ca9a732c4d342e65660677 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -290,7 +290,7 @@ static struct colormap colortable[] = {
 /* Add new component to the hash table */
 #define NEWCOMP(cm,name) do { \
        NEW0(cm);\
-       cm->c_name = getcpy(name);\
+       cm->c_name = mh_xstrdup(name);\
        cm->c_refcount++;\
        ncomp++;\
        i = CHASH(name);\
@@ -393,7 +393,7 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
     size_t i;
     static int comptable_initialized = 0;
 
-    format_string = getcpy (fstring);
+    format_string = mh_xstrdup(fstring);
     usr_fstring = fstring;
 
     if (reset_comptable || !comptable_initialized) {
@@ -578,7 +578,7 @@ do_name(char *sp, int preprocess)
            ismymbox ((struct mailname *) 0);
            primed++;
        }
-       /* fall through */
+       /* FALLTHRU */
     case FT_PARSEADDR:
        if (cm->c_type & CT_DATE) {
            CERROR("component used as both date and address");
@@ -740,7 +740,7 @@ do_func(char *sp)
 
     case TF_EXPR_SV:
        LV(FT_SAVESTR, 0);
-       /* fall through */
+       /* FALLTHRU */
     case TF_EXPR:
        *--cp = c;
        cp = do_expr(cp, t->extra);
@@ -969,11 +969,10 @@ fmt_freecomptext(void)
     struct comp *cm;
 
     for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++)
-       for (cm = wantcomp[i]; cm; cm = cm->c_next)
-           if (cm->c_text) {
-               free(cm->c_text);
-               cm->c_text = NULL;
-           }
+        for (cm = wantcomp[i]; cm; cm = cm->c_next) {
+            mh_xfree(cm->c_text);
+            cm->c_text = NULL;
+        }
 }
 
 /*
@@ -1145,10 +1144,8 @@ free_component(struct comp *cm)
 {
     if (--cm->c_refcount <= 0) {
        /* Shouldn't ever be NULL, but just in case ... */
-       if (cm->c_name)
-           free(cm->c_name);
-       if (cm->c_text)
-           free(cm->c_text);
+        mh_xfree(cm->c_name);
+        mh_xfree(cm->c_text);
        if (cm->c_type & CT_DATE)
            free(cm->c_tws);
        if (cm->c_type & CT_ADDR && cm->c_mn && cm->c_mn != &fmt_mnull)