X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_convert.c;h=f113366c007c68624b52e5806ef4a4ff87b026d4;hp=b535fe3a9b20b4e26d13fb02803bea83d3b2f69a;hb=5ba9c2f13fedf1d8d6ed907ef1f505616290efaa;hpb=99e89d0fcc69e509924b0a14a56e10d15721ccb0

diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index b535fe3..f113366 100644
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -10,6 +10,7 @@
 /* FIXME: This code needs rework! Rewrite as a parser? */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 /*
 ** error codes for sequence
@@ -79,7 +80,7 @@ m_convert(struct msgs *mp, char *name)
 	** ALLOW_BEYOND is set, and can appear only on its own.
 	** Also, it is available in any folder.
 	*/
-	if ((mp->msgflags & ALLOW_BEYOND) && !strcmp(cp, seq_beyond)) {
+	if ((mp->msgflags & ALLOW_BEYOND) && strcmp(cp, seq_beyond)==0) {
 		addtosel(mp, getbeyond(mp));
 		return 1;
 	}
@@ -87,7 +88,7 @@ m_convert(struct msgs *mp, char *name)
 	/*
 	** Handle the special all sequence: replace `a' with `f-l'
 	*/
-	if (!strcmp(cp, seq_all)) {
+	if (strcmp(cp, seq_all)==0) {
 		cp = concat(seq_first, "-", seq_last, NULL);
 	}
 
@@ -203,7 +204,7 @@ rangerr:
 		*/
 		if (first > mp->hghmsg || first < mp->lowmsg ||
 				!does_exist(mp, first)) {
-			if (!strcmp(name, seq_cur))
+			if (strcmp(name, seq_cur)==0)
 				advise(NULL, "no current message");
 			else
 				/* this case seems to never be reached */
@@ -248,8 +249,8 @@ badelim:
 static int
 m_conv(struct msgs *mp, char *str, int call)
 {
-	register int i;
-	register unsigned char *cp, *bp;
+	int i;
+	unsigned char *cp, *bp;
 	unsigned char buf[16];  /* for reserved sequence name */
 
 	convdir = 1;
@@ -272,7 +273,7 @@ m_conv(struct msgs *mp, char *str, int call)
 			return BADNUM;
 	}
 
-	for (bp = buf; isalpha(*cp) && (bp - buf < sizeof(buf) - 1); ) {
+	for (bp = buf; isalpha(*cp) && (bp - buf < (int)sizeof(buf) - 1); ) {
 		*bp++ = *cp++;
 	}
 	*bp++ = '\0';
@@ -333,16 +334,16 @@ m_conv(struct msgs *mp, char *str, int call)
 static int
 attr(struct msgs *mp, char *cp)
 {
-	register unsigned char *dp;
+	unsigned char *dp;
 	char *bp = NULL;
-	register int i, j;
+	int i, j;
 	int found;
 	int inverted = 0;
 	int range = 0;  /* no range */
 	int first = 0;
 
 	/* hack for "c-..." */
-	if (!strcmp(cp, seq_cur))
+	if (strcmp(cp, seq_cur)==0)
 		return 0;
 	/* "c:..." -- this code need to be rewritten... */
 	if (strncmp(seq_cur, cp, strlen(seq_cur))==0 &&
@@ -354,7 +355,7 @@ attr(struct msgs *mp, char *cp)
 	if (!(dp = context_find(nsequence))) {
 		dp = seq_neg;  /* use default */
 	}
-	if (dp && *dp && isprefix(dp, cp)) {
+	if (*dp && strncmp(cp, dp, strlen(dp))==0) {
 		inverted = 1;
 		cp += strlen(dp);
 	}
@@ -375,17 +376,17 @@ attr(struct msgs *mp, char *cp)
 		** seq:l
 		*/
 		if (isalpha(*dp)) {
-			if (!strcmp(dp, seq_prev)) {
+			if (strcmp(dp, seq_prev)==0) {
 				convdir = -1;
 				first = (mp->curmsg > 0) && (mp->curmsg <= mp->hghmsg)
 					? mp->curmsg - 1 : mp->hghmsg;
-			} else if (!strcmp(dp, seq_next)) {
+			} else if (strcmp(dp, seq_next)==0) {
 				convdir = 1;
 				first = (mp->curmsg >= mp->lowmsg)
 					? mp->curmsg + 1 : mp->lowmsg;
-			} else if (!strcmp(dp, seq_first)) {
+			} else if (strcmp(dp, seq_first)==0) {
 				convdir = 1;
-			} else if (!strcmp(dp, seq_last)) {
+			} else if (strcmp(dp, seq_last)==0) {
 				convdir = -1;
 			} else
 				return BADLST;