X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Fopen.c;h=a5a8e875cbcd5ca4ad927ee93474a25b01ab6252;hp=69885284c55d6abfce78b4d15d9b126a442d8ea1;hb=bcf7916c5d694858766869dfd570e525127154a6;hpb=3c81225fc0a4fb99d10282ebf11b7ec6ae1eabdd

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index 69885284..a5a8e875 100644
--- 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;
@@ -324,11 +326,12 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 
 		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);
+		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
 
@@ -348,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);
@@ -409,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);