X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Fcommon%2Fgenerator.cc;fp=src%2Fbin%2Fcommon%2Fgenerator.cc;h=6b4c3f9f6c38a08dca101ad23480e773dc1daa67;hb=7c2da91b9897c54f66e7fc634a675fcaeef32167;hp=3de895d0e2b64bc254d84b66430eb7553357e9be;hpb=f48bae7d4b6a832b0d3a71812125770f09c76239;p=awesomized%2Flibmemcached

diff --git a/src/bin/common/generator.cc b/src/bin/common/generator.cc
index 3de895d0..6b4c3f9f 100644
--- a/src/bin/common/generator.cc
+++ b/src/bin/common/generator.cc
@@ -1,14 +1,17 @@
-/* LibMemcached
- * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
- * Copyright (C) 2006-2009 Brian Aker
- * All rights reserved.
- *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
- *
- * Summary:
- *
- */
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached - C/C++ Client Library for memcached                  |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted under the terms of the BSD license.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
+    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    +--------------------------------------------------------------------+
+*/
 
 #include "mem_config.h"
 
@@ -25,40 +28,32 @@
 #define KEY_BYTES 20
 
 /* Use this for string generation */
-static const char ALPHANUMERICS[]=
-  "0123456789ABCDEFGHIJKLMNOPQRSTWXYZabcdefghijklmnopqrstuvwxyz";
+static const char ALPHANUMERICS[] = "0123456789ABCDEFGHIJKLMNOPQRSTWXYZabcdefghijklmnopqrstuvwxyz";
 
-#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 size_t get_alpha_num(void) {
+  return (size_t) random() % ALPHANUMERICS_SIZE;
 }
 
-void get_random_string(char *buffer, size_t size)
-{
-  char *buffer_ptr= buffer;
+void get_random_string(char *buffer, size_t size) {
+  char *buffer_ptr = buffer;
 
-  while (--size)
-  {
-    *buffer_ptr++= ALPHANUMERICS[get_alpha_num()];
+  while (--size) {
+    *buffer_ptr++ = ALPHANUMERICS[get_alpha_num()];
   }
-  *buffer_ptr++= ALPHANUMERICS[get_alpha_num()];
+  *buffer_ptr++ = ALPHANUMERICS[get_alpha_num()];
 }
 
-void pairs_free(pairs_st *pairs)
-{
-  if (pairs == NULL)
-  {
+void pairs_free(pairs_st *pairs) {
+  if (pairs == NULL) {
     return;
   }
 
   /* We free until we hit the null pair we stores during creation */
-  for (uint32_t x= 0; pairs[x].key; x++)
-  {
+  for (uint32_t x = 0; pairs[x].key; x++) {
     free(pairs[x].key);
-    if (pairs[x].value)
-    {
+    if (pairs[x].value) {
       free(pairs[x].value);
     }
   }
@@ -66,39 +61,33 @@ void pairs_free(pairs_st *pairs)
   free(pairs);
 }
 
-pairs_st *pairs_generate(uint64_t number_of, size_t value_length)
-{
-  pairs_st *pairs= (pairs_st*)calloc((size_t)number_of + 1, sizeof(pairs_st));
+pairs_st *pairs_generate(uint64_t number_of, size_t value_length) {
+  pairs_st *pairs = (pairs_st *) calloc((size_t) number_of + 1, sizeof(pairs_st));
 
-  if (pairs == NULL)
-  {
+  if (pairs == NULL) {
     goto error;
   }
 
-  for (uint64_t x= 0; x < number_of; x++)
-  {
-    pairs[x].key= (char *)calloc(KEY_BYTES, sizeof(char));
+  for (uint64_t x = 0; x < number_of; x++) {
+    pairs[x].key = (char *) calloc(KEY_BYTES, sizeof(char));
 
     if (pairs[x].key == NULL)
       goto error;
 
     get_random_string(pairs[x].key, KEY_BYTES);
-    pairs[x].key_length= KEY_BYTES;
+    pairs[x].key_length = KEY_BYTES;
 
-    if (value_length)
-    {
-      pairs[x].value= (char *)calloc(value_length, sizeof(char));
+    if (value_length) {
+      pairs[x].value = (char *) calloc(value_length, sizeof(char));
 
       if (pairs[x].value == NULL)
         goto error;
 
       get_random_string(pairs[x].value, value_length);
-      pairs[x].value_length= value_length;
-    }
-    else
-    {
-      pairs[x].value= NULL;
-      pairs[x].value_length= 0;
+      pairs[x].value_length = value_length;
+    } else {
+      pairs[x].value = NULL;
+      pairs[x].value_length = 0;
     }
   }