X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_convert.c;h=2837e0f4db74960ffc0b4cd2cfc202dd31a23304;hp=6e6acd7e8ce9bf27dd17381f7fc741c9d6ae4de3;hb=0f56dec07e0eda5042276a5e65cb51ea95c23ff9;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38

diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index 6e6acd7..2837e0f 100644
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -21,7 +21,7 @@
 #define FIRST 1
 #define LAST 2
 
-#define getnew(mp) ((mp)->hghmsg + 1)
+#define getbeyond(mp) ((mp)->hghmsg + 1)
 
 static int convdir;  /* convert direction */
 static char *delimp;  /* delimiter pointer */
@@ -57,10 +57,10 @@ m_convert(struct msgs *mp, char *name)
 
 	/*
 	** Check for special beyond sequence, which
-	** is valid only if ALLOW_NEW is set.
+	** is valid only if ALLOW_BEYOND is set.
 	*/
-	if ((mp->msgflags & ALLOW_NEW) && !strcmp(cp, seq_beyond)) {
-		if ((err = first = getnew(mp)) <= 0)
+	if ((mp->msgflags & ALLOW_BEYOND) && !strcmp(cp, seq_beyond)) {
+		if ((err = first = getbeyond(mp)) <= 0)
 			goto badmsg;
 		else
 			goto single;
@@ -175,11 +175,11 @@ single:
 		/*
 		** Single Message
 		**
-		** If ALLOW_NEW is set, then allow selecting of an
-		** empty slot.  If ALLOW_NEW is not set, then we
+		** If ALLOW_BEYOND is set, then allow selecting of an
+		** empty slot.  If ALLOW_BEYOND is not set, then we
 		** check if message is in-range and exists.
 		*/
-		if (mp->msgflags & ALLOW_NEW) {
+		if (mp->msgflags & ALLOW_BEYOND) {
 			set_select_empty(mp, first);
 		} else if (first > mp->hghmsg || first < mp->lowmsg
 				|| !does_exist(mp, first)) {
@@ -195,12 +195,12 @@ single:
 
 	/*
 	** Cycle through the range and select the messages
-	** that exist.  If ALLOW_NEW is set, then we also check
+	** that exist.  If ALLOW_BEYOND is set, then we also check
 	** if we are selecting an empty slot.
 	*/
 	for (; first <= last; first++) {
 		if (does_exist(mp, first) ||
-			((mp->msgflags & ALLOW_NEW) && is_select_empty(mp, first))) {
+			((mp->msgflags & ALLOW_BEYOND) && is_select_empty(mp, first))) {
 			if (!is_selected(mp, first)) {
 				set_selected(mp, first);
 				mp->numsel++;
@@ -250,7 +250,7 @@ m_conv(struct msgs *mp, char *str, int call)
 			return i;
 		else if (*delimp || call == LAST)
 			return mp->hghmsg + 1;
-		else if (mp->msgflags & ALLOW_NEW)
+		else if (mp->msgflags & ALLOW_BEYOND)
 			return BADRNG;
 		else
 			return BADNUM;
@@ -269,12 +269,12 @@ m_conv(struct msgs *mp, char *str, int call)
 	delimp = cp;
 
 	if (!strcmp(buf, seq_first))
-		return (mp->hghmsg || !(mp->msgflags & ALLOW_NEW)
+		return (mp->hghmsg || !(mp->msgflags & ALLOW_BEYOND)
 				? mp->lowmsg : BADMSG);
 
 	if (!strcmp(buf, seq_last)) {
 		convdir = -1;
-		return (mp->hghmsg || !(mp->msgflags & ALLOW_NEW) ? mp->hghmsg : BADMSG);
+		return (mp->hghmsg || !(mp->msgflags & ALLOW_BEYOND) ? mp->hghmsg : BADMSG);
 	}
 
 	if (!strcmp(buf, seq_cur))