tet: Fix "ambiguous else" warnings.

Example:
    maperr.c: In function ‘tet_maperrno’:
    /home/aaron/src/x/xtest/src/tet3/dtet2lib/maperr.c|61| warning: suggest explicit braces to avoid ambiguous ‘else’

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>

9 files changed, 28 insertions, 18 deletions

diff --git a/src/tet3/dtet2lib/maperr.c b/src/tet3/dtet2lib/maperr.c
index fc29338e..1d6ee6cc 100644
--- a/src/tet3/dtet2lib/maperr.c
+++ b/src/tet3/dtet2lib/maperr.c
@@ -57,15 +57,16 @@ register int errnum;
 {
 	register struct errmap *ep, *ee;
 
-	for (ep = tet_errmap, ee = &tet_errmap[tet_Nerrmap]; ep < ee; ep++)
-		if (errnum == ep->em_errno)
+	for (ep = tet_errmap, ee = &tet_errmap[tet_Nerrmap]; ep < ee; ep++) {
+		if (errnum == ep->em_errno) {
 			if (ep->em_repcode)
 				return(ep->em_repcode);
 			else
 				break;
+		}
+	}
 
 	error(errnum, ep < ee ? ep->em_errname : tet_errname(errnum),
 		"has no equivalent DTET message reply code");
 	return(ER_ERR);
 }
-
diff --git a/src/tet3/dtet2lib/unmaperr.c b/src/tet3/dtet2lib/unmaperr.c
index 15e28d07..dd63b6ff 100644
--- a/src/tet3/dtet2lib/unmaperr.c
+++ b/src/tet3/dtet2lib/unmaperr.c
@@ -56,8 +56,8 @@ register int repcode;
 {
 	register struct errmap *ep, *ee;
 
-	for (ep = tet_errmap, ee = &tet_errmap[tet_Nerrmap]; ep < ee; ep++)
-		if (repcode == ep->em_repcode)
+	for (ep = tet_errmap, ee = &tet_errmap[tet_Nerrmap]; ep < ee; ep++) {
+		if (repcode == ep->em_repcode) {
 			if (ep->em_errno >= 0)
 				return(ep->em_errno);
 			else {
@@ -65,7 +65,8 @@ register int repcode;
 					"has no equivalent local errno value");
 				break;
 			}
+		}
+	}
 
 	return(0);
 }
