path.c: Simplify compath()'s flow; return, don't break twice.

[nmh] / uip / distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 2d9239e92fd4495f627ceaf1d2896fa23af9ef25..6fc773723d095e683d86fee45c730abe35aad459 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * distsbr.c -- routines to do additional "dist-style" processing
+/* distsbr.c -- routines to do additional "dist-style" processing
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -30,7 +28,7 @@ distout (char *drft, char *msgnam, char *backup)
     int state;
     char *dp, *resent;
     char name[NAMESZ], buffer[BUFSIZ];
-    register FILE *ifp, *ofp;
+    FILE *ifp, *ofp;
     m_getfld_state_t gstate = 0;
 
     if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK)
@@ -56,7 +54,7 @@ distout (char *drft, char *msgnam, char *backup)
                if (uprf (name, "distribution-"))
                    snprintf (name, sizeof(name), "%s%s", "Resent", &name[12]);
                if (!uprf (name, "resent")) {
-                   advise (NULL, BADHDR, "draft", name);
+                   inform(BADHDR, "draft", name);
                    goto leave_bad;
                }
                if (state == FLD)
@@ -74,7 +72,7 @@ distout (char *drft, char *msgnam, char *backup)
            case BODY: 
                for (dp = buffer; *dp; dp++)
                    if (!isspace ((unsigned char) *dp)) {
-                       advise (NULL, BADTXT, "draft");
+                       inform(BADTXT, "draft");
                        goto leave_bad;
                    }
 
@@ -83,7 +81,7 @@ distout (char *drft, char *msgnam, char *backup)
 
            case LENERR: 
            case FMTERR: 
-               advise (NULL, BADRFT, "draft");
+               inform(BADRFT, "draft");
        leave_bad: ;
                fclose (ifp);
                fclose (ofp);
@@ -102,7 +100,7 @@ process: ;
     fflush (ofp);
 
     if (!resent) {
-       advise (NULL, BADMSG, "draft");
+       inform(BADMSG, "draft");
        fclose (ofp);
        (void) m_unlink (drft);
        if (rename (backup, drft) == NOTOK)
@@ -127,7 +125,7 @@ ready_msg (char *msgnam)
 {
     int state, out;
     char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
-    register FILE *ifp, *ofp;
+    FILE *ifp, *ofp;
     char *cp = NULL;
     m_getfld_state_t gstate = 0;