Use _ convention everywhere: lock.c uses it already.

[ccan] / ccan / tdb / open.c

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index 4a1cb235e271228564038c6173b1056b21573be1..0318530f99684bd2ec035da33822297af58aca68 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 */
@@ -248,17 +247,19 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 
        errno = 0;
        if (read(tdb->fd, &tdb->header, sizeof(tdb->header)) != sizeof(tdb->header)
-           || strcmp(tdb->header.magic_food, TDB_MAGIC_FOOD) != 0
-           || (tdb->header.version != TDB_VERSION
-               && !(rev = (tdb->header.version==TDB_BYTEREV(TDB_VERSION))))) {
-               /* its not a valid database - possibly initialise it */
+           || strcmp(tdb->header.magic_food, TDB_MAGIC_FOOD) != 0) {
                if (!(open_flags & O_CREAT) || tdb_new_database(tdb, hash_size) == -1) {
                        if (errno == 0) {
-                       errno = EIO; /* ie bad format or something */
+                               errno = EIO; /* ie bad format or something */
                        }
                        goto fail;
                }
                rev = (tdb->flags & TDB_CONVERT);
+       } else if (tdb->header.version != TDB_VERSION
+                  && !(rev = (tdb->header.version==TDB_BYTEREV(TDB_VERSION)))) {
+               /* wrong version */
+               errno = EIO;
+               goto fail;
        }
        vp = (unsigned char *)&tdb->header.version;
        vertest = (((uint32_t)vp[0]) << 24) | (((uint32_t)vp[1]) << 16) |
@@ -322,12 +323,18 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
        }
 
 #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_enable_seqnum(tdb);
-       tdb_trace_open(tdb, "tdb_open", hash_size, tdb_flags, open_flags);
+       {
+               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:
@@ -346,8 +353,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);
@@ -385,7 +393,7 @@ int tdb_close(struct tdb_context *tdb)
 
        tdb_trace(tdb, "tdb_close");
        if (tdb->transaction) {
-               tdb_transaction_cancel_internal(tdb);
+               _tdb_transaction_cancel(tdb);
        }
 
        if (tdb->map_ptr) {
@@ -407,7 +415,9 @@ int tdb_close(struct tdb_context *tdb)
                }
        }
 
+#ifdef TDB_TRACE
        close(tdb->tracefd);
+#endif
        memset(tdb, 0, sizeof(*tdb));
        SAFE_FREE(tdb);