tdb2: remove _PUBLIC_ in tdb1 functions.

[ccan] / ccan / tdb2 / tdb1_private.h

diff --git a/ccan/tdb2/tdb1_private.h b/ccan/tdb2/tdb1_private.h
index 569ec718580b4f353077af2a71aa86b01f2a2f26..ae2888c0a719eecbac59bb0c0b57c22fcdb8088f 100644 (file)
--- a/ccan/tdb2/tdb1_private.h
+++ b/ccan/tdb2/tdb1_private.h
@@ -45,11 +45,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include <utime.h>
 #include <limits.h>
 #include <stdio.h>
 #include <utime.h>

-
-#ifndef _PUBLIC_
-#define _PUBLIC_
-#endif
-

 #else
 #include "replace.h"
 #include "system/filesys.h"
 #else
 #include "replace.h"
 #include "system/filesys.h"


@@ -61,6 +56,9 @@
 
 #include "tdb1.h"
 
 
 #include "tdb1.h"
 

+/* Temporary wrapper to avoid undue churn in test/ */
+#define tdb1_error(tdb) ((tdb)->ecode)
+

 /* #define TDB_TRACE 1 */
 #ifndef HAVE_GETPAGESIZE
 #define getpagesize() 0x2000
 /* #define TDB_TRACE 1 */
 #ifndef HAVE_GETPAGESIZE
 #define getpagesize() 0x2000


@@ -221,20 +219,14 @@ struct tdb1_context {
        struct tdb1_transaction *transaction;
        int page_size;
        int max_dead_records;
        struct tdb1_transaction *transaction;
        int page_size;
        int max_dead_records;

-#ifdef TDB1_TRACE
-       int tracefd;
-#endif
-       volatile sig_atomic_t *interrupt_sig_ptr;

 };
 
 };
 

-

 /*
   internal prototypes
 */
 int tdb1_munmap(struct tdb1_context *tdb);
 void tdb1_mmap(struct tdb1_context *tdb);
 int tdb1_lock(struct tdb1_context *tdb, int list, int ltype);
 /*
   internal prototypes
 */
 int tdb1_munmap(struct tdb1_context *tdb);
 void tdb1_mmap(struct tdb1_context *tdb);
 int tdb1_lock(struct tdb1_context *tdb, int list, int ltype);

-int tdb1_lock_nonblock(struct tdb1_context *tdb, int list, int ltype);

 int tdb1_nest_lock(struct tdb1_context *tdb, uint32_t offset, int ltype,
                  enum tdb1_lock_flags flags);
 int tdb1_nest_unlock(struct tdb1_context *tdb, uint32_t offset, int ltype,
 int tdb1_nest_lock(struct tdb1_context *tdb, uint32_t offset, int ltype,
                  enum tdb1_lock_flags flags);
 int tdb1_nest_unlock(struct tdb1_context *tdb, uint32_t offset, int ltype,