projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating Patrick's C++ exceptions to build without warnings on solaris.
[m6w6/libmemcached]
/
clients
/
generator.c
diff --git
a/clients/generator.c
b/clients/generator.c
index 793157ef52666e611b4a8fd3a4bb7732876679bd..213246ba2206a3d84916c8503c43c089bc26e975 100644
(file)
--- a/
clients/generator.c
+++ b/
clients/generator.c
@@
-1,5
+1,8
@@
+#include "libmemcached/common.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include "generator.h"
#include <string.h>
#include "generator.h"
@@
-10,18
+13,23
@@
static const char ALPHANUMERICS[]=
#define ALPHANUMERICS_SIZE (sizeof(ALPHANUMERICS)-1)
#define ALPHANUMERICS_SIZE (sizeof(ALPHANUMERICS)-1)
+static size_t get_alpha_num(void)
+{
+ return (size_t)random() % ALPHANUMERICS_SIZE;
+}
+
static void get_random_string(char *buffer, size_t size)
{
char *buffer_ptr= buffer;
while (--size)
static void get_random_string(char *buffer, size_t size)
{
char *buffer_ptr= buffer;
while (--size)
- *buffer_ptr++= ALPHANUMERICS[
random() % ALPHANUMERICS_SIZE
];
- *buffer_ptr++= ALPHANUMERICS[
random() % ALPHANUMERICS_SIZE
];
+ *buffer_ptr++= ALPHANUMERICS[
get_alpha_num()
];
+ *buffer_ptr++= ALPHANUMERICS[
get_alpha_num()
];
}
void pairs_free(pairs_st *pairs)
{
}
void pairs_free(pairs_st *pairs)
{
- u
nsigned in
t x;
+ u
int32_
t x;
if (!pairs)
return;
if (!pairs)
return;
@@
-36,27
+44,23
@@
void pairs_free(pairs_st *pairs)
free(pairs);
}
free(pairs);
}
-pairs_st *pairs_generate(u
nsigned long long
number_of, size_t value_length)
+pairs_st *pairs_generate(u
int64_t
number_of, size_t value_length)
{
unsigned int x;
{
unsigned int x;
- pairs_st *pairs;
-
- pairs= (pairs_st*)malloc(sizeof(pairs_st) * (number_of+1));
+ pairs_st *pairs= calloc((size_t)(number_of + 1), sizeof(pairs_st));
if (!pairs)
goto error;
if (!pairs)
goto error;
- memset(pairs, 0, sizeof(pairs_st) * (number_of+1));
-
for (x= 0; x < number_of; x++)
{
for (x= 0; x < number_of; x++)
{
- pairs[x].key= (char *)
malloc(sizeof(char) * 100
);
+ pairs[x].key= (char *)
calloc(100, sizeof(char)
);
if (!pairs[x].key)
goto error;
get_random_string(pairs[x].key, 100);
pairs[x].key_length= 100;
if (!pairs[x].key)
goto error;
get_random_string(pairs[x].key, 100);
pairs[x].key_length= 100;
- pairs[x].value= (char *)
malloc(sizeof(char) * value_length
);
+ pairs[x].value= (char *)
calloc(value_length, sizeof(char)
);
if (!pairs[x].value)
goto error;
get_random_string(pairs[x].value, value_length);
if (!pairs[x].value)
goto error;
get_random_string(pairs[x].value, value_length);