summaryrefslogtreecommitdiff
path: root/util/db_sql_codegen/generate.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 /util/db_sql_codegen/generate.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 'util/db_sql_codegen/generate.c')
-rw-r--r--util/db_sql_codegen/generate.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/util/db_sql_codegen/generate.c b/util/db_sql_codegen/generate.c
index 91620ef4..220c5c6f 100644
--- a/util/db_sql_codegen/generate.c
+++ b/util/db_sql_codegen/generate.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.
*
*/
@@ -245,20 +245,22 @@ such as x86. cf. discussion of btree comparators in 'Getting Started \n\
with Data Storage' manual.";
static char *comparator_functions =
"static int \n\
-compare_int(DB *dbp, const DBT *a, const DBT *b) \n\
+compare_int(DB *dbp, const DBT *a, const DBT *b, size_t *locp) \n\
{ \n\
int ai, bi; \n\
\n\
+ locp = NULL; \n\
memcpy(&ai, a->data, sizeof(int)); \n\
memcpy(&bi, b->data, sizeof(int)); \n\
return (ai - bi); \n\
} \n\
\n\
int \n\
-compare_long(DB *dbp, const DBT *a, const DBT *b) \n\
+compare_long(DB *dbp, const DBT *a, const DBT *b, size_t *locp) \n\
{ \n\
long ai, bi; \n\
\n\
+ locp = NULL; \n\
memcpy(&ai, a->data, sizeof(long)); \n\
memcpy(&bi, b->data, sizeof(long)); \n\
return (ai - bi); \n\
@@ -277,7 +279,7 @@ create_database(DB_ENV *envp, \n\
int flags, \n\
DBTYPE type, \n\
int moreflags, \n\
- int (*comparator)(DB *, const DBT *, const DBT *)) \n\
+ int (*comparator)(DB *, const DBT *, const DBT *, size_t *)) \n\
{ \n\
int ret; \n\
FILE *errfilep; \n\