-
diff --git a/src/tet3/tcc/config.c b/src/tet3/tcc/config.c
index a6f928bc..49855e30 100644
--- a/src/tet3/tcc/config.c
+++ b/src/tet3/tcc/config.c
@@ -1525,12 +1525,14 @@ struct cfstack *stp;
 	for (;;) {
 		p = tet_equindex(*cp);
 		ASSERT(p);
-		for (p += 1; *p; p++)
-			if (*p == '$')
+		for (p += 1; *p; p++) {
+			if (*p == '$') {
 				if (*(p + 1) == '$')
 					p++;
 				else
 					break;
+			}
+		}
 		if (!*p)
 			break;
 		s = rstrstore(*cp);
@@ -1576,12 +1578,14 @@ struct cfstack *stp;
 	** again, a $$ is left in place for now
 	*/
 	head = value;
-	for (p = value; *p; p++)
-		if (*p == '$')
+	for (p = value; *p; p++) {
+		if (*p == '$') {
 			if (*(p + 1) == '$')
 				p++;
 			else
 				break;
+		}
+	}
 	ASSERT(*p == '$');
 	*p++ = '\0';
 	if (*p == '{') {
diff --git a/src/tet3/tcc/proctc.c b/src/tet3/tcc/proctc.c
index ec8d32f3..40280052 100644
--- a/src/tet3/tcc/proctc.c
+++ b/src/tet3/tcc/proctc.c
@@ -109,8 +109,9 @@ register struct proctab *prp;
 		tet_l2a(prp->pr_scen->sc_ref), prtccmode(prp->pr_currmode));
 
 #ifndef NOTRACE
-	if ((tcc_modes & TCC_RESUME) && !resume_found)
+	if ((tcc_modes & TCC_RESUME) && !resume_found) {
 		TRACE1(tet_Texec, 4, "RESUME point not yet found");
+	}
 #endif
 
 	/* step on to the next processing mode first time through */
diff --git a/src/tet3/tcc/resdir.c b/src/tet3/tcc/resdir.c
index 8f4bc0dc..9e93b073 100644
--- a/src/tet3/tcc/resdir.c
+++ b/src/tet3/tcc/resdir.c
@@ -110,8 +110,9 @@ char *iopt, *cwd;
 
 char *resdirname()
 {
-	if (results_dir)
+	if (results_dir) {
 		ASSERT(isabspathloc(results_dir));
+	}
 	return(results_dir);
 }
 
diff --git a/src/tet3/tcc/scen2.c b/src/tet3/tcc/scen2.c
index c6d6bb1a..0615c119 100644
--- a/src/tet3/tcc/scen2.c
+++ b/src/tet3/tcc/scen2.c
@@ -115,11 +115,12 @@ int proc2sclist()
 	TRACE1(tet_Tscen, 1, "proc2sclist(): building the scenario tree");
 	skip = 0;
 	while ((ep = scpop(&sclist)) != (struct scentab *) 0) {
-		if (skip)
+		if (skip) {
 			if (ep->sc_type == SC_SCENARIO)
 				skip = 0;
 			else
 				continue;
+		}
 		ASSERT(ep->sc_type == SC_SCENARIO);
 		if (find2scen(ep->sc_scenario)) {
 			scenerror(ep->sc_scenario, "is multiply defined",
diff --git a/src/tet3/tcc/scentab.c b/src/tet3/tcc/scentab.c
index 4881fc50..35a3dbac 100644
--- a/src/tet3/tcc/scentab.c
+++ b/src/tet3/tcc/scentab.c
@@ -308,8 +308,9 @@ char *text;
 	static char null[] = "NULL";
 	register int n;
 
-	if (text)
+	if (text) {
 		TRACE3(flag, level, "%s %s", text, tet_i2x(ep));
+	}
 
 	if (!ep || ep->sc_magic != SC_MAGIC)
 		return;
diff --git a/src/tet3/tcc/tcc.c b/src/tet3/tcc/tcc.c
index 094445e5..29a5bf24 100644
--- a/src/tet3/tcc/tcc.c
+++ b/src/tet3/tcc/tcc.c
@@ -307,7 +307,7 @@ char **argv;
 	}
 
 	/* pick up the name of the old journal file in rerun or resume mode */
-	if (tcc_modes & (TCC_RERUN | TCC_RESUME))
+	if (tcc_modes & (TCC_RERUN | TCC_RESUME)) {
 		if (--argc > 0) {
 			fullpath(cwd, *++argv, fname, sizeof fname, 0);
 			old_journal_file = rstrstore(fname);
@@ -321,6 +321,7 @@ char **argv;
 				tet_progname);
 			errors++;
 		}
+	}
 
 	/* exit now if there have been command-line syntax errors */
 	if (errors)
diff --git a/src/tet3/tcclib/mktmpdir.c b/src/tet3/tcclib/mktmpdir.c
index f5db0e8b..b24e3a33 100644
--- a/src/tet3/tcclib/mktmpdir.c
+++ b/src/tet3/tcclib/mktmpdir.c
@@ -130,7 +130,7 @@ char *subdir;
 	TRACE2(Ttcclib, 6, "tcf_mktmpdir(): try \"%s\"", subdir);
 
 	/* attempt to make the directory */
-	if (tet_mkdir(subdir, MODEANY) < 0)
+	if (tet_mkdir(subdir, MODEANY) < 0) {
 		if (errno == EEXIST)
 			return(0);
 		else {
@@ -140,10 +140,9 @@ char *subdir;
 			errno = errsave;
 			return(rc);
 		}
-
+	}
 
 	/* here if the directory could be created successfully */
 	TRACE2(Ttcclib, 4, "tcf_mktmpdir(): return \"%s\"", subdir);
 	return(1);
 }
-