various: add LICENSE comments.

[ccan] / ccan / tdb / io.c

diff --git a/ccan/tdb/io.c b/ccan/tdb/io.c
index 929290c1407b092ab2b4eb38ca704efbf450cd75..2262eabf93b19daf524b3876d8b7f55c1fe882ea 100644 (file)
--- a/ccan/tdb/io.c
+++ b/ccan/tdb/io.c
@@ -125,9 +125,17 @@ static int tdb_write(struct tdb_context *tdb, tdb_off_t off,
 /* Endian conversion: we only ever deal with 4 byte quantities */
 void *tdb_convert(void *buf, uint32_t size)
 {
-       uint32_t i, *p = (uint32_t *)buf;
-       for (i = 0; i < size / 4; i++)
-               p[i] = TDB_BYTEREV(p[i]);
+       uint32_t i;
+       unsigned char *p = buf, tmp;
+
+       for (i = 0; i < size; i += 4) {
+               tmp = p[i];
+               p[i] = p[i+3];
+               p[i+3] = tmp;
+               tmp = p[i+1];
+               p[i+1] = p[i+2];
+               p[i+2] = tmp;
+       }
        return buf;
 }
 
@@ -194,7 +202,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 +396,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 +471,6 @@ static const struct tdb_methods io_methods = {
        tdb_next_hash_chain,
        tdb_oob,
        tdb_expand_file,
-       tdb_brlock,
-       tdb_brunlock
 };
 
 /*