summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-12-08 13:58:19 +0100
committerVolker Lendecke <vl@samba.org>2011-12-08 15:03:43 +0100
commit5cda77d5996acb26648fbb0231ddc8b20e626cc0 (patch)
treed896d7d3c4128abff68b5e2c433b7e7dcb8a3c6d /source3
parent527dc2ed52c78b1ae114207736883759638db5d1 (diff)
downloadsamba-5cda77d5996acb26648fbb0231ddc8b20e626cc0.tar.gz
samba-5cda77d5996acb26648fbb0231ddc8b20e626cc0.tar.bz2
samba-5cda77d5996acb26648fbb0231ddc8b20e626cc0.zip
s3-dbwrap: Make dbwrap_fallback_parse_record private
We have the private fallback in dbwrap_parse_record anyway
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/dbwrap/dbwrap.c10
-rw-r--r--source3/lib/dbwrap/dbwrap_open.c3
-rw-r--r--source3/lib/dbwrap/dbwrap_private.h6
3 files changed, 5 insertions, 14 deletions
diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index 1232b7991f..44344b9675 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -59,11 +59,11 @@ static int dbwrap_fallback_exists(struct db_context *db, TDB_DATA key)
* Fall back using fetch if no genuine parse operation is provided
*/
-int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key,
- int (*parser)(TDB_DATA key,
- TDB_DATA data,
- void *private_data),
- void *private_data)
+static int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key,
+ int (*parser)(TDB_DATA key,
+ TDB_DATA data,
+ void *private_data),
+ void *private_data)
{
TDB_DATA data;
int res;
diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index bc2dbab449..7865fe7c8c 100644
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -110,9 +110,6 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
tdb_flags, open_flags, mode);
}
- if ((result != NULL) && (result->parse_record == NULL)) {
- result->parse_record = dbwrap_fallback_parse_record;
- }
if ((result != NULL) && (result->wipe == NULL)) {
result->wipe = dbwrap_fallback_wipe;
}
diff --git a/source3/lib/dbwrap/dbwrap_private.h b/source3/lib/dbwrap/dbwrap_private.h
index 5a7ca33513..3e8b1c189a 100644
--- a/source3/lib/dbwrap/dbwrap_private.h
+++ b/source3/lib/dbwrap/dbwrap_private.h
@@ -59,12 +59,6 @@ struct db_context {
bool persistent;
};
-int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key,
- int (*parser)(TDB_DATA key,
- TDB_DATA data,
- void *private_data),
- void *private_data);
-
int dbwrap_fallback_wipe(struct db_context *db);
#endif /* __DBWRAP_PRIVATE_H__ */