Merge remote-tracking branch 'origin/2.0.1'

* origin/2.0.1: Fix implicit pointer to integral type cast Fix strict aliasing issue/warning Change-Id: I476ab04812ec98b8283cbb11e9423bfa4724dc5d
couchbase · Jan 29, 2013 · cec5c09 · cec5c09
2 parents e3ac8d0 + 162935b
commit cec5c09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/db_compact.c b/src/db_compact.c
@@ -84,7 +84,7 @@ couchstore_error_t couchstore_compact_db_ex(Db* source, const char* target_filen
 
 couchstore_error_t couchstore_compact_db(Db* source, const char* target_filename)
 {
-    return couchstore_compact_db_ex(source, target_filename, NULL, couchstore_get_default_file_ops());
+    return couchstore_compact_db_ex(source, target_filename, 0, couchstore_get_default_file_ops());
 }
 
 static int read_id_record(FILE *in, void *buf, void *ctx)

diff --git a/src/node_types.h b/src/node_types.h
@@ -78,7 +78,7 @@ size_t encode_root(void *buf, node_pointer *node);
 static inline void decode_kv_length(const raw_kv_length *kv, uint32_t *klen, uint32_t *vlen)
 {
     //12, 28 bit
-    *klen = ntohs(*(uint16_t*)&kv->raw_kv[0]) >> 4;
+    *klen = (uint16_t) ((kv->raw_kv[0] << 4) | ((kv->raw_kv[1] & 0xf0) >> 4));
     *vlen = ntohl(*(uint32_t*)&kv->raw_kv[1]) & 0x0FFFFFFF;
 }