some rather mechanical KNF, now that style(9) clarified on the status

of sizeof() as a function-like unary operator; use parenthesēs around
sizeof and return args consistently too

eval.c

@@ -22,7 +22,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.57 2009/05/16 18:40:05 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.58 2009/06/08 20:06:45 tg Exp $");
 
 #ifdef MKSH_SMALL
 #define MKSH_NOPWNAM
@@ -115,7 +115,7 @@ substitute(const char *cp, int f)
 		internal_errorf("substitute");
 	source = sold;
 	afree(s, ATEMP);
-	return evalstr(yylval.cp, f);
+	return (evalstr(yylval.cp, f));
 }
 
 /*
@@ -137,7 +137,7 @@ eval(const char **ap, int f)
 	while (*ap != NULL)
 		expand(*ap++, &w, f);
 	XPput(w, NULL);
-	return (char **) XPclose(w) + 1;
+	return ((char **)XPclose(w) + 1);
 }
 
 /*
@@ -346,7 +346,7 @@ expand(const char *cp,	/* input word */
 					if (!st->next) {
 						SubType *newst;
 
-						newst = alloc(sizeof (SubType), ATEMP);
+						newst = alloc(sizeof(SubType), ATEMP);
 						newst->next = NULL;
 						newst->prev = st;
 						st->next = newst;
@@ -916,7 +916,7 @@ varsub(Expand *xp, const char *sp, const char *word,
 	struct tbl *vp;
 
 	if (sp[0] == '\0')	/* Bad variable name */
-		return -1;
+		return (-1);
 
 	xp->var = NULL;
 
@@ -926,7 +926,7 @@ varsub(Expand *xp, const char *sp, const char *word,
 
 		/* Can't have any modifiers for ${#...} */
 		if (*word != CSUBST)
-			return -1;
+			return (-1);
 		sp++;
 		/* Check for size of array */
 		if ((p = cstrchr(sp, '[')) && (p[1] == '*' || p[1] == '@') &&
@@ -951,7 +951,7 @@ varsub(Expand *xp, const char *sp, const char *word,
 			errorf("%s: parameter not set", sp);
 		*stypep = 0; /* unqualified variable/string substitution */
 		xp->str = shf_smprintf("%lu", (unsigned long)c);
-		return XSUB;
+		return (XSUB);
 	}
 
 	/* Check for qualifiers in word part */
@@ -982,9 +982,9 @@ varsub(Expand *xp, const char *sp, const char *word,
 			slen += 2;
 		}
 	} else if (stype)	/* : is not ok */
-		return -1;
+		return (-1);
 	if (!stype && *word != CSUBST)
-		return -1;
+		return (-1);
 	*stypep = stype;
 	*slenp = slen;
 
@@ -994,7 +994,7 @@ varsub(Expand *xp, const char *sp, const char *word,
 		case '=':	/* can't assign to a vector */
 		case '%':	/* can't trim a vector (yet) */
 		case '#':
-			return -1;
+			return (-1);
 		}
 		if (e->loc->argc == 0) {
 			xp->str = null;
@@ -1016,7 +1016,7 @@ varsub(Expand *xp, const char *sp, const char *word,
 			case '%':	/* can't trim a vector (yet) */
 			case '#':
 			case '?':
-				return -1;
+				return (-1);
 			}
 			XPinit(wv, 32);
 			vp = global(arrayname(sp));
@@ -1040,7 +1040,7 @@ varsub(Expand *xp, const char *sp, const char *word,
 			/* Can't assign things like $! or $1 */
 			if ((stype & 0x7f) == '=' &&
 			    ctype(*sp, C_VAR1 | C_DIGIT))
-				return -1;
+				return (-1);
 			xp->var = global(sp);
 			xp->str = str_val(xp->var);
 			state = XSUB;
@@ -1056,7 +1056,7 @@ varsub(Expand *xp, const char *sp, const char *word,
 	if (Flag(FNOUNSET) && xp->str == null &&
 	    (ctype(c, C_SUBOP2) || (state != XBASE && c != '+')))
 		errorf("%s: parameter not set", sp);
-	return state;
+	return (state);
 }
 
 /*
@@ -1077,7 +1077,7 @@ comsub(Expand *xp, const char *cp)
 	source = sold;
 
 	if (t == NULL)
-		return XBASE;
+		return (XBASE);
 
 	if (t != NULL && t->type == TCOM && /* $(<file) */
 	    *t->args == NULL && *t->vars == NULL && t->ioact != NULL) {
@@ -1108,7 +1108,7 @@ comsub(Expand *xp, const char *cp)
 	}
 
 	xp->u.shf = shf;
-	return XCOM;
+	return (XCOM);
 }
 
 /*
@@ -1127,7 +1127,7 @@ trimsub(char *str, char *pat, int how)
 			c = *p; *p = '\0';
 			if (gmatchx(str, pat, false)) {
 				*p = c;
-				return p;
+				return (p);
 			}
 			*p = c;
 		}
@@ -1137,7 +1137,7 @@ trimsub(char *str, char *pat, int how)
 			c = *p; *p = '\0';
 			if (gmatchx(str, pat, false)) {
 				*p = c;
-				return p;
+				return (p);
 			}
 			*p = c;
 		}
@@ -1157,7 +1157,7 @@ trimsub(char *str, char *pat, int how)
 		break;
 	}
 
-	return str;		/* no match, return string */
+	return (str);		/* no match, return string */
 }
 
 /*
@@ -1175,7 +1175,7 @@ glob(char *cp, XPtrV *wp, int markdirs)
 		XPput(*wp, debunk(cp, cp, strlen(cp) + 1));
 	else
 		qsort(XPptrv(*wp) + oldsize, XPsize(*wp) - oldsize,
-		    sizeof (void *), xstrcmp);
+		    sizeof(void *), xstrcmp);
 }
 
 #define GF_NONE		0
@@ -1197,7 +1197,7 @@ glob_str(char *cp, XPtrV *wp, int markdirs)
 	globit(&xs, &xp, cp, wp, markdirs ? GF_MARKDIR : GF_NONE);
 	Xfree(xs, xp);
 
-	return XPsize(*wp) - oldsize;
+	return (XPsize(*wp) - oldsize);
 }
 
 static void
@@ -1337,7 +1337,7 @@ debunk(char *dp, const char *sp, size_t dlen)
 
 	if ((s = cstrchr(sp, MAGIC))) {
 		if (s - sp >= (ssize_t)dlen)
-			return dp;
+			return (dp);
 		memcpy(dp, sp, s - sp);
 		for (d = dp + (s - sp); *s && (d - dp < (ssize_t)dlen); s++)
 			if (!ISMAGIC(*s) || !(*++s & 0x80) ||
@@ -1353,7 +1353,7 @@ debunk(char *dp, const char *sp, size_t dlen)
 		*d = '\0';
 	} else if (dp != sp)
 		strlcpy(dp, sp, dlen);
-	return dp;
+	return (dp);
 }
 
 /* Check if p is an unquoted name, possibly followed by a / or :.  If so
@@ -1390,7 +1390,7 @@ maybe_expand_tilde(const char *p, XString *dsp, char **dpp, int isassign)
 		*dpp = dp;
 		r = p;
 	}
-	return r;
+	return (r);
 }
 
 /*
@@ -1436,11 +1436,11 @@ homedir(char *name)
 
 		pw = getpwnam(name);
 		if (pw == NULL)
-			return NULL;
+			return (NULL);
 		strdupx(ap->val.s, pw->pw_dir, APERM);
 		ap->flag |= DEFINED|ISSET|ALLOC;
 	}
-	return ap->val.s;
+	return (ap->val.s);
 }
 #endif