sbr/vector.c: Replace Nbby with <limits.h>'s CHAR_BIT.

[nmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index a98e24e2a60aa865768747181b5151ea00164408..a78bcc69614cb597c3add90c5e9f4665c844287e 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -1,6 +1,4 @@
-
-/*
- * comp.c -- compose a message
+/* comp.c -- compose a message
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -31,7 +29,7 @@
     X("cc address", 0, CCSW) \
     X("from address", 0, FROMSW) \
     X("fcc mailbox", 0, FCCSW) \
-    X("width colums", 0, WIDTHSW) \
+    X("width columns", 0, WIDTHSW) \
     X("subject text", 0, SUBJECTSW) \
 
 #define X(sw, minchars, id) id,
@@ -123,7 +121,7 @@ main (int argc, char **argv)
 
                case BILDSW:
                    build++;
-                   /* fall through */
+                   /* FALLTHRU */
                case NWHATSW: 
                    nwhat++;
                    continue;
@@ -192,8 +190,7 @@ main (int argc, char **argv)
                    if (*cp == '@')
                        cp = dp = path(cp + 1, TSUBCWF);
                    fcc = addlist(fcc, cp);
-                   if (dp)
-                       free(dp);
+                    mh_xfree(dp);
                    continue;
 
                case WIDTHSW:
@@ -360,7 +357,7 @@ try_it_again:
                        i = YESW;
                    break;
                default: 
-                   advise (NULL, "say what?");
+                   inform("say what?");
                    break;
            }
        }