m4: Misc style fixes

MFC after:	1 week

Reviewed by:	fuz
Differential Revision:	https://reviews.freebsd.org/D55794

usr.bin/m4/expr.c

@@ -32,7 +32,7 @@ int
 yyerror(const char *msg)
 {
 	fprintf(stderr, "m4: %s in expr %s\n", msg, copy_toeval);
-	return(0);
+	return 0;
 }
 
 int

usr.bin/m4/look.c

@@ -137,8 +137,8 @@ static ndptr
 create_entry(const char *name)
 {
 	const char *end = NULL;
-	unsigned int i;
 	ndptr n;
+	unsigned int i;
 
 	i = ohash_qlookupi(&macros, name, &end);
 	n = ohash_find(&macros, i);
@@ -156,6 +156,7 @@ void
 macro_define(const char *name, const char *defn)
 {
 	ndptr n = create_entry(name);
+
 	if (n->d != NULL) {
 		if (n->d->defn != null)
 			free_definition(n->d->defn);
@@ -183,6 +184,7 @@ void
 macro_undefine(const char *name)
 {
 	ndptr n = lookup(name);
+
 	if (n != NULL) {
 		struct macro_definition *r, *r2;
 
@@ -306,10 +308,10 @@ static int
 string_in_use(const char *ptr)
 {
 	int i;
-	for (i = 0; i <= sp; i++) {
+
+	for (i = 0; i <= sp; i++)
 		if (sstack[i] == STORAGE_MACRO && mstack[i].sstr == ptr)
 			return 1;
-		}
 	return 0;
 }
 
@@ -336,4 +338,3 @@ free_definition(char *ptr)
 	else
 		free(ptr);
 }
-

usr.bin/m4/main.c

@@ -388,8 +388,7 @@ macro(void)
 							CHRSAVE(l);
 					}
 				}
-			}
+			} while (nlpar != 0);
-			while (nlpar != 0);
 		} else if (sp < 0 && LOOK_AHEAD(t, scommt)) {
 			reallyoutputstr(scommt);
 

usr.bin/m4/misc.c

@@ -135,8 +135,7 @@ pbnumbase(int n, int base, int d)
 	do {
 		pushback(digits[num % base]);
 		printed++;
-	}
+	} while ((num /= base) > 0);
-	while ((num /= base) > 0);
 
 	while (printed++ < d)
 		pushback('0');
@@ -153,8 +152,7 @@ pbunsigned(unsigned long n)
 {
 	do {
 		pushback(n % 10 + '0');
-	}
+	} while ((n /= 10) > 0);
-	while ((n /= 10) > 0);
 }
 
 void
@@ -186,9 +184,9 @@ enlarge_strspace(void)
 	memcpy(newstrspace, strspace, strsize/2);
 	for (i = 0; i <= sp; i++)
 		if (sstack[i] == STORAGE_STRSPACE)
-			mstack[i].sstr = (mstack[i].sstr - strspace)
+			mstack[i].sstr = (mstack[i].sstr - strspace) +
-			    + newstrspace;
+			    newstrspace;
-	ep = (ep-strspace) + newstrspace;
+	ep = (ep - strspace) + newstrspace;
 	free(strspace);
 	strspace = newstrspace;
 	endest = strspace + strsize;