MINOR: tools: Rename `ha_generate_uuid` to `ha_generate_uuid_v4`

This is in preparation of adding support for other UUID versions.

diff --git a/addons/ot/src/scope.c b/addons/ot/src/scope.c
index efe8fe29f632438f1481219f7d70ceba3c4348fa..8a4c02f3cfbd6417b5561787638e290206db93d5 100644 (file)
--- a/addons/ot/src/scope.c
+++ b/addons/ot/src/scope.c
@@ -113,7 +113,7 @@ struct flt_ot_runtime_context *flt_ot_runtime_context_init(struct stream *s, str
        LIST_INIT(&(retptr->contexts));
 
        uuid = b_make(retptr->uuid, sizeof(retptr->uuid), 0, 0);
-       ha_generate_uuid(&uuid);
+       ha_generate_uuid_v4(&uuid);
 
 #ifdef USE_OT_VARS
        /*

diff --git a/include/haproxy/tools.h b/include/haproxy/tools.h
index 11082379c8d2c1d86cb1c6fd0adf4b12ef1251cd..cbce218dc68a373c2e3a1e38044c377c54fc7077 100644 (file)
--- a/include/haproxy/tools.h
+++ b/include/haproxy/tools.h
@@ -1056,7 +1056,7 @@ static inline void *my_realloc2(void *ptr, size_t size)
 int parse_dotted_uints(const char *s, unsigned int **nums, size_t *sz);
 
 /* PRNG */
-void ha_generate_uuid(struct buffer *output);
+void ha_generate_uuid_v4(struct buffer *output);
 void ha_random_seed(const unsigned char *seed, size_t len);
 void ha_random_jump96(uint32_t dist);
 uint64_t ha_random64(void);

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 3fc058c283484288cc4867a17716160c567f9efa..b180ba2dd56c668ea4910c648aa0b211bb111803 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -249,7 +249,7 @@ static const char *spoe_appctx_state_str[SPOE_APPCTX_ST_END+1] = {
 static char *
 generate_pseudo_uuid()
 {
-       ha_generate_uuid(&trash);
+       ha_generate_uuid_v4(&trash);
        return my_strndup(trash.area, trash.data);
 }
 

diff --git a/src/sample.c b/src/sample.c
index 334782c1732a44146fe492f6b6ccdef1aa9aa79c..8daa92424d3b7150acd18995c5f0e1cee40d2d47 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -4794,7 +4794,7 @@ static int smp_check_uuid(struct arg *args, char **err)
 static int smp_fetch_uuid(const struct arg *args, struct sample *smp, const char *kw, void *private)
 {
        if (args[0].data.sint == 4 || !args[0].type) {
-               ha_generate_uuid(&trash);
+               ha_generate_uuid_v4(&trash);
                smp->data.type = SMP_T_STR;
                smp->flags = SMP_F_VOL_TEST | SMP_F_MAY_CHANGE;
                smp->data.u.str = trash;

diff --git a/src/tools.c b/src/tools.c
index 09de5db20100b8166e27b5576ac1455e93e3f960..f3b095569ad7b5298b29ede9b836018dc3a79133 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -5581,10 +5581,10 @@ void ha_random_jump96(uint32_t dist)
        }
 }
 
-/* Generates an RFC4122 UUID into chunk <output> which must be at least 37
+/* Generates an RFC4122 version 4 UUID into chunk <output> which must be at least 37
  * bytes large.
  */
-void ha_generate_uuid(struct buffer *output)
+void ha_generate_uuid_v4(struct buffer *output)
 {
        uint32_t rnd[4];
        uint64_t last;