Address comments

Author: emasab

src/rdkafka.c

@@ -5084,12 +5084,12 @@ rd_kafka_Uuid_t *rd_kafka_Uuid_copy(const rd_kafka_Uuid_t *uuid) {
  *
  * @remark Must be freed after use using rd_kafka_Uuid_destroy().
  */
-rd_kafka_Uuid_t *rd_kafka_Uuid_random() {
+rd_kafka_Uuid_t rd_kafka_Uuid_random() {
         int i;
-        unsigned char rand_values_bytes[16] = {};
+        unsigned char rand_values_bytes[16] = {0};
         uint64_t *rand_values_uint64        = (uint64_t *)rand_values_bytes;
         unsigned char *rand_values_app;
-        rd_kafka_Uuid_t *ret = rd_kafka_Uuid_copy(&RD_KAFKA_UUID_ZERO);
+        rd_kafka_Uuid_t ret = RD_KAFKA_UUID_ZERO;
         for (i = 0; i < 16; i += 2) {
                 uint16_t rand_uint16 = (uint16_t)rd_jitter(0, INT16_MAX - 1);
                 /* No need to convert endianess here because it's still only
@@ -5104,8 +5104,8 @@ rd_kafka_Uuid_t *rd_kafka_Uuid_random() {
         rand_values_bytes[8] &= 0x3f; /* clear variant */
         rand_values_bytes[8] |= 0x80; /* IETF variant */
 
-        ret->most_significant_bits  = be64toh(rand_values_uint64[0]);
-        ret->least_significant_bits = be64toh(rand_values_uint64[1]);
+        ret.most_significant_bits  = be64toh(rand_values_uint64[0]);
+        ret.least_significant_bits = be64toh(rand_values_uint64[1]);
         return ret;
 }
 

src/rdkafka_int.h

@@ -1056,8 +1056,5 @@ rd_kafka_resp_err_t rd_kafka_background_thread_create(rd_kafka_t *rk,
                                                       char *errstr,
                                                       size_t errstr_size);
 
-RD_EXPORT rd_kafka_Uuid_t *rd_kafka_Uuid_random();
-
-RD_EXPORT const char *rd_kafka_Uuid_str(const rd_kafka_Uuid_t *uuid);
 
 #endif /* _RDKAFKA_INT_H_ */

src/rdkafka_mock.c

@@ -616,15 +616,13 @@ rd_kafka_mock_topic_new(rd_kafka_mock_cluster_t *mcluster,
                         int partition_cnt,
                         int replication_factor) {
         rd_kafka_mock_topic_t *mtopic;
-        rd_kafka_Uuid_t *random_uuid = rd_kafka_Uuid_random();
         int i;
 
         mtopic = rd_calloc(1, sizeof(*mtopic));
         /* Assign random topic id */
-        mtopic->id      = *random_uuid;
+        mtopic->id      = rd_kafka_Uuid_random();
         mtopic->name    = rd_strdup(topic);
         mtopic->cluster = mcluster;
-        rd_kafka_Uuid_destroy(random_uuid);
 
         mtopic->partition_cnt = partition_cnt;
         mtopic->partitions =

src/rdkafka_proto.h

@@ -599,6 +599,10 @@ static RD_INLINE RD_UNUSED int rd_kafka_Uuid_cmp(rd_kafka_Uuid_t a,
                (a.least_significant_bits - b.least_significant_bits);
 }
 
+rd_kafka_Uuid_t rd_kafka_Uuid_random();
+
+const char *rd_kafka_Uuid_str(const rd_kafka_Uuid_t *uuid);
+
 /**
  * @name Producer ID and Epoch for the Idempotent Producer
  * @{