X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=4e8234603be2f6f85a61d1fe69fc06630d353651;hp=280b5979e34c2b8580eeca8f3eb20d204f30929b;hb=6056c16bf5053addba1fec6ff821a0f435f0b3da;hpb=02523045dcb28c8f6ad794a84e32beff214be424

diff --git a/rmac.c b/rmac.c
index 280b597..4e82346 100644
--- a/rmac.c
+++ b/rmac.c
@@ -171,6 +171,44 @@ void DisplayVersion(void)
 }
 
 
+//
+// Parse optimisation options
+//
+int ParseOptimization(char * optstring)
+{
+	int onoff = 0;
+
+	if (*optstring == '+')
+		onoff = 1;
+	else if (*optstring != '~')
+		return ERROR;
+
+	if ((optstring[2] == 'a' || optstring[2] == 'A')
+		&& (optstring[3] == 'l' || optstring[3] == 'L')
+		&& (optstring[4] == 'l' || optstring[4] == 'L'))
+	{
+		memset(optim_flags, onoff, OPT_COUNT * sizeof(int));
+		return OK;
+	}
+	else if (optstring[1] == 'o' || optstring[1] == 'O') // Turn on specific optimisation
+	{
+		int opt_no = atoi(&optstring[2]);
+
+		if ((opt_no >= 0) && (opt_no < OPT_COUNT))
+		{
+			optim_flags[opt_no] = onoff;
+			return OK;
+		}
+		else
+			return ERROR;
+	}
+	else
+	{
+		return ERROR;
+	}
+}
+
+
 // 
 // Process command line arguments and do an assembly
 //
@@ -409,28 +447,7 @@ int Process(int argc, char ** argv)
 		}
 		else if (*argv[argno] == '+' || *argv[argno] == '~')
 		{
-			int onoff = 0;
-			if (*argv[argno] == '+')
-				onoff = 1;
-			if ((argv[argno][2] == 'a' || argv[argno][2] == 'A') &&
-				(argv[argno][3] == 'l' || argv[argno][3] == 'L') &&
-				(argv[argno][4] == 'l' || argv[argno][4] == 'L'))
-				memset(optim_flags, onoff, OPT_COUNT * sizeof(int));
-			else if (argv[argno][1] == 'o' || argv[argno][1] == 'O') // Turn on specific optimisation
-			{
-				int opt_no = atoi(&argv[argno][2]);
-				if (opt_no>=0 && opt_no<OPT_COUNT)
-					optim_flags[opt_no]=onoff;
-				else
-				{
-				    DisplayVersion();
-					printf("Unknown switch: %s\n\n", argv[argno]);
-					DisplayHelp();
-					errcnt++;
-					break;
-				}
-			}
-			else
+			if (ParseOptimization(argv[argno]) != OK)
 			{
 				DisplayVersion();
 				printf("Unknown switch: %s\n\n", argv[argno]);