Wean off TDB_ERRCODE.

[ccan] / ccan / tdb / open.c

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index 1e9ce83a25550c8f7434d6a4540a4034c901f4c3..a5a8e875cbcd5ca4ad927ee93474a25b01ab6252 100644 (file)
--- a/ccan/tdb/open.c
+++ b/ccan/tdb/open.c
@@ -55,8 +55,10 @@ static int tdb_new_database(struct tdb_context *tdb, int hash_size)
 
        /* We make it up in memory, then write it out if not internal */
        size = sizeof(struct tdb_header) + (hash_size+1)*sizeof(tdb_off_t);
-       if (!(newdb = (struct tdb_header *)calloc(size, 1)))
-               return TDB_ERRCODE(TDB_ERR_OOM, -1);
+       if (!(newdb = (struct tdb_header *)calloc(size, 1))) {
+               tdb->ecode = TDB_ERR_OOM;
+               return -1;
+       }
 
        /* Fill in the header */
        newdb->version = TDB_VERSION;
@@ -153,9 +155,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
        unsigned char *vp;
        uint32_t vertest;
        unsigned v;
-#ifdef TDB_TRACE
-       char tracefile[strlen(name) + 32];
-#endif
 
        if (!(tdb = (struct tdb_context *)calloc(1, sizeof *tdb))) {
                /* Can't log this */
@@ -163,15 +162,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                goto fail;
        }
 
-#ifdef TDB_TRACE
-       sprintf(tracefile, "%s.trace.%u", name, getpid());
-       tdb->tracefd = open(tracefile, O_WRONLY|O_CREAT|O_EXCL, 0600);
-       if (tdb->tracefd < 0)
-               goto fail;
-       tdb_trace(tdb, "tdb_open %s %u %#x %#x %p\n",
-                 name, hash_size, tdb_flags, open_flags, hash_fn);
-#endif
-
        tdb_io_init(tdb);
        tdb->fd = -1;
        tdb->name = NULL;
@@ -218,6 +208,10 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                        TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: tdb_new_database failed!"));
                        goto fail;
                }
+#ifdef TDB_TRACE
+               /* All tracing will fail.  That's ok. */
+               tdb->tracefd = -1;
+#endif
                goto internal;
        }
 
@@ -326,6 +320,21 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                goto fail;
        }
 
+#ifdef TDB_TRACE
+       {
+               char tracefile[strlen(name) + 32];
+
+               sprintf(tracefile, "%s.trace.%u", name, getpid());
+               tdb->tracefd = open(tracefile, O_WRONLY|O_CREAT|O_EXCL, 0600);
+               if (tdb->tracefd >= 0) {
+                       tdb_enable_seqnum(tdb);
+                       tdb_trace_open(tdb, "tdb_open", hash_size, tdb_flags,
+                                      open_flags);
+               } else
+                       TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: failed to open trace file %s!\n", tracefile));
+       }
+#endif
+
  internal:
        /* Internal (memory-only) databases skip all the code above to
         * do with disk files, and resume here by releasing their
@@ -342,8 +351,9 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
        if (!tdb)
                return NULL;
 
+#ifdef TDB_TRACE
        close(tdb->tracefd);
-       
+#endif
        if (tdb->map_ptr) {
                if (tdb->flags & TDB_INTERNAL)
                        SAFE_FREE(tdb->map_ptr);
@@ -379,7 +389,7 @@ int tdb_close(struct tdb_context *tdb)
        struct tdb_context **i;
        int ret = 0;
 
-       tdb_trace(tdb, "tdb_close\n");
+       tdb_trace(tdb, "tdb_close");
        if (tdb->transaction) {
                tdb_transaction_cancel_internal(tdb);
        }
@@ -403,7 +413,9 @@ int tdb_close(struct tdb_context *tdb)
                }
        }
 
+#ifdef TDB_TRACE
        close(tdb->tracefd);
+#endif
        memset(tdb, 0, sizeof(*tdb));
        SAFE_FREE(tdb);