From: Brian Aker <brian@tangent.org>
Date: Thu, 10 May 2012 20:04:34 +0000 (-0700)
Subject: Updated libmemcached
X-Git-Tag: 1.0.8~6^2~2
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Flibmemcached;a=commitdiff_plain;h=8eeaff6bb2b5bad5113dcbaab2a3c751e94c6177;hp=e50ced7764a1ddb80aba8f7c8851c4181a2cfc4e

Updated libmemcached
---

diff --git a/memcached/.gitignore b/memcached/.gitignore
deleted file mode 100644
index 1dbb0413..00000000
--- a/memcached/.gitignore
+++ /dev/null
@@ -1,41 +0,0 @@
-*.[ao]
-*.gcov
-*.gcda
-*.gcno
-*.tcov
-.deps
-INSTALL
-Makefile
-Makefile.in
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-aclocal.m4
-compile
-autom4te.cache
-configure
-depcomp
-install-sh
-memcached
-memcached-debug
-memcached-debug.profile
-missing
-stamp-h1
-tags
-TAGS
-cscope.out
-memcached_dtrace.h
-*~
-memcached-*.tar.gz
-doc/protocol-binary-range.txt
-doc/protocol-binary.txt
-/sizes
-/version.m4
-/version.num
-/testapp
-/timedrun
-/doc/doxy
-/memcached.spec
diff --git a/memcached/hash.c b/memcached/hash.c
index f7d21dd3..6c9b9b6a 100644
--- a/memcached/hash.c
+++ b/memcached/hash.c
@@ -178,6 +178,8 @@ uint32_t hash(
     case 2 : a+=k[0]&0xffff; break;
     case 1 : a+=k[0]&0xff; break;
     case 0 : return c;  /* zero length strings require no mixing */
+    default:
+             abort();
     }
 
 #else /* make valgrind happy */
@@ -247,6 +249,8 @@ uint32_t hash(
     case 1 : a+=k8[0];
              break;
     case 0 : return c;  /* zero length strings require no mixing */
+    default:
+             abort();
     }
 
   } else {                        /* need to read the key one byte at a time */
@@ -289,6 +293,8 @@ uint32_t hash(
     case 1 : a+=k[0];
              break;
     case 0 : return c;  /* zero length strings require no mixing */
+    default:
+             abort();
     }
   }
 
diff --git a/memcached/memcached.c b/memcached/memcached.c
index d4b48121..10374421 100644
--- a/memcached/memcached.c
+++ b/memcached/memcached.c
@@ -1000,6 +1000,10 @@ static void write_bin_error(conn *c, protocol_binary_response_status err, int sw
     case PROTOCOL_BINARY_RESPONSE_AUTH_ERROR:
         errstr = "Auth failure.";
         break;
+    case PROTOCOL_BINARY_RESPONSE_AUTH_CONTINUE:
+        assert(false);
+    case PROTOCOL_BINARY_RESPONSE_SUCCESS:
+        assert(false);
     default:
         assert(false);
         errstr = "UNHANDLED ERROR";
@@ -1129,6 +1133,10 @@ static void complete_incr_bin(conn *c) {
     case DELTA_ITEM_CAS_MISMATCH:
         write_bin_error(c, PROTOCOL_BINARY_RESPONSE_KEY_EEXISTS, 0);
         break;
+
+    default:
+        assert(0);
+        abort();
     }
 }
 
@@ -1196,6 +1204,9 @@ static void complete_update_bin(conn *c) {
             eno = PROTOCOL_BINARY_RESPONSE_NOT_STORED;
         }
         write_bin_error(c, eno, 0);
+    default:
+        assert(false);
+        abort();
     }
 
     item_remove(c->item);       /* release the c->item reference */
@@ -2235,6 +2246,10 @@ static void complete_nread_binary(conn *c) {
     case bin_reading_sasl_auth_data:
         process_bin_complete_sasl_auth(c);
         break;
+    case bin_reading_cas_header:
+        assert(0);
+    case bin_no_state:
+        assert(0);
     default:
         fprintf(stderr, "Not handling substate %d\n", c->substate);
         assert(0);
@@ -3057,6 +3072,9 @@ static void process_arithmetic_command(conn *c, token_t *tokens, const size_t nt
         break;
     case DELTA_ITEM_CAS_MISMATCH:
         break; /* Should never get here */
+    default:
+        assert(false);
+        abort();
     }
 }
 
@@ -3391,6 +3409,9 @@ static void process_command(conn *c, char *command) {
             case REASSIGN_SRC_DST_SAME:
                 out_string(c, "SAME src and dst class are identical");
                 break;
+            default:
+                assert(false);
+                abort();
             }
             return;
         } else if (ntokens == 4 &&
@@ -3845,6 +3866,9 @@ static void drive_machine(conn *c) {
             case READ_MEMORY_ERROR: /* Failed to allocate more memory */
                 /* State already set by try_read_network */
                 break;
+            default:
+                assert(false);
+                abort();
             }
             break;
 
@@ -4054,6 +4078,9 @@ static void drive_machine(conn *c) {
             case TRANSMIT_SOFT_ERROR:
                 stop = true;
                 break;
+            default:
+                assert(false);
+                abort();
             }
             break;
 
@@ -4068,6 +4095,9 @@ static void drive_machine(conn *c) {
         case conn_max_state:
             assert(false);
             break;
+        default:
+            assert(false);
+            abort();
         }
     }
 
diff --git a/memcached/slabs.c b/memcached/slabs.c
index 5af0b5ae..7cffe434 100644
--- a/memcached/slabs.c
+++ b/memcached/slabs.c
@@ -597,6 +597,9 @@ static int slab_rebalance_move(void) {
                 break;
             case MOVE_PASS:
                 break;
+            default:
+                assert(false);
+                abort();
         }
 
         slab_rebal.slab_pos = (char *)slab_rebal.slab_pos + s_cls->size;