diff options
Diffstat (limited to 'util/db_sql_codegen')
-rw-r--r-- | util/db_sql_codegen/buildpt.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/db_sql_codegen.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/db_sql_codegen.h | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/generate.c | 10 | ||||
-rw-r--r-- | util/db_sql_codegen/generate_test.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/generate_verification.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/generation.h | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/generation_utils.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/hint_comment.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/parsefuncs.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/preparser.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/tokenize.c | 2 | ||||
-rw-r--r-- | util/db_sql_codegen/utils.c | 2 |
13 files changed, 18 insertions, 16 deletions
diff --git a/util/db_sql_codegen/buildpt.c b/util/db_sql_codegen/buildpt.c index 62b5f76e..7cfeaf81 100644 --- a/util/db_sql_codegen/buildpt.c +++ b/util/db_sql_codegen/buildpt.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. * */ diff --git a/util/db_sql_codegen/db_sql_codegen.c b/util/db_sql_codegen/db_sql_codegen.c index bcec7f1b..2308c4fd 100644 --- a/util/db_sql_codegen/db_sql_codegen.c +++ b/util/db_sql_codegen/db_sql_codegen.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. * */ diff --git a/util/db_sql_codegen/db_sql_codegen.h b/util/db_sql_codegen/db_sql_codegen.h index 2c31365b..a7bee62e 100644 --- a/util/db_sql_codegen/db_sql_codegen.h +++ b/util/db_sql_codegen/db_sql_codegen.h @@ -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. * */ 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\ diff --git a/util/db_sql_codegen/generate_test.c b/util/db_sql_codegen/generate_test.c index 079150c6..a63d0dd2 100644 --- a/util/db_sql_codegen/generate_test.c +++ b/util/db_sql_codegen/generate_test.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. * */ diff --git a/util/db_sql_codegen/generate_verification.c b/util/db_sql_codegen/generate_verification.c index fe53bc09..2111412e 100644 --- a/util/db_sql_codegen/generate_verification.c +++ b/util/db_sql_codegen/generate_verification.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. * */ diff --git a/util/db_sql_codegen/generation.h b/util/db_sql_codegen/generation.h index 932934b0..94081bc0 100644 --- a/util/db_sql_codegen/generation.h +++ b/util/db_sql_codegen/generation.h @@ -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. * */ diff --git a/util/db_sql_codegen/generation_utils.c b/util/db_sql_codegen/generation_utils.c index ed8659ef..22aa7cd3 100644 --- a/util/db_sql_codegen/generation_utils.c +++ b/util/db_sql_codegen/generation_utils.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. * */ diff --git a/util/db_sql_codegen/hint_comment.c b/util/db_sql_codegen/hint_comment.c index 1890e702..7b365a90 100644 --- a/util/db_sql_codegen/hint_comment.c +++ b/util/db_sql_codegen/hint_comment.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. * */ diff --git a/util/db_sql_codegen/parsefuncs.c b/util/db_sql_codegen/parsefuncs.c index bc43e7c9..35f39496 100644 --- a/util/db_sql_codegen/parsefuncs.c +++ b/util/db_sql_codegen/parsefuncs.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. * */ diff --git a/util/db_sql_codegen/preparser.c b/util/db_sql_codegen/preparser.c index f5ffae7b..05a73c11 100644 --- a/util/db_sql_codegen/preparser.c +++ b/util/db_sql_codegen/preparser.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. * */ diff --git a/util/db_sql_codegen/tokenize.c b/util/db_sql_codegen/tokenize.c index 920d4bcb..29266eb1 100644 --- a/util/db_sql_codegen/tokenize.c +++ b/util/db_sql_codegen/tokenize.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. * */ diff --git a/util/db_sql_codegen/utils.c b/util/db_sql_codegen/utils.c index 3a6ca78c..8fa0dc5d 100644 --- a/util/db_sql_codegen/utils.c +++ b/util/db_sql_codegen/utils.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. * */ |