Create/use ar_type() to eliminate some copy/pasta in AR/ARS parsing logic

src/sbbs3/ars.c

@@ -21,19 +21,9 @@
 
 #include "ars_defs.h"
 
-static BOOL ar_string_arg(int artype)
+static inline BOOL ar_string_arg(int artype)
 {
-	switch(artype) {
-		case AR_SUBCODE:
-		case AR_DIRCODE:
-		case AR_SHELL:
-		case AR_PROT:
-		case AR_HOST:
-		case AR_IP:
-		case AR_USERNAME:
-			return TRUE;	/* These ARS Keywords expect a string argument */
-	}
-	return FALSE;
+	return ar_type(artype) == AR_STRING;
 }
 
 /* Converts ASCII ARS string into binary ARS buffer */
@@ -490,28 +480,7 @@ uchar* arstr(ushort* count, const char* str, scfg_t* cfg, uchar* ar_buf)
 
 			if(n!=i)		/* one of the above */
 			{
-				arg_expected=TRUE;
-				switch(artype) {
-					case AR_RIP:
-					case AR_ANSI:
-					case AR_PETSCII:
-					case AR_ASCII:
-					case AR_UTF8:
-					case AR_CP437:
-					case AR_DOS:
-					case AR_OS2:
-					case AR_UNIX:
-					case AR_LINUX:
-					case AR_WIN32:
-					case AR_LOCAL:
-					case AR_ACTIVE:
-					case AR_INACTIVE:
-					case AR_DELETED:
-					case AR_EXPERT:
-					case AR_SYSOP:
-					case AR_GUEST:
-					case AR_QNODE:
-					case AR_QUIET:
+				if(ar_type(artype) == AR_BOOL) {
 					/* Boolean (No arguments) */
 					if(not)
 						ar[j++]=AR_NOT;
@@ -519,7 +488,6 @@ uchar* arstr(ushort* count, const char* str, scfg_t* cfg, uchar* ar_buf)
 					ar[j++]=artype;
 					artype=AR_INVALID;
 					arg_expected=FALSE;
-						break;
 				}
 				continue;
 			}

src/sbbs3/ars_defs.h

@@ -118,4 +118,47 @@ enum {                              /* Access requirement binaries */
 	,AR_USERNAME
     };
 
+enum ar_type {
+	 AR_BOOL
+	,AR_NUM
+	,AR_STRING
+};
+
+static inline enum ar_type ar_type(int artype)
+{
+	switch(artype) {
+		case AR_RIP:
+		case AR_WIP:
+		case AR_ANSI:
+		case AR_PETSCII:
+		case AR_ASCII:
+		case AR_UTF8:
+		case AR_CP437:
+		case AR_DOS:
+		case AR_OS2:
+		case AR_UNIX:
+		case AR_LINUX:
+		case AR_WIN32:
+		case AR_LOCAL:
+		case AR_ACTIVE:
+		case AR_INACTIVE:
+		case AR_DELETED:
+		case AR_EXPERT:
+		case AR_SYSOP:
+		case AR_GUEST:
+		case AR_QNODE:
+		case AR_QUIET:
+			return AR_BOOL;
+		case AR_SUBCODE:
+		case AR_DIRCODE:
+		case AR_SHELL:
+		case AR_PROT:
+		case AR_HOST:
+		case AR_IP:
+		case AR_USERNAME:
+			return AR_STRING;
+	}
+	return AR_NUM;
+}
+
 #endif		/* Don't add anything after this line */

src/sbbs3/chk_ar.cpp

@@ -70,33 +70,8 @@ bool sbbs_t::ar_exp(const uchar **ptrptr, user_t* user, client_t* client)
 		}
 
 		artype=(**ptrptr);
-		switch(artype) {
-			case AR_ANSI:				/* No arguments */
-			case AR_PETSCII:
-			case AR_ASCII:
-			case AR_UTF8:
-			case AR_CP437:
-			case AR_RIP:
-			case AR_WIP:
-			case AR_LOCAL:
-			case AR_EXPERT:
-			case AR_SYSOP:
-			case AR_GUEST:
-			case AR_QNODE:
-			case AR_QUIET:
-			case AR_OS2:
-			case AR_DOS:
-			case AR_WIN32:
-			case AR_UNIX:
-			case AR_LINUX:
-			case AR_ACTIVE:
-			case AR_INACTIVE:
-			case AR_DELETED:
-				break;
-			default:
+		if(ar_type(artype) != AR_BOOL)
 			(*ptrptr)++;
-				break; 
-		}
 
 		n=(**ptrptr);
 		i=(*(short *)*ptrptr);

src/sbbs3/userdat.c

@@ -1993,33 +1993,8 @@ static bool ar_exp(scfg_t* cfg, uchar **ptrptr, user_t* user, client_t* client)
 		}
 
 		artype=(**ptrptr);
-		switch(artype) {
-			case AR_ANSI:				/* No arguments */
-			case AR_PETSCII:
-			case AR_ASCII:
-			case AR_UTF8:
-			case AR_CP437:
-			case AR_RIP:
-			case AR_WIP:
-			case AR_LOCAL:
-			case AR_EXPERT:
-			case AR_SYSOP:
-			case AR_GUEST:
-			case AR_QNODE:
-			case AR_QUIET:
-			case AR_OS2:
-			case AR_DOS:
-			case AR_WIN32:
-			case AR_UNIX:
-			case AR_LINUX:
-			case AR_ACTIVE:
-			case AR_INACTIVE:
-			case AR_DELETED:
-				break;
-			default:
+		if(ar_type(artype) != AR_BOOL)
 			(*ptrptr)++;
-				break;
-		}
 
 		n=(**ptrptr);
 		i=(*(short *)*ptrptr);