From fdfd7a2ab8c7de2f430b499cf8da283ef0471e4a Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Tue, 1 Mar 2016 20:28:33 +0000
Subject: [PATCH] collapse if, also to avoid braces warning

---
 var.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/var.c b/var.c
index c07d7cf..98c0a2e 100644
--- a/var.c
+++ b/var.c
@@ -28,7 +28,7 @@
 #include <sys/sysctl.h>
 #endif
 
-__RCSID("$MirOS: src/bin/mksh/var.c,v 1.200 2016/03/01 20:06:15 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/var.c,v 1.201 2016/03/01 20:28:33 tg Exp $");
 
 /*-
  * Variables
@@ -833,9 +833,8 @@ typeset(const char *var, uint32_t set, uint32_t clr, int field, int base)
 
 			if (!(c = (unsigned char)qval[0]))
 				goto nameref_empty;
-			else if (ksh_isdigit(c))
-				if (getn(qval, &c))
-					goto nameref_rhs_checked;
+			else if (ksh_isdigit(c) && getn(qval, &c))
+				goto nameref_rhs_checked;
 			else if (qval[1] == '\0') switch (c) {
 			case '$':
 			case '!':