read_switch_multiword.c: Move interface to own file.

[nmh] / sbr / seq_add.c

diff --git a/sbr/seq_add.c b/sbr/seq_add.c
index 68fa7249b11761f6567777bc7e14f0033fadb1ce..9c27f30270991c881ed717423f3cc1c8e716ea3d 100644 (file)
--- a/sbr/seq_add.c
+++ b/sbr/seq_add.c
@@ -1,13 +1,14 @@
-
-/*
- * seq_add.c -- add message(s) to a sequence
+/* seq_add.c -- add message(s) to 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 "seq_add.h"
+#include "error.h"
 
 
 /*
@@ -25,7 +26,8 @@
 int
 seq_addsel (struct msgs *mp, char *cp, int public, int zero)
 {
-    int i, msgnum, new_seq = 1;
+    unsigned int i;
+    int msgnum;
 
     if (!seq_nameok (cp))
        return 0;
@@ -40,9 +42,10 @@ seq_addsel (struct msgs *mp, char *cp, int public, int zero)
     /*
      * Get the number for this sequence
      */
-    for (i = 0; mp->msgattrs[i]; i++) {
-       if (!strcmp (mp->msgattrs[i], cp)) {
-           new_seq = 0;
+    bool new_seq = true;
+    for (i = 0; i < svector_size (mp->msgattrs); i++) {
+       if (!strcmp (svector_at (mp->msgattrs, i), cp)) {
+           new_seq = false;
            break;
        }
     }
@@ -51,22 +54,17 @@ seq_addsel (struct msgs *mp, char *cp, int public, int zero)
      * If this is a new sequence, add a slot for it
      */
     if (new_seq) {
-       if (i >= NUMATTRS) {
-           advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp);
-           return 0;
-       }
-       if (!(mp->msgattrs[i] = strdup (cp))) {
-           advise (NULL, "strdup failed");
+       if (!(svector_push_back (mp->msgattrs, strdup (cp)))) {
+           inform("strdup failed");
            return 0;
        }
-       mp->msgattrs[i + 1] = NULL;
     }
 
     /*
      * If sequence is new, or zero flag is set, then first
      * clear the bit for this sequence from all messages.
      */
-    if (new_seq || zero) {
+    if ((new_seq || zero) && mp->nummsg > 0) {
        for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++)
            clear_sequence (mp, i, msgnum);
     }
@@ -117,7 +115,8 @@ seq_addsel (struct msgs *mp, char *cp, int public, int zero)
 int
 seq_addmsg (struct msgs *mp, char *cp, int msgnum, int public, int zero)
 {
-    int i, j, new_seq = 1;
+    unsigned int i;
+    int j;
 
     if (!seq_nameok (cp))
        return 0;
@@ -131,9 +130,10 @@ seq_addmsg (struct msgs *mp, char *cp, int msgnum, int public, int zero)
     /*
      * Get the number for this sequence
      */
-    for (i = 0; mp->msgattrs[i]; i++) {
-       if (!strcmp (mp->msgattrs[i], cp)) {
-           new_seq = 0;
+    bool new_seq = true;
+    for (i = 0; i < svector_size (mp->msgattrs); i++) {
+       if (!strcmp (svector_at (mp->msgattrs, i), cp)) {
+           new_seq = false;
            break;
        }
     }
@@ -142,22 +142,17 @@ seq_addmsg (struct msgs *mp, char *cp, int msgnum, int public, int zero)
      * If this is a new sequence, add a slot for it
      */
     if (new_seq) {
-       if (i >= NUMATTRS) {
-           advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp);
-           return 0;
-       }
-       if (!(mp->msgattrs[i] = strdup (cp))) {
-           advise (NULL, "strdup failed");
+       if (!(svector_push_back (mp->msgattrs, strdup (cp)))) {
+           inform("strdup failed");
            return 0;
        }
-       mp->msgattrs[i + 1] = NULL;
     }
 
     /*
      * If sequence is new, or zero flag is set, then first
      * clear the bit for this sequence from all messages.
      */
-    if (new_seq || zero) {
+    if ((new_seq || zero) && mp->nummsg > 0) {
        for (j = mp->lowmsg; j <= mp->hghmsg; j++)
            clear_sequence (mp, i, j);
     }