s3:dbwrap: move definitions of db_record and db_contect structs to dbwrap_private.h

The API and callers now only need the forward declarations.

diff --git a/source3/lib/dbwrap/dbwrap.h b/source3/lib/dbwrap/dbwrap.h
index b5fc018158fbaa7a9a2a9bdcf9b8340f4d9fa464..13565f8b33754a83282c40a5eb9b4e5ee0c69cda 100644 (file)
--- a/source3/lib/dbwrap/dbwrap.h
+++ b/source3/lib/dbwrap/dbwrap.h
@@ -22,41 +22,8 @@
 
 #include "tdb_compat.h"
 
-struct db_record {
-       TDB_DATA key, value;
-       NTSTATUS (*store)(struct db_record *rec, TDB_DATA data, int flag);
-       NTSTATUS (*delete_rec)(struct db_record *rec);
-       void *private_data;
-};
-
-struct db_context {
-       struct db_record *(*fetch_locked)(struct db_context *db,
-                                         TALLOC_CTX *mem_ctx,
-                                         TDB_DATA key);
-       int (*fetch)(struct db_context *db, TALLOC_CTX *mem_ctx,
-                    TDB_DATA key, TDB_DATA *data);
-       int (*traverse)(struct db_context *db,
-                       int (*f)(struct db_record *rec,
-                                void *private_data),
-                       void *private_data);
-       int (*traverse_read)(struct db_context *db,
-                            int (*f)(struct db_record *rec,
-                                     void *private_data),
-                            void *private_data);
-       int (*get_seqnum)(struct db_context *db);
-       int (*get_flags)(struct db_context *db);
-       int (*transaction_start)(struct db_context *db);
-       int (*transaction_commit)(struct db_context *db);
-       int (*transaction_cancel)(struct db_context *db);
-       int (*parse_record)(struct db_context *db, TDB_DATA key,
-                           int (*parser)(TDB_DATA key, TDB_DATA data,
-                                         void *private_data),
-                           void *private_data);
-       int (*exists)(struct db_context *db,TDB_DATA key);
-       int (*wipe)(struct db_context *db);
-       void *private_data;
-       bool persistent;
-};
+struct db_record;
+struct db_context;
 
 /* The following definitions come from lib/dbwrap.c  */
 

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 2263d73dec5ac0f811bf96dd0f9c9ce5f3cc725e..5823ab4695d86223c2d735653dec2d6f169606b8 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -46,6 +46,7 @@
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_private.h"
 #include "dbwrap/dbwrap_ctdb.h"
 #include "g_lock.h"
 #include "messages.h"

diff --git a/source3/lib/dbwrap/dbwrap_private.h b/source3/lib/dbwrap/dbwrap_private.h
index 1e221878f53c647b4a5b154fc17f0598ac78092b..0a8581a91bcdc09657931e649a40c0c533e372e1 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_private.h
+++ b/source3/lib/dbwrap/dbwrap_private.h
@@ -23,6 +23,41 @@
 #ifndef __DBWRAP_PRIVATE_H__
 #define __DBWRAP_PRIVATE_H__
 
+struct db_record {
+       TDB_DATA key, value;
+       NTSTATUS (*store)(struct db_record *rec, TDB_DATA data, int flag);
+       NTSTATUS (*delete_rec)(struct db_record *rec);
+       void *private_data;
+};
+
+struct db_context {
+       struct db_record *(*fetch_locked)(struct db_context *db,
+                                         TALLOC_CTX *mem_ctx,
+                                         TDB_DATA key);
+       int (*fetch)(struct db_context *db, TALLOC_CTX *mem_ctx,
+                    TDB_DATA key, TDB_DATA *data);
+       int (*traverse)(struct db_context *db,
+                       int (*f)(struct db_record *rec,
+                                void *private_data),
+                       void *private_data);
+       int (*traverse_read)(struct db_context *db,
+                            int (*f)(struct db_record *rec,
+                                     void *private_data),
+                            void *private_data);
+       int (*get_seqnum)(struct db_context *db);
+       int (*get_flags)(struct db_context *db);
+       int (*transaction_start)(struct db_context *db);
+       int (*transaction_commit)(struct db_context *db);
+       int (*transaction_cancel)(struct db_context *db);
+       int (*parse_record)(struct db_context *db, TDB_DATA key,
+                           int (*parser)(TDB_DATA key, TDB_DATA data,
+                                         void *private_data),
+                           void *private_data);
+       int (*exists)(struct db_context *db,TDB_DATA key);
+       int (*wipe)(struct db_context *db);
+       void *private_data;
+       bool persistent;
+};
 
 int dbwrap_fallback_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
                          TDB_DATA key, TDB_DATA *data);

diff --git a/source3/lib/dbwrap/dbwrap_rbt.c b/source3/lib/dbwrap/dbwrap_rbt.c
index cc4e0dd1294953443ce6ecfe3493748beb58deb0..98541eaf07a9d43901d02a17dc989bce3ae5f3e4 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_rbt.c
+++ b/source3/lib/dbwrap/dbwrap_rbt.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_private.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "../lib/util/rbtree.h"
 

diff --git a/source3/lib/dbwrap/dbwrap_tdb.c b/source3/lib/dbwrap/dbwrap_tdb.c
index b8385393077b8bfe5ebcff7361f674719a592c32..4330c961ec55233a091d5a655a371689f3e7730f 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_tdb.c
+++ b/source3/lib/dbwrap/dbwrap_tdb.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_private.h"
 #include "dbwrap/dbwrap_tdb.h"
 #include "lib/util/tdb_wrap.h"