1 files changed, 8 insertions, 20 deletions
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index ab171c1..dca0604 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -52,8 +48,7 @@ __FBSDID("$FreeBSD$");
  * Assign a value to a variable.
  */
 void
-assign(name, value)
-	const char *name, *value;
+assign(const char *name, const char *value)
 {
 	struct var *vp;
 	int h;
@@ -77,8 +72,7 @@ assign(name, value)
  * Thus, we cannot free same!
  */
 void
-vfree(cp)
-	char *cp;
+vfree(char *cp)
 {
 	if (*cp != '\0')
 		(void)free(cp);
@@ -90,8 +84,7 @@ vfree(cp)
  */
 
 char *
-vcopy(str)
-	const char *str;
+vcopy(const char *str)
 {
 	char *new;
 	unsigned len;
@@ -111,8 +104,7 @@ vcopy(str)
  */
 
 char *
-value(name)
-	const char *name;
+value(const char *name)
 {
 	struct var *vp;
 
@@ -127,8 +119,7 @@ value(name)
  */
 
 struct var *
-lookup(name)
-	const char *name;
+lookup(const char *name)
 {
 	struct var *vp;
 
@@ -143,8 +134,7 @@ lookup(name)
  */
 
 struct grouphead *
-findgroup(name)
-	char name[];
+findgroup(char name[])
 {
 	struct grouphead *gh;
 
@@ -158,8 +148,7 @@ findgroup(name)
  * Print a group out on stdout
  */
 void
-printgroup(name)
-	char name[];
+printgroup(char name[])
 {
 	struct grouphead *gh;
 	struct group *gp;
@@ -179,8 +168,7 @@ printgroup(name)
  * the variable or group hash table.
  */
 int
-hash(name)
-	const char *name;
+hash(const char *name)
 {
 	int h = 0;