Module Name: src
Committed By: dholland
Date: Thu Jun 10 06:09:10 UTC 2010
Modified Files:
src/usr.sbin/sa: extern.h main.c pdb.c usrdb.c
Log Message:
de-__P()
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sa/extern.h
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/sa/main.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sa/pdb.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sa/usrdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sa/extern.h
diff -u src/usr.sbin/sa/extern.h:1.7 src/usr.sbin/sa/extern.h:1.8
--- src/usr.sbin/sa/extern.h:1.7 Wed Nov 12 13:31:07 2003
+++ src/usr.sbin/sa/extern.h Thu Jun 10 06:09:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.7 2003/11/12 13:31:07 grant Exp $ */
+/* $NetBSD: extern.h,v 1.8 2010/06/10 06:09:10 dholland Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -64,25 +64,25 @@
/* typedefs */
-typedef int (*cmpf_t) __P((const DBT *, const DBT *));
+typedef int (*cmpf_t)(const DBT *, const DBT *);
/* external functions in sa.c */
-int main __P((int, char **));
-const char *fmt __P((const DBT *));
+int main(int argc, char **argv);
+const char *fmt(const DBT *);
/* external functions in pdb.c */
-int pacct_init __P((void));
-void pacct_destroy __P((void));
-int pacct_add __P((const struct cmdinfo *));
-int pacct_update __P((void));
-void pacct_print __P((void));
+int pacct_init(void);
+void pacct_destroy(void);
+int pacct_add(const struct cmdinfo *);
+int pacct_update(void);
+void pacct_print(void);
/* external functions in usrdb.c */
-int usracct_init __P((void));
-void usracct_destroy __P((void));
-int usracct_add __P((const struct cmdinfo *));
-int usracct_update __P((void));
-void usracct_print __P((void));
+int usracct_init(void);
+void usracct_destroy(void);
+int usracct_add(const struct cmdinfo *);
+int usracct_update(void);
+void usracct_print(void);
/* variables */
Index: src/usr.sbin/sa/main.c
diff -u src/usr.sbin/sa/main.c:1.25 src/usr.sbin/sa/main.c:1.26
--- src/usr.sbin/sa/main.c:1.25 Tue Nov 17 18:37:45 2009
+++ src/usr.sbin/sa/main.c Thu Jun 10 06:09:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.25 2009/11/17 18:37:45 drochner Exp $ */
+/* $NetBSD: main.c,v 1.26 2010/06/10 06:09:10 dholland Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -39,7 +39,7 @@
__COPYRIGHT("@(#) Copyright (c) 1994\
Christopher G. Demetriou. All rights reserved.");
-__RCSID("$NetBSD: main.c,v 1.25 2009/11/17 18:37:45 drochner Exp $");
+__RCSID("$NetBSD: main.c,v 1.26 2010/06/10 06:09:10 dholland Exp $");
#endif
/*
@@ -60,17 +60,17 @@
#include "extern.h"
#include "pathnames.h"
-static int acct_load __P((char *, int));
-static u_quad_t decode_comp_t __P((comp_t));
-static int cmp_comm __P((const char *, const char *));
-static int cmp_usrsys __P((const DBT *, const DBT *));
-static int cmp_avgusrsys __P((const DBT *, const DBT *));
-static int cmp_dkio __P((const DBT *, const DBT *));
-static int cmp_avgdkio __P((const DBT *, const DBT *));
-static int cmp_cpumem __P((const DBT *, const DBT *));
-static int cmp_avgcpumem __P((const DBT *, const DBT *));
-static int cmp_calls __P((const DBT *, const DBT *));
-static void usage __P((void)) __dead;
+static int acct_load(char *, int);
+static u_quad_t decode_comp_t(comp_t);
+static int cmp_comm(const char *, const char *);
+static int cmp_usrsys(const DBT *, const DBT *);
+static int cmp_avgusrsys(const DBT *, const DBT *);
+static int cmp_dkio(const DBT *, const DBT *);
+static int cmp_avgdkio(const DBT *, const DBT *);
+static int cmp_cpumem(const DBT *, const DBT *);
+static int cmp_avgcpumem(const DBT *, const DBT *);
+static int cmp_calls(const DBT *, const DBT *);
+static void usage(void) __dead;
int aflag, bflag, cflag, dflag, Dflag, fflag, iflag, jflag, kflag;
int Kflag, lflag, mflag, qflag, rflag, sflag, tflag, uflag, vflag;
Index: src/usr.sbin/sa/pdb.c
diff -u src/usr.sbin/sa/pdb.c:1.13 src/usr.sbin/sa/pdb.c:1.14
--- src/usr.sbin/sa/pdb.c:1.13 Sat Apr 18 13:37:04 2009
+++ src/usr.sbin/sa/pdb.c Thu Jun 10 06:09:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pdb.c,v 1.13 2009/04/18 13:37:04 lukem Exp $ */
+/* $NetBSD: pdb.c,v 1.14 2010/06/10 06:09:10 dholland Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pdb.c,v 1.13 2009/04/18 13:37:04 lukem Exp $");
+__RCSID("$NetBSD: pdb.c,v 1.14 2010/06/10 06:09:10 dholland Exp $");
#endif
#include <sys/types.h>
@@ -49,9 +49,9 @@
#include "extern.h"
#include "pathnames.h"
-static int check_junk __P((struct cmdinfo *));
-static void add_ci __P((const struct cmdinfo *, struct cmdinfo *));
-static void print_ci __P((const struct cmdinfo *, const struct cmdinfo *));
+static int check_junk(struct cmdinfo *);
+static void add_ci(const struct cmdinfo *, struct cmdinfo *);
+static void print_ci(const struct cmdinfo *, const struct cmdinfo *);
static DB *pacct_db;
Index: src/usr.sbin/sa/usrdb.c
diff -u src/usr.sbin/sa/usrdb.c:1.11 src/usr.sbin/sa/usrdb.c:1.12
--- src/usr.sbin/sa/usrdb.c:1.11 Wed Nov 12 13:31:08 2003
+++ src/usr.sbin/sa/usrdb.c Thu Jun 10 06:09:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usrdb.c,v 1.11 2003/11/12 13:31:08 grant Exp $ */
+/* $NetBSD: usrdb.c,v 1.12 2010/06/10 06:09:10 dholland Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: usrdb.c,v 1.11 2003/11/12 13:31:08 grant Exp $");
+__RCSID("$NetBSD: usrdb.c,v 1.12 2010/06/10 06:09:10 dholland Exp $");
#endif
#include <sys/types.h>
@@ -50,7 +50,7 @@
#include "extern.h"
#include "pathnames.h"
-static int uid_compare __P((const DBT *, const DBT *));
+static int uid_compare(const DBT *, const DBT *);
static DB *usracct_db;
