X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Fio.c;h=e56be6fa38362e9b8666f34deb43c38b80831a13;hp=929290c1407b092ab2b4eb38ca704efbf450cd75;hb=c4c5fed020ba44b9930119672a36a1cb33aff090;hpb=03d4aa56b8bd381db449b36befa6928594cea994 diff --git a/ccan/tdb/io.c b/ccan/tdb/io.c index 929290c1..e56be6fa 100644 --- a/ccan/tdb/io.c +++ b/ccan/tdb/io.c @@ -194,7 +194,9 @@ int tdb_munmap(struct tdb_context *tdb) #if HAVE_MMAP if (tdb->map_ptr) { - int ret = munmap(tdb->map_ptr, tdb->map_size); + int ret; + + ret = munmap(tdb->map_ptr, tdb->map_size); if (ret != 0) return ret; } @@ -386,6 +388,7 @@ unsigned char *tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset, tdb_len unsigned char *buf; /* some systems don't like zero length malloc */ + if (!(buf = (unsigned char *)malloc(len ? len : 1))) { /* Ensure ecode is set for log fn. */ tdb->ecode = TDB_ERR_OOM; @@ -460,8 +463,6 @@ static const struct tdb_methods io_methods = { tdb_next_hash_chain, tdb_oob, tdb_expand_file, - tdb_brlock, - tdb_brunlock }; /*