about summary refs log tree commit diff
path: root/db2/progs
diff options
context:
space:
mode:
Diffstat (limited to 'db2/progs')
-rw-r--r--db2/progs/db_archive/db_archive.c7
-rw-r--r--db2/progs/db_checkpoint/db_checkpoint.c7
-rw-r--r--db2/progs/db_deadlock/db_deadlock.c9
-rw-r--r--db2/progs/db_dump/db_dump.c9
-rw-r--r--db2/progs/db_dump185/db_dump185.c19
-rw-r--r--db2/progs/db_load/db_load.c11
-rw-r--r--db2/progs/db_printlog/db_printlog.c8
-rw-r--r--db2/progs/db_recover/db_recover.c9
-rw-r--r--db2/progs/db_stat/db_stat.c11
9 files changed, 50 insertions, 40 deletions
diff --git a/db2/progs/db_archive/db_archive.c b/db2/progs/db_archive/db_archive.c
index 136cf2c360..a9c6c28e70 100644
--- a/db2/progs/db_archive/db_archive.c
+++ b/db2/progs/db_archive/db_archive.c
@@ -11,7 +11,7 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_archive.c	10.12 (Sleepycat) 7/25/97";
+static const char sccsid[] = "@(#)db_archive.c	10.15 (Sleepycat) 8/27/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -34,12 +34,13 @@ static const char sccsid[] = "@(#)db_archive.c	10.12 (Sleepycat) 7/25/97";
 
 DB_ENV	*db_init __P((char *, int));
 void	 onint __P((int));
+int	 main __P((int, char *[]));
 void	 siginit __P((void));
 void	 usage __P((void));
-int	 main __P((int, char *[]));
 
 int	 interrupted;
-const char *progname = "db_archive";			/* Program name. */
+const char
+	*progname = "db_archive";			/* Program name. */
 
 int
 main(argc, argv)
diff --git a/db2/progs/db_checkpoint/db_checkpoint.c b/db2/progs/db_checkpoint/db_checkpoint.c
index 586b4b9686..4f9b79a7ba 100644
--- a/db2/progs/db_checkpoint/db_checkpoint.c
+++ b/db2/progs/db_checkpoint/db_checkpoint.c
@@ -11,7 +11,7 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_checkpoint.c	10.9 (Sleepycat) 7/4/97";
+static const char sccsid[] = "@(#)db_checkpoint.c	10.11 (Sleepycat) 8/27/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -39,14 +39,15 @@ char	*check __P((DB_ENV *, long, long));
 int	 checkpoint __P((DB_ENV *, char *, int));
 DB_ENV	*db_init __P((char *));
 int	 logpid __P((char *, int));
+int	 main __P((int, char *[]));
 void	 onint __P((int));
 void	 siginit __P((void));
 void	 usage __P((void));
-int	 main __P((int, char *[]));
 
 int	 interrupted;
 time_t	 now;					/* Checkpoint time. */
-const char *progname = "db_checkpoint";		/* Program name. */
+const char
+	*progname = "db_checkpoint";		/* Program name. */
 
 int
 main(argc, argv)
diff --git a/db2/progs/db_deadlock/db_deadlock.c b/db2/progs/db_deadlock/db_deadlock.c
index 9437e3552d..09004f58b3 100644
--- a/db2/progs/db_deadlock/db_deadlock.c
+++ b/db2/progs/db_deadlock/db_deadlock.c
@@ -11,7 +11,7 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_deadlock.c	10.13 (Sleepycat) 7/20/97";
+static const char sccsid[] = "@(#)db_deadlock.c	10.14 (Sleepycat) 8/27/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -33,14 +33,15 @@ static const char sccsid[] = "@(#)db_deadlock.c	10.13 (Sleepycat) 7/20/97";
 #define	BAD_KILLID	0xffffffff
 
 DB_ENV	*db_init __P((char *, int));
+int	 logpid __P((char *, int));
+int	 main __P((int, char *[]));
 void	 onint __P((int));
 void	 siginit __P((void));
 void	 usage __P((void));
-int	 logpid __P((char *, int));
-int	 main __P((int, char *[]));
 
 int	 interrupted;
-const char *progname = "db_deadlock";			/* Program name. */
+const char
+	*progname = "db_deadlock";			/* Program name. */
 
 int
 main(argc, argv)
diff --git a/db2/progs/db_dump/db_dump.c b/db2/progs/db_dump/db_dump.c
index d60aa9b5c9..a0f60c69a6 100644
--- a/db2/progs/db_dump/db_dump.c
+++ b/db2/progs/db_dump/db_dump.c
@@ -11,7 +11,7 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_dump.c	10.13 (Sleepycat) 8/19/97";
+static const char sccsid[] = "@(#)db_dump.c	10.16 (Sleepycat) 8/27/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -19,10 +19,10 @@ static const char sccsid[] = "@(#)db_dump.c	10.13 (Sleepycat) 8/19/97";
 
 #include <ctype.h>
 #include <errno.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #endif
 
 #include "db_int.h"
@@ -35,11 +35,12 @@ void	configure __P((char *));
 DB_ENV *db_init __P((char *));
 void	dbt_dump __P((DBT *));
 void	dbt_print __P((DBT *));
+int	main __P((int, char *[]));
 void	pheader __P((DB *, int));
 void	usage __P((void));
-int	main __P((int, char *[]));
 
-const char *progname = "db_dump";		/* Program name. */
+const char
+	*progname = "db_dump";				/* Program name. */
 
 int
 main(argc, argv)
diff --git a/db2/progs/db_dump185/db_dump185.c b/db2/progs/db_dump185/db_dump185.c
index f3c1187e45..6e2d95bee0 100644
--- a/db2/progs/db_dump185/db_dump185.c
+++ b/db2/progs/db_dump185/db_dump185.c
@@ -11,7 +11,7 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_dump185.c	10.5 (Sleepycat) 7/2/97";
+static const char sccsid[] = "@(#)db_dump185.c	10.7 (Sleepycat) 8/27/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -20,10 +20,10 @@ static const char sccsid[] = "@(#)db_dump185.c	10.5 (Sleepycat) 7/2/97";
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #endif
 
 #include "db_185.h"
@@ -149,14 +149,15 @@ typedef struct _btree {
 	u_int32_t flags;
 } BTREE;
 
-void db_185_btree __P((DB *, int));
-void db_185_hash __P((DB *, int));
-void dbt_dump __P((DBT *));
-void dbt_print __P((DBT *));
-void usage __P((void));
-int main __P((int, char *[]));
+void	db_185_btree __P((DB *, int));
+void	db_185_hash __P((DB *, int));
+void	dbt_dump __P((DBT *));
+void	dbt_print __P((DBT *));
+int	main __P((int, char *[]));
+void	usage __P((void));
 
-const char *progname = "db_dump185";		/* Program name. */
+const char
+	*progname = "db_dump185";			/* Program name. */
 
 int
 main(argc, argv)
diff --git a/db2/progs/db_load/db_load.c b/db2/progs/db_load/db_load.c
index cc90e7bd27..6f69216777 100644
--- a/db2/progs/db_load/db_load.c
+++ b/db2/progs/db_load/db_load.c
@@ -11,7 +11,7 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_load.c	10.9 (Sleepycat) 8/19/97";
+static const char sccsid[] = "@(#)db_load.c	10.12 (Sleepycat) 8/28/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -19,11 +19,11 @@ static const char sccsid[] = "@(#)db_load.c	10.9 (Sleepycat) 8/19/97";
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <getopt.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #endif
 
 #include "db_int.h"
@@ -35,11 +35,12 @@ DB_ENV *db_init __P((char *));
 int	dbt_rdump __P((DBT *));
 int	dbt_rprint __P((DBT *));
 int	digitize __P((int));
+int	main __P((int, char *[]));
 void	rheader __P((DBTYPE *, int *, DB_INFO *));
 void	usage __P((void));
-int	main __P((int, char *[]));
 
-const char *progname = "db_load";		/* Program name. */
+const char
+	*progname = "db_load";				/* Program name. */
 
 int
 main(argc, argv)
@@ -273,7 +274,7 @@ rheader(dbtypep, pflagp, dbinfop)
 
 	for (lineno = 1;; ++lineno) {
 		if (fscanf(stdin, "%[^=]=%s\n", name, value) != 2)
-			errx(1, "line %lu: unexpected line", lineno);
+			errx(1, "line %lu: unexpected format", lineno);
 		if (strcmp(name, "HEADER") == 0)
 			break;
 
diff --git a/db2/progs/db_printlog/db_printlog.c b/db2/progs/db_printlog/db_printlog.c
index 12c365524f..6bbd118b1b 100644
--- a/db2/progs/db_printlog/db_printlog.c
+++ b/db2/progs/db_printlog/db_printlog.c
@@ -11,7 +11,7 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_printlog.c	10.8 (Sleepycat) 7/15/97";
+static const char sccsid[] = "@(#)db_printlog.c	10.10 (Sleepycat) 8/27/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -35,11 +35,13 @@ static const char sccsid[] = "@(#)db_printlog.c	10.8 (Sleepycat) 7/15/97";
 #include "clib_ext.h"
 
 DB_ENV *db_init __P((char *));
+int	main __P((int, char *[]));
 void	onint __P((int));
 void	usage __P((void));
 
 int	 interrupted;
-char	*progname = "db_printlog";			/* Program name. */
+const char
+	*progname = "db_printlog";			/* Program name. */
 
 int
 main(argc, argv)
@@ -114,7 +116,7 @@ main(argc, argv)
 		(void)raise(SIGINT);
 		/* NOTREACHED */
 	}
-	exit (eval);
+	return (eval);
 }
 
 /*
diff --git a/db2/progs/db_recover/db_recover.c b/db2/progs/db_recover/db_recover.c
index 4ac5925f79..d17c4b0c76 100644
--- a/db2/progs/db_recover/db_recover.c
+++ b/db2/progs/db_recover/db_recover.c
@@ -11,16 +11,16 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_recover.c	10.12 (Sleepycat) 7/27/97";
+static const char sccsid[] = "@(#)db_recover.c	10.14 (Sleepycat) 8/27/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
 
 #include <errno.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <time.h>
+#include <unistd.h>
 #endif
 
 #include "db_int.h"
@@ -29,10 +29,11 @@ static const char sccsid[] = "@(#)db_recover.c	10.12 (Sleepycat) 7/27/97";
 #include "clib_ext.h"
 
 DB_ENV	*db_init __P((char *, int, int));
-void	 usage __P((void));
 int	 main __P((int, char *[]));
+void	 usage __P((void));
 
-const char *progname = "db_recover";			/* Program name. */
+const char
+	*progname = "db_recover";			/* Program name. */
 
 int
 main(argc, argv)
diff --git a/db2/progs/db_stat/db_stat.c b/db2/progs/db_stat/db_stat.c
index 5c7044dbce..1a989f4df3 100644
--- a/db2/progs/db_stat/db_stat.c
+++ b/db2/progs/db_stat/db_stat.c
@@ -11,7 +11,7 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_stat.c	8.17 (Sleepycat) 8/24/97";
+static const char sccsid[] = "@(#)db_stat.c	8.20 (Sleepycat) 8/27/97";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -36,16 +36,17 @@ typedef enum { T_NOTSET, T_DB, T_MPOOL, T_TXN } test_t;
 void	bstat __P((DB *));
 DB_ENV *db_init __P((char *, test_t));
 void	hstat __P((DB *));
+int	main __P((int, char *[]));
 void	mstat __P((DB_ENV *));
-void	prflags __P((u_int32_t, const FN *));
 void	onint __P((int));
+void	prflags __P((u_int32_t, const FN *));
 void	tstat __P((DB_ENV *));
 int	txn_compare __P((const void *, const void *));
 void	usage __P((void));
-int	main __P((int, char *[]));
 
 int	 interrupted;
-const char *progname = "db_stat";			/* Program name. */
+const char
+	*progname = "db_stat";				/* Program name. */
 
 int
 main(argc, argv)
@@ -297,7 +298,7 @@ tstat(dbenv)
 	DB_ENV *dbenv;
 {
 	DB_TXN_STAT *tstat;
-	unsigned int i;
+	u_int32_t i;
 	const char *p;
 
 	if (txn_stat(dbenv->tx_info, &tstat, NULL))