Move code in CondToken() and get rid of a goto.

Submitted by:	Max Okumoto <okumoto@ucsd.edu> (7.243)

1 files changed, 11 insertions, 12 deletions

diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 0a76913..8106523 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -544,23 +544,22 @@ CondToken(Boolean doEval)
 			} else {
 				condExpr += 1;
 			}
+			while (isspace((unsigned char)*condExpr)) {
+				condExpr++;
+			}
+			if (*condExpr == '\0') {
+				Parse_Error(PARSE_WARNING,
+				    "Missing right-hand-side of operator");
+				goto error;
+			}
+			rhs = condExpr;
 			break;
+
 		  default:
 			op = "!=";
 			rhs = "0";
-
-			goto do_compare;
-		}
-		while (isspace((unsigned char)*condExpr)) {
-			condExpr++;
-		}
-		if (*condExpr == '\0') {
-			Parse_Error(PARSE_WARNING,
-			    "Missing right-hand-side of operator");
-			goto error;
+			break;
 		}
-		rhs = condExpr;
-  do_compare:
 		if (*rhs == '"') {
 			/*
 			 * Doing a string comparison. Only allow == and