X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fseq_add.c;h=fd18a117a15c24372df446534abcbc5ef0dba1d3;hp=4e01692138d5b4891b5876921203ac2ff15630f0;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/sbr/seq_add.c b/sbr/seq_add.c
index 4e01692..fd18a11 100644
--- a/sbr/seq_add.c
+++ b/sbr/seq_add.c
@@ -22,25 +22,26 @@
 */
 
 int
-seq_addsel (struct msgs *mp, char *cp, int public, int zero)
+seq_addsel(struct msgs *mp, char *cp, int public, int zero)
 {
-	int i, msgnum, new_seq = 1;
+	unsigned int i;
+	int msgnum, new_seq = 1;
 
-	if (!seq_nameok (cp))
+	if (!seq_nameok(cp))
 		return 0;
 
 	/*
-	** We keep mp->curmsg and "cur" sequence in sync.
+	** We keep mp->curmsg and cur sequence in sync.
 	** See seq_list() and seq_init().
 	*/
-	if (!strcmp (current,cp))
+	if (strcmp(seq_cur, cp)==0)
 		mp->curmsg = mp->hghsel;
 
 	/*
 	** Get the number for this sequence
 	*/
 	for (i = 0; mp->msgattrs[i]; i++) {
-		if (!strcmp (mp->msgattrs[i], cp)) {
+		if (strcmp(mp->msgattrs[i], cp)==0) {
 			new_seq = 0;
 			break;
 		}
@@ -51,11 +52,11 @@ seq_addsel (struct msgs *mp, char *cp, int public, int zero)
 	*/
 	if (new_seq) {
 		if (i >= NUMATTRS) {
-			advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp);
+			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 (!(mp->msgattrs[i] = strdup(cp))) {
+			advise(NULL, "strdup failed");
 			return 0;
 		}
 		mp->msgattrs[i + 1] = NULL;
@@ -65,9 +66,9 @@ seq_addsel (struct msgs *mp, char *cp, int public, int zero)
 	** 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 (mp->nummsg>0 && (new_seq || zero)) {
 		for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++)
-			clear_sequence (mp, i, msgnum);
+			clear_sequence(mp, i, msgnum);
 	}
 
 	/*
@@ -75,25 +76,25 @@ seq_addsel (struct msgs *mp, char *cp, int public, int zero)
 	** for all selected messages.
 	*/
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
-		if (is_selected (mp, msgnum))
-			add_sequence (mp, i, msgnum);
+		if (is_selected(mp, msgnum))
+			add_sequence(mp, i, msgnum);
 
 	/*
 	** Set the public/private bit for this sequence.
 	*/
 	if (public == 1)
-		make_seq_public (mp, i);
+		make_seq_public(mp, i);
 	else if (public == 0)
-		make_seq_private (mp, i);
+		make_seq_private(mp, i);
 	else if (new_seq) {
 		/*
 		** If public == -1, then only set the
 		** public/private bit for new sequences.
 		*/
-		if (is_readonly (mp))
-			make_seq_private (mp, i);
+		if (is_readonly(mp))
+			make_seq_private(mp, i);
 		else
-			make_seq_public (mp, i);
+			make_seq_public(mp, i);
 	}
 
 	mp->msgflags |= SEQMOD;
@@ -114,75 +115,66 @@ 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)
+seq_addmsg(struct msgs *mp, char *cp, int msgnum, int public, int zero)
 {
-	int i, j, new_seq = 1;
+	unsigned int i;
+	int j, new_seq = 1;
 
-	if (!seq_nameok (cp))
+	if (!seq_nameok(cp))
 		return 0;
 
 	/*
-	** keep mp->curmsg and msgattrs["cur"] in sync - see seq_list()
+	** keep mp->curmsg and msgattrs[] of seq_cur in sync - see seq_list()
 	*/
-	if (!strcmp (current,cp))
+	if (strcmp(seq_cur, cp)==0)
 		mp->curmsg = msgnum;
 
 	/*
 	** Get the number for this sequence
 	*/
 	for (i = 0; mp->msgattrs[i]; i++) {
-		if (!strcmp (mp->msgattrs[i], cp)) {
+		if (strcmp(mp->msgattrs[i], cp)==0) {
 			new_seq = 0;
 			break;
 		}
 	}
 
-	/*
-	** If this is a new sequence, add a slot for it
-	*/
 	if (new_seq) {
+		/* If this is a new sequence, add a slot for it */
 		if (i >= NUMATTRS) {
-			advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp);
+			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 (!(mp->msgattrs[i] = strdup(cp))) {
+			advise(NULL, "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 (mp->nummsg>0 && (new_seq || zero)) {
+		/* Clear the bit for this sequence from all messages. */
 		for (j = mp->lowmsg; j <= mp->hghmsg; j++)
-			clear_sequence (mp, i, j);
+			clear_sequence(mp, i, j);
 	}
 
-	/*
-	** Now flip on the bit for this sequence
-	** for this particular message.
-	*/
-	add_sequence (mp, i, msgnum);
+	/* Set the bit for this sequence for this particular message. */
+	add_sequence(mp, i, msgnum);
 
-	/*
-	** Set the public/private bit for this sequence.
-	*/
+	/* Set the public/private bit for this sequence. */
 	if (public == 1)
-		make_seq_public (mp, i);
+		make_seq_public(mp, i);
 	else if (public == 0)
-		make_seq_private (mp, i);
+		make_seq_private(mp, i);
 	else if (new_seq) {
 		/*
 		** If public == -1, then only set the
 		** public/private bit for new sequences.
 		*/
-		if (is_readonly (mp))
-			make_seq_private (mp, i);
+		if (is_readonly(mp))
+			make_seq_private(mp, i);
 		else
-			make_seq_public (mp, i);
+			make_seq_public(mp, i);
 	}
 
 	mp->msgflags |= SEQMOD;