summaryrefslogtreecommitdiff
path: root/examples/c/csv/db.c
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 /examples/c/csv/db.c
parent7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff)
downloadberkeleydb-master.tar.gz
Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master
Diffstat (limited to 'examples/c/csv/db.c')
-rw-r--r--examples/c/csv/db.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/examples/c/csv/db.c b/examples/c/csv/db.c
index dc72f0d8..e138d5b8 100644
--- a/examples/c/csv/db.c
+++ b/examples/c/csv/db.c
@@ -1,7 +1,7 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 2005, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015 Oracle and/or its affiliates. All rights reserved.
*
* $Id$
*/
@@ -10,7 +10,7 @@
#include "csv_local.h"
#include "csv_extern.h"
-static int compare_uint32(DB *, const DBT *, const DBT *);
+static int compare_uint32(DB *, const DBT *, const DBT *, size_t *);
/*
* csv_env_init --
@@ -138,7 +138,7 @@ csv_secondary_open()
{
DB *sdb;
DbField *f;
- int ret, (*fcmp)(DB *, const DBT *, const DBT *);
+ int ret, (*fcmp)(DB *, const DBT *, const DBT *, size_t *);
/*
* Create secondary database handles.
@@ -232,11 +232,13 @@ csv_secondary_close()
* Compare two keys.
*/
static int
-compare_uint32(DB *db_arg, const DBT *a_arg, const DBT *b_arg)
+compare_uint32(DB *db_arg, const DBT *a_arg, const DBT *b_arg, size_t *locp)
{
u_int32_t a, b;
- db_arg = db_arg; /* Quiet compiler. */
+ /* Quiet compiler. */
+ db_arg = db_arg;
+ locp = NULL;
memcpy(&a, a_arg->data, sizeof(u_int32_t));
memcpy(&b, b_arg->data, sizeof(u_int32_t));