CLEANUP : reflected minwoojin review

naver · Sep 15, 2017 · c8e71d8 · c8e71d8
1 parent 17aaf07
commit c8e71d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/engines/default/items.c b/engines/default/items.c
@@ -4483,7 +4483,6 @@ static ENGINE_ERROR_CODE do_btree_elem_get(struct default_engine *engine, btree_
 #endif
                                            uint32_t *access_count, bool *potentialbkeytrim)
 {
-
     btree_elem_posi  path[BTREE_MAX_DEPTH];
     btree_elem_item *elem;
     uint32_t tot_found = 0; /* total found count */

diff --git a/include/memcached/types.h b/include/memcached/types.h
@@ -405,8 +405,9 @@ extern "C" {
 #define EBLOCK_SCAN_NEXT(s, e)                                               \
     do {                                                                     \
         if ((s)->idx < (s)->tot) {                                           \
-            if (((s)->idx % EITEMS_PER_BLOCK) == 0 && ((s)->idx != 0))       \
+            if (((s)->idx % EITEMS_PER_BLOCK) == 0 && ((s)->idx != 0)) {     \
                 (s)->blk = ((s)->blk)->next;                                 \
+            }                                                                \
             (e) = ((s)->blk)->items[(s)->idx++ % EITEMS_PER_BLOCK];          \
         } else {                                                             \
             (e) = NULL;                                                      \

diff --git a/memcached.c b/memcached.c
@@ -5827,6 +5827,7 @@ static void process_bin_bop_get(conn *c) {
     case ENGINE_SUCCESS:
         {
         protocol_binary_response_bop_get* rsp = (protocol_binary_response_bop_get*)c->wbuf;
+        eitem_info info[elem_count];
 #ifdef USE_EBLOCK_RESULT
         eitem *elem;
         eblock_scan_t eblk_sc;
@@ -5846,10 +5847,7 @@ static void process_bin_bop_get(conn *c) {
             ret = ENGINE_ENOMEM;
         } else {
             vlenptr = (uint32_t *)((char*)bkeyptr + (sizeof(uint64_t) * elem_count));
-#endif
-        eitem_info info[elem_count];
-#ifdef USE_EBLOCK_RESULT
-        EBLOCK_SCAN_INIT(&c->eblk_ret, &eblk_sc);
+            EBLOCK_SCAN_INIT(&c->eblk_ret, &eblk_sc);
 #endif
         for (i = 0; i < elem_count; i++) {
 #ifdef USE_EBLOCK_RESULT