s3-dbwrap: Make dbwrap_fallback_parse_record private

We have the private fallback in dbwrap_parse_record anyway

diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index 1232b7991f234db69e84cc69823ae3fae29159d1..44344b967525cd0e070ba96388fe0b486d976851 100644 (file)
--- 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 bc2dbab449e46b3bf0f64fe91ebc9ccd556c53a7..7865fe7c8c5b975ed324b04b11edb54d271fc1a0 100644 (file)
--- 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 5a7ca335139ede9b421b76e37ff1465ff6dd0d05..3e8b1c189a744dd1aad4da564d58c32456dfb641 100644 (file)
--- 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__ */