X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/75cb75e930551c2a611183d96b22ae225ff3113f..2c5c74d8aff556e5cd7bc10c9d555a0b2a026ed7:/sbr/fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 10d3e575..27359d9b 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -1,6 +1,4 @@
-
-/*
- * fmt_compile.c -- "compile" format strings for fmt_scan
+/* fmt_compile.c -- "compile" format strings for fmt_scan
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -375,7 +373,7 @@ compile_error(char *str, char *cp)
 	    usr_fstring[i] = '_';
     }
 
-    advise(NULL, "\"%s\": format compile error - %s",
+    inform("\"%s\": format compile error - %s",
 	   &usr_fstring[errpos-errctx], str);
     adios (NULL, "%*s", errctx+1, "^");
 }
@@ -578,7 +576,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 +738,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 +967,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 +1142,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)