From 2a3235eb27dccdd51b6a4e113c22fe219edef0c5 Mon Sep 17 00:00:00 2001 From: jbj Date: Wed, 14 Aug 2002 19:38:59 +0000 Subject: [PATCH] db-4.1.17 orphans. CVS patchset: 5635 CVS date: 2002/08/14 19:38:59 --- db/common/util_arg.c | 5 ++--- db/os/os_clock.c | 5 ++--- db/os_win32/os_clock.c | 9 +++------ db/test/bigfile001.tcl | 10 +++++----- db/test/scr016/TestAppendRecno.java | 4 ++-- db/test/scr016/TestAssociate.java | 4 ++-- db/test/scr016/TestDbtFlags.java | 4 ++-- db/test/scr016/TestGetSetMethods.java | 4 ++-- db/test/scr016/TestKeyRange.java | 4 ++-- db/test/scr016/TestLockVec.java | 4 ++-- db/test/scr016/TestLogc.java | 4 ++-- db/test/scr016/TestOpenEmpty.java | 4 ++-- db/test/scr016/TestRpcServer.java | 4 ++-- 13 files changed, 30 insertions(+), 35 deletions(-) diff --git a/db/common/util_arg.c b/db/common/util_arg.c index f69c153..6499529 100644 --- a/db/common/util_arg.c +++ b/db/common/util_arg.c @@ -1,14 +1,14 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001 + * Copyright (c) 2001-2002 * Sleepycat Software. All rights reserved. */ #include "db_config.h" #ifndef lint -static const char revid[] = "Id: util_arg.c,v 1.2 2001/10/04 21:11:48 bostic Exp "; +static const char revid[] = "Id: util_arg.c,v 1.4 2002/02/01 18:15:30 bostic Exp "; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -16,7 +16,6 @@ static const char revid[] = "Id: util_arg.c,v 1.2 2001/10/04 21:11:48 bostic Exp #endif #include "db_int.h" -#include "common_ext.h" static char *__db_strsep __P((char **, const char *)); diff --git a/db/os/os_clock.c b/db/os/os_clock.c index b6218a8..581d04d 100644 --- a/db/os/os_clock.c +++ b/db/os/os_clock.c @@ -1,14 +1,14 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001 + * Copyright (c) 2001-2002 * Sleepycat Software. All rights reserved. */ #include "db_config.h" #ifndef lint -static const char revid[] = "Id: os_clock.c,v 1.6 2001/09/07 18:17:49 krinsky Exp "; +static const char revid[] = "Id: os_clock.c,v 1.9 2002/03/29 20:46:44 bostic Exp "; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -29,7 +29,6 @@ static const char revid[] = "Id: os_clock.c,v 1.6 2001/09/07 18:17:49 krinsky Ex #endif #include "db_int.h" -#include "os_jump.h" /* * __os_clock -- diff --git a/db/os_win32/os_clock.c b/db/os_win32/os_clock.c index 7e73f5b..a506979 100644 --- a/db/os_win32/os_clock.c +++ b/db/os_win32/os_clock.c @@ -1,14 +1,14 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001 + * Copyright (c) 2001-2002 * Sleepycat Software. All rights reserved. */ #include "db_config.h" #ifndef lint -static const char revid[] = "Id: os_clock.c,v 1.2 2001/08/18 17:39:08 dda Exp "; +static const char revid[] = "Id: os_clock.c,v 1.7 2002/07/12 18:56:53 bostic Exp "; #endif /* not lint */ #include @@ -16,13 +16,10 @@ static const char revid[] = "Id: os_clock.c,v 1.2 2001/08/18 17:39:08 dda Exp "; #include #include "db_int.h" -#include "os_jump.h" /* * __os_clock -- * Return the current time-of-day clock in seconds and microseconds. - * - * PUBLIC: int __os_clock __P((DB_ENV *, u_int32_t *, u_int32_t *)); */ int __os_clock(dbenv, secsp, usecsp) @@ -33,7 +30,7 @@ __os_clock(dbenv, secsp, usecsp) _ftime(&now); if (secsp != NULL) - *secsp = now.time; + *secsp = (u_int32_t)now.time; if (usecsp != NULL) *usecsp = now.millitm * 1000; return (0); diff --git a/db/test/bigfile001.tcl b/db/test/bigfile001.tcl index 810745a..3c46ac8 100644 --- a/db/test/bigfile001.tcl +++ b/db/test/bigfile001.tcl @@ -1,15 +1,15 @@ # See the file LICENSE for redistribution information. # -# Copyright (c) 2001 +# Copyright (c) 2001-2002 # Sleepycat Software. All rights reserved. # -# Id: bigfile001.tcl,v 11.5 2001/08/03 18:02:53 sandstro Exp +# Id: bigfile001.tcl,v 11.7 2002/08/10 13:39:26 bostic Exp # # TEST bigfile001 # TEST Create a database greater than 4 GB in size. Close, verify. -# Grow the database somewhat. Close, reverify. Lather, rinse, -# repeat. Since it will not work on all systems, this test is -# not run by default. +# TEST Grow the database somewhat. Close, reverify. Lather, rinse, +# TEST repeat. Since it will not work on all systems, this test is +# TEST not run by default. proc bigfile001 { method \ { itemsize 4096 } { nitems 1048576 } { growby 5000 } { growtms 2 } args } { source ./include.tcl diff --git a/db/test/scr016/TestAppendRecno.java b/db/test/scr016/TestAppendRecno.java index 5021ddb..56cfe64 100644 --- a/db/test/scr016/TestAppendRecno.java +++ b/db/test/scr016/TestAppendRecno.java @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 1998, 1999, 2000 + * Copyright (c) 1997-2002 * Sleepycat Software. All rights reserved. * - * Id: TestAppendRecno.java,v 1.2 2001/10/05 02:36:08 bostic Exp + * Id: TestAppendRecno.java,v 1.3 2002/01/11 15:54:01 bostic Exp */ package com.sleepycat.test; diff --git a/db/test/scr016/TestAssociate.java b/db/test/scr016/TestAssociate.java index 3bf2108..83b5438 100644 --- a/db/test/scr016/TestAssociate.java +++ b/db/test/scr016/TestAssociate.java @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997-2001 + * Copyright (c) 1997-2002 * Sleepycat Software. All rights reserved. * - * Id: TestAssociate.java,v 1.2 2001/10/05 02:36:08 bostic Exp + * Id: TestAssociate.java,v 1.3 2002/01/11 15:54:01 bostic Exp */ package com.sleepycat.test; diff --git a/db/test/scr016/TestDbtFlags.java b/db/test/scr016/TestDbtFlags.java index f72290a..0c30d8c 100644 --- a/db/test/scr016/TestDbtFlags.java +++ b/db/test/scr016/TestDbtFlags.java @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997-2001 + * Copyright (c) 1997-2002 * Sleepycat Software. All rights reserved. * - * Id: TestDbtFlags.java,v 1.2 2001/10/05 02:36:09 bostic Exp + * Id: TestDbtFlags.java,v 1.3 2002/01/11 15:54:02 bostic Exp */ package com.sleepycat.test; diff --git a/db/test/scr016/TestGetSetMethods.java b/db/test/scr016/TestGetSetMethods.java index d940aa2..71bdebe 100644 --- a/db/test/scr016/TestGetSetMethods.java +++ b/db/test/scr016/TestGetSetMethods.java @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000 + * Copyright (c) 2000-2002 * Sleepycat Software. All rights reserved. * - * Id: TestGetSetMethods.java,v 1.2 2001/10/05 02:36:09 bostic Exp + * Id: TestGetSetMethods.java,v 1.3 2002/01/11 15:54:02 bostic Exp */ /* diff --git a/db/test/scr016/TestKeyRange.java b/db/test/scr016/TestKeyRange.java index 0981233..83cba13 100644 --- a/db/test/scr016/TestKeyRange.java +++ b/db/test/scr016/TestKeyRange.java @@ -4,10 +4,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 1998, 1999, 2000 + * Copyright (c) 1997-2002 * Sleepycat Software. All rights reserved. * - * Id: TestKeyRange.java,v 1.2 2001/10/09 20:58:34 dda Exp + * Id: TestKeyRange.java,v 1.3 2002/01/11 15:54:02 bostic Exp */ package com.sleepycat.test; diff --git a/db/test/scr016/TestLockVec.java b/db/test/scr016/TestLockVec.java index 6b72be7..c0e82b1 100644 --- a/db/test/scr016/TestLockVec.java +++ b/db/test/scr016/TestLockVec.java @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 1998, 1999, 2000 + * Copyright (c) 1997-2002 * Sleepycat Software. All rights reserved. * - * Id: TestLockVec.java,v 1.2 2001/10/05 02:36:10 bostic Exp + * Id: TestLockVec.java,v 1.3 2002/01/11 15:54:02 bostic Exp */ /* diff --git a/db/test/scr016/TestLogc.java b/db/test/scr016/TestLogc.java index cb3df62..628abb0 100644 --- a/db/test/scr016/TestLogc.java +++ b/db/test/scr016/TestLogc.java @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 1998, 1999, 2000 + * Copyright (c) 1997-2002 * Sleepycat Software. All rights reserved. * - * Id: TestLogc.java,v 1.5 2001/10/16 15:40:54 dda Exp + * Id: TestLogc.java,v 1.6 2002/01/11 15:54:03 bostic Exp */ /* diff --git a/db/test/scr016/TestOpenEmpty.java b/db/test/scr016/TestOpenEmpty.java index d16d993..51de512 100644 --- a/db/test/scr016/TestOpenEmpty.java +++ b/db/test/scr016/TestOpenEmpty.java @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997-2001 + * Copyright (c) 1997-2002 * Sleepycat Software. All rights reserved. * - * Id: TestOpenEmpty.java,v 1.2 2001/10/05 02:36:10 bostic Exp + * Id: TestOpenEmpty.java,v 1.3 2002/01/11 15:54:03 bostic Exp */ package com.sleepycat.test; diff --git a/db/test/scr016/TestRpcServer.java b/db/test/scr016/TestRpcServer.java index 46294ef..5537700 100644 --- a/db/test/scr016/TestRpcServer.java +++ b/db/test/scr016/TestRpcServer.java @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997-2001 + * Copyright (c) 1997-2002 * Sleepycat Software. All rights reserved. * - * Id: TestRpcServer.java,v 1.2 2001/10/05 02:36:10 bostic Exp + * Id: TestRpcServer.java,v 1.3 2002/01/11 15:54:03 bostic Exp */ package com.sleepycat.test; -- 2.7.4