X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e491542da563673b49c6f6df9948ffaffbeed4fb..2ac87fa623959ffb3eb7b7c3565ed85486e99abd:/sbr/seq_del.c

diff --git a/sbr/seq_del.c b/sbr/seq_del.c
index 670872ef..4abd745d 100644
--- a/sbr/seq_del.c
+++ b/sbr/seq_del.c
@@ -1,13 +1,13 @@
-
-/*
- * seq_del.c -- delete message(s) from a sequence
+/* seq_del.c -- delete message(s) from a sequence
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "seq_nameok.h"
+#include "error.h"
 
 
 /*
@@ -26,7 +26,7 @@ int
 seq_delsel (struct msgs *mp, char *cp, int public, int zero)
 {
     unsigned int i;
-    int msgnum, new_seq = 1;
+    int msgnum;
 
     if (!seq_nameok (cp))
 	return 0;
@@ -34,9 +34,10 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero)
     /*
      * Get the number for this sequence
      */
+    bool new_seq = true;
     for (i = 0; i < svector_size (mp->msgattrs); i++) {
 	if (!strcmp (svector_at (mp->msgattrs, i), cp)) {
-	    new_seq = 0;
+	    new_seq = false;
 	    break;
 	}
     }
@@ -51,7 +52,7 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero)
 	 */
 	if (new_seq) {
 	    if (!(svector_push_back (mp->msgattrs, strdup (cp)))) {
-		advise (NULL, "strdup failed");
+		inform("strdup failed");
 		return 0;
 	    }
 	}
@@ -66,7 +67,7 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero)
 	}
     } else {
 	if (new_seq) {
-	    advise (NULL, "no such sequence as %s", cp);
+	    inform("no such sequence as %s", cp);
 	    return 0;
 	}
     }
@@ -129,6 +130,6 @@ seq_delmsg (struct msgs *mp, char *cp, int msgnum)
 	}
     }
 
-    advise (NULL, "no such sequence as %s", cp);
+    inform("no such sequence as %s", cp);
     return 0;
 }