From 475273a4d46df5e3e68aa87c71495c02d9a7ec42 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 31 Dec 2014 11:04:23 +0100 Subject: [PATCH] (rarchdb) Fix some 'statement is unreachable' warnings --- rarchdb/rmsgpack.c | 2 -- rarchdb/rmsgpack_dom.c | 13 +------------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/rarchdb/rmsgpack.c b/rarchdb/rmsgpack.c index 585a002de6..31aeb8ea0a 100644 --- a/rarchdb/rmsgpack.c +++ b/rarchdb/rmsgpack.c @@ -534,14 +534,12 @@ int rmsgpack_read(int fd, struct rmsgpack_read_callbacks *callbacks, void *data) return -errno; return read_array(fd, tmp_len, callbacks, data); - break; case 0xde: case 0xdf: if(read_uint(fd, &tmp_len, 2<<(type - 0xde)) == -1) return -errno; return read_map(fd, tmp_len, callbacks, data); - break; } return 0; diff --git a/rarchdb/rmsgpack_dom.c b/rarchdb/rmsgpack_dom.c index 8d9bc5c7c8..4e4740efb9 100644 --- a/rarchdb/rmsgpack_dom.c +++ b/rarchdb/rmsgpack_dom.c @@ -205,26 +205,20 @@ int rmsgpack_dom_value_cmp( { case RDT_NULL: return 0; - break; case RDT_BOOL: return a->bool_ == b->bool_ ? 1 : 0; - break; case RDT_INT: return a->int_ == b->int_ ? 1 : 0; - break; case RDT_UINT: return a->uint_ == b->uint_ ? 1 : 0; - break; case RDT_STRING: if (a->string.len != b->string.len) return 1; return strncmp(a->string.buff, b->string.buff, a->string.len); - break; case RDT_BINARY: if (a->binary.len != b->binary.len) return 1; return memcmp(a->binary.buff, b->binary.buff, a->binary.len); - break; case RDT_MAP: if (a->map.len != b->map.len) return 1; @@ -246,6 +240,7 @@ int rmsgpack_dom_value_cmp( } break; } + return 1; } @@ -320,22 +315,16 @@ int rmsgpack_dom_write(int fd, const struct rmsgpack_dom_value *obj) { case RDT_NULL: return rmsgpack_write_nil(fd); - break; case RDT_BOOL: return rmsgpack_write_bool(fd, obj->bool_); - break; case RDT_INT: return rmsgpack_write_int(fd, obj->int_); - break; case RDT_UINT: return rmsgpack_write_uint(fd, obj->uint_); - break; case RDT_STRING: return rmsgpack_write_string(fd, obj->string.buff, obj->string.len); - break; case RDT_BINARY: return rmsgpack_write_bin(fd, obj->binary.buff, obj->binary.len); - break; case RDT_MAP: if ((rv = rmsgpack_write_map_header(fd, obj->map.len)) < 0) return rv;