Merging Trond

[m6w6/libmemcached] / clients / memcapable.c

diff --git a/clients/memcapable.c b/clients/memcapable.c
index 4feb96ef07b9249e4836e40dc448a8ea46acb96e..a5a8185a2eeeb3ad33f05f28d6044468d7d637dd 100644 (file)
--- a/clients/memcapable.c
+++ b/clients/memcapable.c
@@ -1316,17 +1316,16 @@ static enum test_return test_ascii_add_noreply(void)
   return test_ascii_add_impl("test_ascii_add_noreply", true);
 }
 
-static enum test_return ascii_get_unknown_value(char **key, char **value,
-                                                ssize_t *ndata)
+static enum test_return ascii_get_unknown_value(char **key, char **value, ssize_t *ndata)
 {
   char buffer[1024];
 
   execute(receive_line(buffer, sizeof(buffer)));
   verify(strncmp(buffer, "VALUE ", 6) == 0);
-  char *end = strchr(buffer + 6, ' ');
+  char *end= strchr(buffer + 6, ' ');
   verify(end != NULL);
-  *end = '\0';
-  *key = strdup(buffer + 6);
+  *end= '\0';
+  *key= strdup(buffer + 6);
   verify(*key != NULL);
   char *ptr= end + 1;
 
@@ -1341,7 +1340,7 @@ static enum test_return ascii_get_unknown_value(char **key, char **value,
     ++end;
   verify(*end == '\n');
 
-  *value = malloc((size_t)*ndata);
+  *value= malloc((size_t)*ndata);
   verify(*value != NULL);
 
   execute(retry_read(*value, (size_t)*ndata));
@@ -1620,7 +1619,7 @@ static enum test_return test_ascii_gets(void)
 
 static enum test_return test_ascii_mget(void)
 {
-  const int nkeys= 5;
+  const uint32_t nkeys= 5;
   const char * const keys[]= {
     "test_ascii_mget1",
     "test_ascii_mget2",
@@ -1630,17 +1629,17 @@ static enum test_return test_ascii_mget(void)
     "test_ascii_mget6"
   };
 
-  for (int x= 0; x < nkeys; ++x)
+  for (uint32_t x= 0; x < nkeys; ++x)
     execute(ascii_set_item(keys[x], "value"));
 
   /* Ask for a key that doesn't exist as well */
-   execute(send_string("get test_ascii_mget1 test_ascii_mget2 test_ascii_mget3 "
-                       "test_ascii_mget4 test_ascii_mget5 "
-                       "test_ascii_mget6\r\n"));
+  execute(send_string("get test_ascii_mget1 test_ascii_mget2 test_ascii_mget3 "
+                      "test_ascii_mget4 test_ascii_mget5 "
+                      "test_ascii_mget6\r\n"));
 
-  char* returned[nkeys];
+  char *returned[nkeys];
 
-  for (int x= 0; x < nkeys; ++x)
+  for (uint32_t x= 0; x < nkeys; ++x)
   {
     ssize_t nbytes = 0;
     char *v= NULL;
@@ -1649,15 +1648,17 @@ static enum test_return test_ascii_mget(void)
     verify(memcmp(v, "value", 5) == 0);
     free(v);
   }
-   char buffer[5];
-   execute(retry_read(buffer, 5));
-   verify(memcmp(buffer, "END\r\n", 5) == 0);
+
+  char buffer[5];
+  execute(retry_read(buffer, 5));
+  verify(memcmp(buffer, "END\r\n", 5) == 0);
 
   /* verify that we got all the keys we expected */
-  for (int x= 0; x < nkeys; ++x)
+  for (uint32_t x= 0; x < nkeys; ++x)
   {
     bool found= false;
-    for (int y= 0; y < nkeys; ++y) {
+    for (uint32_t y= 0; y < nkeys; ++y)
+    {
       if (strcmp(keys[x], returned[y]) == 0)
       {
         found = true;
@@ -1667,7 +1668,7 @@ static enum test_return test_ascii_mget(void)
     verify(found);
   }
 
-  for (int x= 0; x < nkeys; ++x)
+  for (uint32_t x= 0; x < nkeys; ++x)
     free(returned[x]);
 
   return TEST_PASS;