Fix for 1278834

[awesomized/libmemcached] / clients / generator.cc

diff --git a/clients/generator.cc b/clients/generator.cc
index e41d9c58acecdf53f9a7a0ed90a4917f1ee62f23..1f40daedbc6fd21a1b70fac8c6433d1c892d5ded 100644 (file)
--- a/clients/generator.cc
+++ b/clients/generator.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <stdint.h>
 
@@ -20,7 +20,9 @@
 #include <iostream>
 #include <unistd.h>
 
-#include "generator.h"
+#include "clients/generator.h"
+
+#define KEY_BYTES 20
 
 /* Use this for string generation */
 static const char ALPHANUMERICS[]=
@@ -33,12 +35,14 @@ static size_t get_alpha_num(void)
   return (size_t)random() % ALPHANUMERICS_SIZE;
 }
 
-static void get_random_string(char *buffer, size_t size)
+void get_random_string(char *buffer, size_t size)
 {
   char *buffer_ptr= buffer;
 
   while (--size)
+  {
     *buffer_ptr++= ALPHANUMERICS[get_alpha_num()];
+  }
   *buffer_ptr++= ALPHANUMERICS[get_alpha_num()];
 }
 
@@ -73,13 +77,13 @@ pairs_st *pairs_generate(uint64_t number_of, size_t value_length)
 
   for (uint64_t x= 0; x < number_of; x++)
   {
-    pairs[x].key= (char *)calloc(100, sizeof(char));
+    pairs[x].key= (char *)calloc(KEY_BYTES, sizeof(char));
 
     if (pairs[x].key == NULL)
       goto error;
 
-    get_random_string(pairs[x].key, 100);
-    pairs[x].key_length= 100;
+    get_random_string(pairs[x].key, KEY_BYTES);
+    pairs[x].key_length= KEY_BYTES;
 
     if (value_length)
     {