Change rack_id to rack in Node public API

confluentinc · Sep 14, 2023 · d90bb98 · d90bb98
1 parent 0233c0f
commit d90bb98
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/examples/describe_topics.c b/examples/describe_topics.c
@@ -149,7 +149,7 @@ static void print_node_info(const rd_kafka_Node_t *node) {
                ", host: %s"
                ", port: %" PRIu16 ", rack %s]\n",
                rd_kafka_Node_id(node), rd_kafka_Node_host(node),
-               rd_kafka_Node_port(node), rd_kafka_Node_rack_id(node));
+               rd_kafka_Node_port(node), rd_kafka_Node_rack(node));
 }
 
 /**

diff --git a/src/rdkafka.h b/src/rdkafka.h
@@ -4981,7 +4981,7 @@ uint16_t rd_kafka_Node_port(const rd_kafka_Node_t *node);
  * @return The node rack id. May be NULL.
  */
 RD_EXPORT
-const char *rd_kafka_Node_rack_id(const rd_kafka_Node_t *node);
+const char *rd_kafka_Node_rack(const rd_kafka_Node_t *node);
 
 /**@}*/
 

diff --git a/src/rdkafka_aux.c b/src/rdkafka_aux.c
@@ -238,13 +238,13 @@ void rd_kafka_acl_result_free(void *ptr) {
 rd_kafka_Node_t *rd_kafka_Node_new(int32_t id,
                                    const char *host,
                                    uint16_t port,
-                                   const char *rack_id) {
+                                   const char *rack) {
         rd_kafka_Node_t *ret = rd_calloc(1, sizeof(*ret));
         ret->id              = id;
         ret->port            = port;
         ret->host            = rd_strdup(host);
-        if (rack_id != NULL)
-                ret->rack_id = rd_strdup(rack_id);
+        if (rack != NULL)
+                ret->rack = rd_strdup(rack);
         return ret;
 }
 
@@ -284,7 +284,7 @@ rd_kafka_Node_t *rd_kafka_Node_new_from_brokers(
         node->host = rd_strdup(broker->host);
         node->port = broker->port;
         if (broker_internal && broker_internal->rack_id)
-                node->rack_id = rd_strdup(broker_internal->rack_id);
+                node->rack = rd_strdup(broker_internal->rack_id);
 
         return node;
 }
@@ -297,13 +297,13 @@ rd_kafka_Node_t *rd_kafka_Node_new_from_brokers(
  *         Use rd_kafka_Node_destroy() to free when done.
  */
 rd_kafka_Node_t *rd_kafka_Node_copy(const rd_kafka_Node_t *src) {
-        return rd_kafka_Node_new(src->id, src->host, src->port, src->rack_id);
+        return rd_kafka_Node_new(src->id, src->host, src->port, src->rack);
 }
 
 void rd_kafka_Node_destroy(rd_kafka_Node_t *node) {
         rd_free(node->host);
-        if (node->rack_id)
-                rd_free(node->rack_id);
+        if (node->rack)
+                rd_free(node->rack);
         rd_free(node);
 }
 
@@ -329,6 +329,6 @@ uint16_t rd_kafka_Node_port(const rd_kafka_Node_t *node) {
         return node->port;
 }
 
-const char *rd_kafka_Node_rack_id(const rd_kafka_Node_t *node) {
-        return node->rack_id;
+const char *rd_kafka_Node_rack(const rd_kafka_Node_t *node) {
+        return node->rack;
 }
diff --git a/src/rdkafka_aux.h b/src/rdkafka_aux.h
@@ -108,7 +108,7 @@ typedef struct rd_kafka_Node_s {
         int id;        /*< Node id */
         char *host;    /*< Node host */
         uint16_t port; /*< Node port */
-        char *rack_id; /*< (optional) Node rack id */
+        char *rack     /*< (optional) Node rack id */
 } rd_kafka_Node_t;
 
 rd_kafka_Node_t *rd_kafka_Node_new(int32_t id,