[src/trunk]: src/sbin Convert to C89 function definitions

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9b5a39ebc6d7
branches:  trunk
changeset: 778255:9b5a39ebc6d7
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Mar 20 18:50:30 2012 +0000

description:
Convert to C89 function definitions

diffstat:

 sbin/cgdconfig/utils.c           |   6 ++--
 sbin/fsck_ffs/quota2.c           |   4 +-
 sbin/fsdb/fsdb.c                 |  59 ++++++++++++++++++---------------------
 sbin/init/init.c                 |   6 ++--
 sbin/mount_portal/puffs_portal.c |   6 ++--
 sbin/wsconsctl/display.c         |   5 +--
 6 files changed, 41 insertions(+), 45 deletions(-)

diffs (truncated from 375 to 300 lines):

diff -r 45992456a223 -r 9b5a39ebc6d7 sbin/cgdconfig/utils.c
--- a/sbin/cgdconfig/utils.c    Tue Mar 20 18:42:28 2012 +0000
+++ b/sbin/cgdconfig/utils.c    Tue Mar 20 18:50:30 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: utils.c,v 1.20 2009/04/11 07:40:37 lukem Exp $ */
+/* $NetBSD: utils.c,v 1.21 2012/03/20 18:50:30 matt Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: utils.c,v 1.20 2009/04/11 07:40:37 lukem Exp $");
+__RCSID("$NetBSD: utils.c,v 1.21 2012/03/20 18:50:30 matt Exp $");
 #endif
 
 #include <sys/param.h>
@@ -139,7 +139,7 @@
 };
 
 string_t *
-string_zero()
+string_zero(void)
 {
        string_t *out;
 
diff -r 45992456a223 -r 9b5a39ebc6d7 sbin/fsck_ffs/quota2.c
--- a/sbin/fsck_ffs/quota2.c    Tue Mar 20 18:42:28 2012 +0000
+++ b/sbin/fsck_ffs/quota2.c    Tue Mar 20 18:50:30 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2.c,v 1.4 2011/08/14 12:32:01 christos Exp $ */
+/* $NetBSD: quota2.c,v 1.5 2012/03/20 18:50:31 matt Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * All rights reserved.
@@ -514,7 +514,7 @@
  * check if a quota check needs to be run, regardless of the clean flag
  */
 int
-quota2_check_doquota()
+quota2_check_doquota(void)
 {
        int retval = 1;
 
diff -r 45992456a223 -r 9b5a39ebc6d7 sbin/fsdb/fsdb.c
--- a/sbin/fsdb/fsdb.c  Tue Mar 20 18:42:28 2012 +0000
+++ b/sbin/fsdb/fsdb.c  Tue Mar 20 18:50:30 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsdb.c,v 1.43 2011/08/29 14:34:59 joerg Exp $  */
+/*     $NetBSD: fsdb.c,v 1.44 2012/03/20 18:50:31 matt Exp $   */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fsdb.c,v 1.43 2011/08/29 14:34:59 joerg Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.44 2012/03/20 18:50:31 matt Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -147,9 +147,6 @@
 }
 
 #define CMDFUNC(func) static int func (int argc, char *argv[])
-#define CMDFUNCSTART(func) static int func(argc, argv)         \
-                               int argc;                       \
-                               char *argv[];
 
 CMDFUNC(helpfn);
 CMDFUNC(focus);                        /* focus on inode */
@@ -326,7 +323,7 @@
 /*
  * Focus on given inode number
  */
-CMDFUNCSTART(focus)
+CMDFUNC(focus)
 {
        ino_t   inum;
        char   *cp;
@@ -339,7 +336,7 @@
        return 0;
 }
 
-CMDFUNCSTART(back)
+CMDFUNC(back)
 {
        curinum = ocurrent;
        curinode = ginode(curinum);
@@ -347,7 +344,7 @@
        return 0;
 }
 
