Module Name: src
Committed By: matt
Date: Tue Mar 20 18:50:31 UTC 2012
Modified Files:
src/sbin/cgdconfig: utils.c
src/sbin/fsck_ffs: quota2.c
src/sbin/fsdb: fsdb.c
src/sbin/init: init.c
src/sbin/mount_portal: puffs_portal.c
src/sbin/wsconsctl: display.c
Log Message:
Convert to C89 function definitions
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sbin/cgdconfig/utils.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/fsck_ffs/quota2.c
cvs rdiff -u -r1.43 -r1.44 src/sbin/fsdb/fsdb.c
cvs rdiff -u -r1.102 -r1.103 src/sbin/init/init.c
cvs rdiff -u -r1.5 -r1.6 src/sbin/mount_portal/puffs_portal.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/wsconsctl/display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/utils.c
diff -u src/sbin/cgdconfig/utils.c:1.20 src/sbin/cgdconfig/utils.c:1.21
--- src/sbin/cgdconfig/utils.c:1.20 Sat Apr 11 07:40:37 2009
+++ src/sbin/cgdconfig/utils.c Tue Mar 20 18:50:30 2012
@@ -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 @@ struct string {
};
string_t *
-string_zero()
+string_zero(void)
{
string_t *out;
Index: src/sbin/fsck_ffs/quota2.c
diff -u src/sbin/fsck_ffs/quota2.c:1.4 src/sbin/fsck_ffs/quota2.c:1.5
--- src/sbin/fsck_ffs/quota2.c:1.4 Sun Aug 14 12:32:01 2011
+++ src/sbin/fsck_ffs/quota2.c Tue Mar 20 18:50:31 2012
@@ -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 @@ quota2_check_usage(int type)
* 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;
Index: src/sbin/fsdb/fsdb.c
diff -u src/sbin/fsdb/fsdb.c:1.43 src/sbin/fsdb/fsdb.c:1.44
--- src/sbin/fsdb/fsdb.c:1.43 Mon Aug 29 14:34:59 2011
+++ src/sbin/fsdb/fsdb.c Tue Mar 20 18:50:31 2012
@@ -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 @@ main(int argc, char *argv[])
}
#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 @@ static ino_t ocurrent;
/*
* Focus on given inode number
*/
-CMDFUNCSTART(focus)
+CMDFUNC(focus)
{
ino_t inum;
char *cp;
@@ -339,7 +336,7 @@ CMDFUNCSTART(focus)
return 0;
}
-CMDFUNCSTART(back)
+CMDFUNC(back)
{
curinum = ocurrent;
curinode = ginode(curinum);
@@ -347,7 +344,7 @@ CMDFUNCSTART(back)
return 0;
}
-CMDFUNCSTART(zapi)
+CMDFUNC(zapi)
{
ino_t inum;
union dinode *dp;
@@ -362,18 +359,18 @@ CMDFUNCSTART(zapi)
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 @@ CMDFUNCSTART(uplink)
return 0;
}
-CMDFUNCSTART(downlink)
+CMDFUNC(downlink)
{
int16_t nlink;
@@ -435,7 +432,7 @@ scannames(struct inodesc *idesc)
return (KEEPON);
}
-CMDFUNCSTART(ls)
+CMDFUNC(ls)
{
struct inodesc idesc;
checkactivedir(); /* let it go on anyway */
@@ -451,7 +448,7 @@ CMDFUNCSTART(ls)
return 0;
}
-CMDFUNCSTART(blks)
+CMDFUNC(blks)
{
uint64_t blkno = 0;
int i, type;
@@ -492,7 +489,7 @@ CMDFUNCSTART(blks)
static int findblk_numtofind;
static int wantedblksize;
-CMDFUNCSTART(findblk)
+CMDFUNC(findblk)
{
ino_t inum, inosused;
uint32_t *wantedblk32 = NULL;
@@ -874,7 +871,7 @@ dolookup(char *name)
}
}
-CMDFUNCSTART(focusname)
+CMDFUNC(focusname)
{
char *p, *val;
@@ -904,7 +901,7 @@ CMDFUNCSTART(focusname)
return 0;
}
-CMDFUNCSTART(ln)
+CMDFUNC(ln)
{
ino_t inum;
int rval;
@@ -924,7 +921,7 @@ CMDFUNCSTART(ln)
return rval;
}
-CMDFUNCSTART(rm)
+CMDFUNC(rm)
{
int rval;
@@ -954,7 +951,7 @@ chinumfunc(struct inodesc *idesc)
return KEEPON;
}
-CMDFUNCSTART(chinum)
+CMDFUNC(chinum)
{
char *cp;
ino_t inum;
@@ -1004,7 +1001,7 @@ chnamefunc(struct inodesc *idesc)
return KEEPON;
}
-CMDFUNCSTART(chname)
+CMDFUNC(chname)
{
int rval;
char *cp;
@@ -1049,7 +1046,7 @@ static struct typemap {
{ "fifo", IFIFO },
};
-CMDFUNCSTART(newtype)
+CMDFUNC(newtype)
{
int type;
uint16_t mode;
@@ -1079,7 +1076,7 @@ CMDFUNCSTART(newtype)
return 0;
}
-CMDFUNCSTART(chmode)
+CMDFUNC(chmode)
{
long modebits;
char *cp;
@@ -1100,7 +1097,7 @@ CMDFUNCSTART(chmode)
return 0;
}
-CMDFUNCSTART(chlen)
+CMDFUNC(chlen)
{
long len;
char *cp;
@@ -1119,7 +1116,7 @@ CMDFUNCSTART(chlen)
return 0;
}
-CMDFUNCSTART(chaflags)
+CMDFUNC(chaflags)
{
u_long flags;
char *cp;
@@ -1143,7 +1140,7 @@ CMDFUNCSTART(chaflags)
return 0;
}
-CMDFUNCSTART(chgen)
+CMDFUNC(chgen)
{
long gen;
char *cp;
@@ -1166,7 +1163,7 @@ CMDFUNCSTART(chgen)
return 0;
}
-CMDFUNCSTART(linkcount)
+CMDFUNC(linkcount)
{
int lcnt;
char *cp;
@@ -1189,7 +1186,7 @@ CMDFUNCSTART(linkcount)
return 0;
}
-CMDFUNCSTART(chowner)
+CMDFUNC(chowner)
{
unsigned long uid;
char *cp;
@@ -1217,7 +1214,7 @@ CMDFUNCSTART(chowner)
return 0;
}
-CMDFUNCSTART(chgroup)
+CMDFUNC(chgroup)
{
unsigned long gid;
char *cp;
@@ -1298,7 +1295,7 @@ badformat:
return 0;
}
-CMDFUNCSTART(chmtime)
+CMDFUNC(chmtime)
{
int32_t rsec, nsec;
@@ -1311,7 +1308,7 @@ CMDFUNCSTART(chmtime)
return 0;
}
-CMDFUNCSTART(chatime)
+CMDFUNC(chatime)
{
int32_t rsec, nsec;
@@ -1324,7 +1321,7 @@ CMDFUNCSTART(chatime)
return 0;
}
-CMDFUNCSTART(chctime)
+CMDFUNC(chctime)
{
int32_t rsec, nsec;
Index: src/sbin/init/init.c
diff -u src/sbin/init/init.c:1.102 src/sbin/init/init.c:1.103
--- src/sbin/init/init.c:1.102 Sun Aug 28 10:13:03 2011
+++ src/sbin/init/init.c Tue Mar 20 18:50:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.102 2011/08/28 10:13:03 christos Exp $ */
+/* $NetBSD: init.c,v 1.103 2012/03/20 18:50:31 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: init.c,v 1.102 2011/08/28 10:13:03 christos Exp $");
+__RCSID("$NetBSD: init.c,v 1.103 2012/03/20 18:50:31 matt Exp $");
#endif
#endif /* not lint */
@@ -1747,7 +1747,7 @@ do_setttyent(void)
#if !defined(LETS_GET_SMALL) && defined(CHROOT)
static int
-createsysctlnode()
+createsysctlnode(void)
{
struct sysctlnode node;
int mib[2];
Index: src/sbin/mount_portal/puffs_portal.c
diff -u src/sbin/mount_portal/puffs_portal.c:1.5 src/sbin/mount_portal/puffs_portal.c:1.6
--- src/sbin/mount_portal/puffs_portal.c:1.5 Mon Dec 19 15:36:27 2011
+++ src/sbin/mount_portal/puffs_portal.c Tue Mar 20 18:50:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_portal.c,v 1.5 2011/12/19 15:36:27 riastradh Exp $ */
+/* $NetBSD: puffs_portal.c,v 1.6 2012/03/20 18:50:31 matt Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: puffs_portal.c,v 1.5 2011/12/19 15:36:27 riastradh Exp $");
+__RCSID("$NetBSD: puffs_portal.c,v 1.6 2012/03/20 18:50:31 matt Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -66,7 +66,7 @@ int readcfg, sigchild;
const char *cfg;
static void
-usage()
+usage(void)
{
errx(1, "usage: %s [-o options] /path/portal.conf mount_point",
Index: src/sbin/wsconsctl/display.c
diff -u src/sbin/wsconsctl/display.c:1.15 src/sbin/wsconsctl/display.c:1.16
--- src/sbin/wsconsctl/display.c:1.15 Mon Apr 28 20:23:09 2008
+++ src/sbin/wsconsctl/display.c Tue Mar 20 18:50:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: display.c,v 1.15 2008/04/28 20:23:09 martin Exp $ */
+/* $NetBSD: display.c,v 1.16 2012/03/20 18:50:31 matt Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -147,8 +147,7 @@ display_get_values(int fd)
}
void
-display_put_values(fd)
- int fd;
+display_put_values(int fd)
{
if (field_by_value(&font.name)->flags & FLG_SET) {
