X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemcapable.c;h=3de6baf18205837c32738e1c95bc112df283a790;hb=07e0de42263978e78c08a2663425f7e6f16f6c7e;hp=4feb96ef07b9249e4836e40dc448a8ea46acb96e;hpb=9c484853399248f4ea8da7aecccc5cf7d59963c7;p=awesomized%2Flibmemcached

diff --git a/clients/memcapable.c b/clients/memcapable.c
index 4feb96ef..3de6baf1 100644
--- a/clients/memcapable.c
+++ b/clients/memcapable.c
@@ -1267,8 +1267,7 @@ static enum test_return test_ascii_set_impl(const char* key, bool noreply)
 {
   /* @todo add tests for bogus format! */
   char buffer[1024];
-  sprintf(buffer, "set %s 0 0 5%s\r\nvalue\r\n", key,
-          noreply ? " noreply" : "");
+  snprintf(buffer, sizeof(buffer), "set %s 0 0 5%s\r\nvalue\r\n", key, noreply ? " noreply" : "");
   execute(send_string(buffer));
 
   if (!noreply)
@@ -1291,8 +1290,7 @@ static enum test_return test_ascii_add_impl(const char* key, bool noreply)
 {
   /* @todo add tests for bogus format! */
   char buffer[1024];
-  sprintf(buffer, "add %s 0 0 5%s\r\nvalue\r\n", key,
-          noreply ? " noreply" : "");
+  snprintf(buffer, sizeof(buffer), "add %s 0 0 5%s\r\nvalue\r\n", key, noreply ? " noreply" : "");
   execute(send_string(buffer));
 
   if (!noreply)
@@ -1316,17 +1314,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 +1338,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));
@@ -1395,7 +1392,7 @@ static enum test_return ascii_get_item(const char *key, const char *value,
     datasize= strlen(value);
 
   verify(datasize < sizeof(buffer));
-  sprintf(buffer, "get %s\r\n", key);
+  snprintf(buffer, sizeof(buffer), "get %s\r\n", key);
   execute(send_string(buffer));
 
   if (exist)
@@ -1456,7 +1453,7 @@ static enum test_return ascii_gets_item(const char *key, const char *value,
     datasize= strlen(value);
 
   verify(datasize < sizeof(buffer));
-  sprintf(buffer, "gets %s\r\n", key);
+  snprintf(buffer, sizeof(buffer), "gets %s\r\n", key);
   execute(send_string(buffer));
 
   if (exist)
@@ -1472,7 +1469,7 @@ static enum test_return ascii_set_item(const char *key, const char *value)
 {
   char buffer[300];
   size_t len= strlen(value);
-  sprintf(buffer, "set %s 0 0 %u\r\n", key, (unsigned int)len);
+  snprintf(buffer, sizeof(buffer), "set %s 0 0 %u\r\n", key, (unsigned int)len);
   execute(send_string(buffer));
   execute(retry_write(value, len));
   execute(send_string("\r\n"));
@@ -1483,8 +1480,7 @@ static enum test_return ascii_set_item(const char *key, const char *value)
 static enum test_return test_ascii_replace_impl(const char* key, bool noreply)
 {
   char buffer[1024];
-  sprintf(buffer, "replace %s 0 0 5%s\r\nvalue\r\n", key,
-          noreply ? " noreply" : "");
+  snprintf(buffer, sizeof(buffer), "replace %s 0 0 5%s\r\nvalue\r\n", key, noreply ? " noreply" : "");
   execute(send_string(buffer));
 
   if (noreply)
@@ -1524,8 +1520,7 @@ static enum test_return test_ascii_cas_impl(const char* key, bool noreply)
   execute(ascii_set_item(key, "value"));
   execute(ascii_gets_item(key, "value", true, &cas));
 
-  sprintf(buffer, "cas %s 0 0 6 %lu%s\r\nvalue2\r\n", key, cas,
-          noreply ? " noreply" : "");
+  snprintf(buffer, sizeof(buffer), "cas %s 0 0 6 %lu%s\r\nvalue2\r\n", key, cas, noreply ? " noreply" : "");
   execute(send_string(buffer));
 
   if (noreply)
@@ -1565,7 +1560,7 @@ static enum test_return test_ascii_delete_impl(const char *key, bool noreply)
   execute(receive_error_response());
 
   char buffer[1024];
-  sprintf(buffer, "delete %s%s\r\n", key, noreply ? " noreply" : "");
+  snprintf(buffer, sizeof(buffer), "delete %s%s\r\n", key, noreply ? " noreply" : "");
   execute(send_string(buffer));
 
   if (noreply)
@@ -1620,7 +1615,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 +1625,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 +1644,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 +1664,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;
@@ -1676,7 +1673,7 @@ static enum test_return test_ascii_mget(void)
 static enum test_return test_ascii_incr_impl(const char* key, bool noreply)
 {
   char cmd[300];
-  sprintf(cmd, "incr %s 1%s\r\n", key, noreply ? " noreply" : "");
+  snprintf(cmd, sizeof(cmd), "incr %s 1%s\r\n", key, noreply ? " noreply" : "");
 
   execute(ascii_set_item(key, "0"));
   for (int x= 1; x < 11; ++x)
@@ -1712,7 +1709,7 @@ static enum test_return test_ascii_incr_noreply(void)
 static enum test_return test_ascii_decr_impl(const char* key, bool noreply)
 {
   char cmd[300];
-  sprintf(cmd, "decr %s 1%s\r\n", key, noreply ? " noreply" : "");
+  snprintf(cmd, sizeof(cmd), "decr %s 1%s\r\n", key, noreply ? " noreply" : "");
 
   execute(ascii_set_item(key, "9"));
   for (int x= 8; x > -1; --x)
@@ -1814,10 +1811,10 @@ static enum test_return test_ascii_concat_impl(const char *key,
     value="hello";
 
   char cmd[400];
-  sprintf(cmd, "%s %s 0 0 %u%s\r\n%s\r\n",
-          append ? "append" : "prepend",
-          key, (unsigned int)strlen(value), noreply ? " noreply" : "",
-          value);
+  snprintf(cmd, sizeof(cmd), "%s %s 0 0 %u%s\r\n%s\r\n",
+           append ? "append" : "prepend",
+           key, (unsigned int)strlen(value), noreply ? " noreply" : "",
+           value);
   execute(send_string(cmd));
 
   if (noreply)
@@ -1827,10 +1824,10 @@ static enum test_return test_ascii_concat_impl(const char *key,
 
   execute(ascii_get_item(key, "hello world", true));
 
-  sprintf(cmd, "%s %s_notfound 0 0 %u%s\r\n%s\r\n",
-          append ? "append" : "prepend",
-          key, (unsigned int)strlen(value), noreply ? " noreply" : "",
-          value);
+  snprintf(cmd, sizeof(cmd), "%s %s_notfound 0 0 %u%s\r\n%s\r\n",
+           append ? "append" : "prepend",
+           key, (unsigned int)strlen(value), noreply ? " noreply" : "",
+           value);
   execute(send_string(cmd));
 
   if (noreply)