===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/kbd.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- src/usr.bin/mg/kbd.c	2004/02/01 22:26:40	1.15
+++ src/usr.bin/mg/kbd.c	2005/04/03 02:09:28	1.16
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kbd.c,v 1.15 2004/02/01 22:26:40 vincent Exp $	*/
+/*	$OpenBSD: kbd.c,v 1.16 2005/04/03 02:09:28 db Exp $	*/
 
 /*
  *	Terminal independent keyboard handling.
@@ -41,7 +41,7 @@
 	else
 		use_metakey = !use_metakey;
 	ewprintf("Meta keys %sabled", use_metakey ? "en" : "dis");
-	return TRUE;
+	return (TRUE);
 }
 #endif /* DO_METAKEY */
 
@@ -58,7 +58,7 @@
 	else
 		bs_map = !bs_map;
 	ewprintf("Backspace mapping %sabled", bs_map ? "en" : "dis");
-	return TRUE;
+	return (TRUE);
 }
 #endif /* BSMAP */
 
@@ -119,7 +119,7 @@
 		*promptp = '\0';
 	}
 #endif /* !NO_DPROMPT */
-	return c;
+	return (c);
 }
 
 /*
@@ -132,7 +132,7 @@
 {
 	MAP_ELEMENT	*elec = &map->map_element[0];
 	MAP_ELEMENT	*last = &map->map_element[map->map_num];
-	PF		ret;
+	PF		 ret;
 
 	while (elec < last && c > elec->k_num)
 		elec++;
@@ -146,7 +146,7 @@
 	if (ret == NULL && newmap != NULL)
 		*newmap = elec->k_prefmap;
 
-	return ret;
+	return (ret);
 }
 
 int
@@ -162,12 +162,12 @@
 	key.k_count = 0;
 	while ((funct = doscan(curmap, (key.k_chars[key.k_count++] =
 	    getkey(TRUE)), &curmap)) == NULL)
-		/*nothing*/;
+		/* nothing */;
 #ifndef NO_MACRO
 	if (macrodef && macrocount < MAXMACRO)
 		macro[macrocount++].m_funct = funct;
 #endif /* !NO_MACRO */
-	return (*funct)(0, 1);
+	return ((*funct)(0, 1));
 }
 
 int
@@ -193,20 +193,20 @@
 					while ((fp = doscan(curmap,
 					    key.k_chars[key.k_count++] =
 					    getkey(TRUE), &curmap)) == NULL)
-						/*nothing*/;
+						/* nothing */;
 				if (fp != rescan) {
 #ifndef NO_MACRO
 					if (macrodef && macrocount <= MAXMACRO)
 						macro[macrocount - 1].m_funct
 						    = fp;
 #endif /* !NO_MACRO */
-					return (*fp)(f, n);
+					return ((*fp)(f, n));
 				}
 			}
 		}
 		/* try previous mode */
 		if (--mode < 0)
-			return ABORT;
+			return (ABORT);
 		curmap = curbp->b_modes[mode]->p_map;
 		for (i = 0; i < key.k_count; i++) {
 			if ((fp = doscan(curmap, (key.k_chars[i]), &curmap)) != NULL)
@@ -215,7 +215,7 @@
 		if (fp == NULL) {
 			while ((fp = doscan(curmap, key.k_chars[i++] =
 			    getkey(TRUE), &curmap)) == NULL)
-				/*nothing*/;
+				/* nothing */;
 			key.k_count = i;
 		}
 		if (fp != rescan && i >= key.k_count - 1) {
@@ -223,7 +223,7 @@
 			if (macrodef && macrocount <= MAXMACRO)
 				macro[macrocount - 1].m_funct = fp;
 #endif /* !NO_MACRO */
-			return (*fp)(f, n);
+			return ((*fp)(f, n));
 		}
 	}
 }
@@ -233,8 +233,7 @@
 {
 	KEYMAP	*curmap;
 	PF	 funct;
-	int	 c;
-	int	 nn = 4;
+	int	 c, nn = 4;
 
 	if (f & FFUNIV)
 		nn *= n;
@@ -242,9 +241,9 @@
 		key.k_chars[0] = c = getkey(TRUE);
 		key.k_count = 1;
 		if (c == '-')
-			return negative_argument(f, nn);
+			return (negative_argument(f, nn));
 		if (c >= '0' && c <= '9')
-			return digit_argument(f, nn);
+			return (digit_argument(f, nn));
 		curmap = curbp->b_modes[curbp->b_nmodes]->p_map;
 		while ((funct = doscan(curmap, c, &curmap)) == NULL) {
 			key.k_chars[key.k_count++] = c = getkey(TRUE);
@@ -258,7 +257,7 @@
 				macro[macrocount++].m_funct = funct;
 			}
 #endif /* !NO_MACRO */
-			return (*funct)(FFUNIV, nn);
+			return ((*funct)(FFUNIV, nn));
 		}
 		nn <<= 2;
 	}
@@ -296,7 +295,7 @@
 		macro[macrocount++].m_funct = funct;
 	}
 #endif /* !NO_MACRO */
-	return (*funct)(FFOTHARG, nn);
+	return ((*funct)(FFOTHARG, nn));
 }
 
 int
@@ -334,7 +333,7 @@
 		macro[macrocount++].m_funct = funct;
 	}
 #endif /* !NO_MACRO */
-	return (*funct)(FFNEGARG, nn);
+	return ((*funct)(FFNEGARG, nn));
 }
 
 /*
@@ -351,9 +350,9 @@
 	int	 count;
 
 	if (n < 0)
-		return FALSE;
+		return (FALSE);
 	if (n == 0)
-		return TRUE;
+		return (TRUE);
 	c = key.k_chars[key.k_count - 1];
 #ifndef NO_MACRO
 	if (macrodef && macrocount < MAXMACRO) {
@@ -367,7 +366,7 @@
 			if (maclcur->l_size < maclcur->l_used + n) {
 				if (lrealloc(maclcur, maclcur->l_used + n) ==
 				    FALSE)
-					return FALSE;
+					return (FALSE);
 			}
 			maclcur->l_used += n;
 			/* Copy in the new data */
@@ -377,7 +376,7 @@
 		} else {
 			macro[macrocount - 1].m_funct = insert;
 			if ((lp = lalloc(n)) == NULL)
-				return FALSE;
+				return (FALSE);
 			lp->l_bp = maclcur;
 			lp->l_fp = maclcur->l_fp;
 			maclcur->l_fp = lp;
@@ -392,7 +391,7 @@
 		do {
 			count = lnewline();
 		} while (--n && count == TRUE);
-		return count;
+		return (count);
 	}
 
 	/* overwrite mode */
@@ -401,13 +400,13 @@
 		while (curwp->w_doto < llength(curwp->w_dotp) && n--)
 			lputc(curwp->w_dotp, curwp->w_doto++, c);
 		if (n <= 0)
-			return TRUE;
+			return (TRUE);
 	}
-	return linsert(n, c);
+	return (linsert(n, c));
 }
 
 /*
- * This could be implemented as a keymap with everthing defined as self-insert.
+ * This could be implemented as a keymap with everything defined as self-insert.
  */
 int
 quote(int f, int n)
@@ -428,5 +427,5 @@
 		} else
 			ungetkey(c);
 	}
-	return selfinsert(f, n);
+	return (selfinsert(f, n));
 }