X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fseq_del.c;h=5555f1155fdbee3051f344998c4494a29564cd1a;hp=44ae6ce92d67542107c4ae7855ed6b09e9ba4f09;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/sbr/seq_del.c b/sbr/seq_del.c
index 44ae6ce..5555f11 100644
--- a/sbr/seq_del.c
+++ b/sbr/seq_del.c
@@ -1,102 +1,103 @@
 /*
- * 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.
- */
+** 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>
 
 
 /*
- * Delete all SELECTED messages from sequence
- *
- * If public ==  1, make sequence public.
- * If public ==  0, make sequence private.
- * If public == -1, leave the public/private bit alone for existing
- *                  sequences.  For new sequences, set this bit based
- *                  on its readonly status.
- *
- * If error, return 0, else return 1.
- */
+** Delete all SELECTED messages from sequence
+**
+** If public ==  1, make sequence public.
+** If public ==  0, make sequence private.
+** If public == -1, leave the public/private bit alone for existing
+**                  sequences.  For new sequences, set this bit based
+**                  on its readonly status.
+**
+** If error, return 0, else return 1.
+*/
 
 int
-seq_delsel (struct msgs *mp, char *cp, int public, int zero)
+seq_delsel(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;
 
 	/*
-	 * Get the number for this sequence
-	 */
+	** 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 the zero flag is set, first add all existing
-	 * messages in this folder to the sequence.
-	 */
+	** If the zero flag is set, first add all existing
+	** messages in this folder to the sequence.
+	*/
 	if (zero) {
 		/*
-		 * create the sequence, if necessary
-		 */
+		** create the sequence, if necessary
+		*/
 		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;
 		}
 		/*
-		 * now add sequence bit to all existing messages
-		 */
+		** now add sequence bit to all existing messages
+		*/
 		for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++) {
-			if (does_exist (mp, msgnum))
-				add_sequence (mp, i, msgnum);
+			if (does_exist(mp, msgnum))
+				add_sequence(mp, i, msgnum);
 			else
-				clear_sequence (mp, i, msgnum);
+				clear_sequence(mp, i, msgnum);
 		}
 	} else {
 		if (new_seq) {
-			advise (NULL, "no such sequence as %s", cp);
+			advise(NULL, "no such sequence as %s", cp);
 			return 0;
 		}
 	}
 
 	/*
-	 * Now clear the bit on all selected messages
-	 */
+	** Now clear the bit on all selected messages
+	*/
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
-		if (is_selected (mp, msgnum))
-			clear_sequence (mp, i, msgnum);
+		if (is_selected(mp, msgnum))
+			clear_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 public == -1, then only set the
+		** public/private bit for new sequences.
+		*/
+		if (is_readonly(mp))
+			make_seq_private(mp, i);
 		else
-			make_seq_public (mp, i);
+			make_seq_public(mp, i);
 	}
 
 	mp->msgflags |= SEQMOD;
@@ -105,27 +106,27 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero)
 
 
 /*
- * Delete message from sequence.
- *
- * If error, return 0, else return 1.
- */
+** Delete message from sequence.
+**
+** If error, return 0, else return 1.
+*/
 
 int
-seq_delmsg (struct msgs *mp, char *cp, int msgnum)
+seq_delmsg(struct msgs *mp, char *cp, int msgnum)
 {
 	int i;
 
-	if (!seq_nameok (cp))
+	if (!seq_nameok(cp))
 		return 0;
 
 	for (i = 0; mp->msgattrs[i]; i++) {
-		if (!strcmp (mp->msgattrs[i], cp)) {
-			clear_sequence (mp, i, msgnum);
+		if (strcmp(mp->msgattrs[i], cp)==0) {
+			clear_sequence(mp, i, msgnum);
 			mp->msgflags |= SEQMOD;
 			return 1;
 		}
 	}
 
-	advise (NULL, "no such sequence as %s", cp);
+	advise(NULL, "no such sequence as %s", cp);
 	return 0;
 }