X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fgenerator.cc;h=1f40daedbc6fd21a1b70fac8c6433d1c892d5ded;hb=b220134a312e2a488810abfef510f5dbf59078a4;hp=c62f9a32214cb8af49086781f2cfab0e759a8553;hpb=9069819ac2940397e96210867e0666b801b97f60;p=awesomized%2Flibmemcached

diff --git a/clients/generator.cc b/clients/generator.cc
index c62f9a32..1f40daed 100644
--- a/clients/generator.cc
+++ b/clients/generator.cc
@@ -1,4 +1,5 @@
 /* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
@@ -9,7 +10,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <stdint.h>
 
@@ -19,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[]=
@@ -32,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()];
 }
 
@@ -53,7 +58,9 @@ void pairs_free(pairs_st *pairs)
   {
     free(pairs[x].key);
     if (pairs[x].value)
+    {
       free(pairs[x].value);
+    }
   }
 
   free(pairs);
@@ -70,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)
     {