summaryrefslogtreecommitdiff
path: root/lang/db185
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2015-02-17 17:25:57 +0000
committer <>2015-03-17 16:26:24 +0000
commit780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch)
tree598f8b9fa431b228d29897e798de4ac0c1d3d970 /lang/db185
parent7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff)
downloadberkeleydb-db-6.1.23.tar.gz
Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master
Diffstat (limited to 'lang/db185')
-rw-r--r--lang/db185/db185.c10
-rw-r--r--lang/db185/db185_int.in2
2 files changed, 7 insertions, 5 deletions
diff --git a/lang/db185/db185.c b/lang/db185/db185.c
index 6c13f41c..afbece10 100644
--- a/lang/db185/db185.c
+++ b/lang/db185/db185.c
@@ -1,7 +1,7 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.
*
* $Id$
*/
@@ -12,13 +12,13 @@
#ifndef lint
static const char copyright[] =
- "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n";
+ "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n";
#endif
#include "db185_int.h"
static int db185_close __P((DB185 *));
-static int db185_compare __P((DB *, const DBT *, const DBT *));
+static int db185_compare __P((DB *, const DBT *, const DBT *, size_t *));
static int db185_del __P((const DB185 *, const DBT185 *, u_int));
static int db185_fd __P((const DB185 *));
static int db185_get __P((const DB185 *, const DBT185 *, DBT185 *, u_int));
@@ -539,12 +539,14 @@ einval: ret = EINVAL;
* Cutout routine to call the user's Btree comparison function.
*/
static int
-db185_compare(dbp, a, b)
+db185_compare(dbp, a, b, locp)
DB *dbp;
const DBT *a, *b;
+ size_t *locp;
{
DBT185 a185, b185;
+ locp = NULL;
a185.data = a->data;
a185.size = a->size;
b185.data = b->data;
diff --git a/lang/db185/db185_int.in b/lang/db185/db185_int.in
index eb9bb71f..14353c82 100644
--- a/lang/db185/db185_int.in
+++ b/lang/db185/db185_int.in
@@ -1,7 +1,7 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright (c) 1990, 1993, 1994, 1995, 1996