-CMDFUNCSTART(zapi)
+CMDFUNC(zapi)
 {
        ino_t   inum;
        union dinode *dp;
@@ -362,18 +359,18 @@
        return 0;
 }
 
-CMDFUNCSTART(active)
+CMDFUNC(active)
 {
        printactive();
        return 0;
 }
 
-CMDFUNCSTART(quit)
+CMDFUNC(quit)
 {
        return -1;
 }
 
-CMDFUNCSTART(uplink)
+CMDFUNC(uplink)
 {
        int16_t nlink;
 
@@ -388,7 +385,7 @@
        return 0;
 }
 
-CMDFUNCSTART(downlink)
+CMDFUNC(downlink)
 {
        int16_t nlink;
 
@@ -435,7 +432,7 @@
        return (KEEPON);
 }
 
-CMDFUNCSTART(ls)
+CMDFUNC(ls)
 {
        struct inodesc idesc;
        checkactivedir();       /* let it go on anyway */
@@ -451,7 +448,7 @@
        return 0;
 }
 
-CMDFUNCSTART(blks)
+CMDFUNC(blks)
 {
        uint64_t blkno = 0;
        int i, type;
@@ -492,7 +489,7 @@
 
 static int findblk_numtofind;
 static int wantedblksize;
-CMDFUNCSTART(findblk)
+CMDFUNC(findblk)
 {
        ino_t   inum, inosused;
        uint32_t *wantedblk32 = NULL;
@@ -874,7 +871,7 @@
        }
 }
 
-CMDFUNCSTART(focusname)
+CMDFUNC(focusname)
 {
        char   *p, *val;
 
@@ -904,7 +901,7 @@
        return 0;
 }
 
-CMDFUNCSTART(ln)
+CMDFUNC(ln)
 {
        ino_t   inum;
        int     rval;
@@ -924,7 +921,7 @@
        return rval;
 }
 
-CMDFUNCSTART(rm)
+CMDFUNC(rm)
 {
        int     rval;
 
@@ -954,7 +951,7 @@
        return KEEPON;
 }
 
-CMDFUNCSTART(chinum)
+CMDFUNC(chinum)
 {
        char   *cp;
        ino_t   inum;
@@ -1004,7 +1001,7 @@
        return KEEPON;
 }
 
-CMDFUNCSTART(chname)
+CMDFUNC(chname)
 {
        int     rval;
        char   *cp;
@@ -1049,7 +1046,7 @@
        { "fifo", IFIFO },
 };
 
-CMDFUNCSTART(newtype)
+CMDFUNC(newtype)
 {
        int     type;
        uint16_t mode;
@@ -1079,7 +1076,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chmode)
+CMDFUNC(chmode)
 {
        long    modebits;
        char   *cp;
@@ -1100,7 +1097,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chlen)
+CMDFUNC(chlen)
 {
        long    len;
        char   *cp;
@@ -1119,7 +1116,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chaflags)
+CMDFUNC(chaflags)
 {
        u_long  flags;
        char   *cp;
@@ -1143,7 +1140,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chgen)
+CMDFUNC(chgen)
 {
        long    gen;
        char   *cp;
@@ -1166,7 +1163,7 @@
        return 0;
 }
 
-CMDFUNCSTART(linkcount)
+CMDFUNC(linkcount)
 {
        int     lcnt;
        char   *cp;
@@ -1189,7 +1186,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chowner)
+CMDFUNC(chowner)
 {
        unsigned long uid;
        char   *cp;
@@ -1217,7 +1214,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chgroup)
+CMDFUNC(chgroup)
 {
        unsigned long gid;
        char   *cp;
@@ -1298,7 +1295,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chmtime)
+CMDFUNC(chmtime)
 {
        int32_t rsec, nsec;
 
@@ -1311,7 +1308,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chatime)
+CMDFUNC(chatime)
 {
        int32_t rsec, nsec;
 
@@ -1324,7 +1321,7 @@
        return 0;
 }
 
-CMDFUNCSTART(chctime)
+CMDFUNC(chctime)
 {