Remove redundant argument in parse_cluster_slots and parse_cluster_nodes

Signed-off-by: Björn Svensson <[email protected]>
bjosv · Oct 3, 2024 · 9dcda0b · 9dcda0b
1 parent ffc6796
commit 9dcda0b
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/cluster.c b/src/cluster.c
@@ -672,8 +672,7 @@ static int cluster_master_slave_mapping_with_name(valkeyClusterContext *cc,
 /**
  * Parse the "cluster slots" command reply to nodes dict.
  */
-static dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply,
-                                 int flags) {
+static dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply) {
     int ret;
     cluster_slot *slot = NULL;
     dict *nodes = NULL;
@@ -813,7 +812,7 @@ static dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply,
                     }
 
                     slot = NULL;
-                } else if (flags & VALKEYCLUSTER_FLAG_ADD_SLAVE) {
+                } else if (cc->flags & VALKEYCLUSTER_FLAG_ADD_SLAVE) {
                     slave = node_get_with_slots(cc, elem_ip, elem_port,
                                                 VALKEY_ROLE_SLAVE);
                     if (slave == NULL) {
@@ -858,8 +857,7 @@ static dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply,
 /**
  * Parse the "cluster nodes" command reply to nodes dict.
  */
-static dict *parse_cluster_nodes(valkeyClusterContext *cc, valkeyReply *reply,
-                                 int flags) {
+static dict *parse_cluster_nodes(valkeyClusterContext *cc, valkeyReply *reply) {
     int ret;
     dict *nodes = NULL;
     dict *nodes_name = NULL;
@@ -952,7 +950,7 @@ static dict *parse_cluster_nodes(valkeyClusterContext *cc, valkeyReply *reply,
                     goto oom;
                 }
 
-                if (flags & VALKEYCLUSTER_FLAG_ADD_SLAVE) {
+                if (cc->flags & VALKEYCLUSTER_FLAG_ADD_SLAVE) {
                     ret = cluster_master_slave_mapping_with_name(
                         cc, &nodes_name, master, master->name);
                     if (ret != VALKEY_OK) {
@@ -1004,7 +1002,7 @@ static dict *parse_cluster_nodes(valkeyClusterContext *cc, valkeyReply *reply,
 
             }
             // add slave node
-            else if ((flags & VALKEYCLUSTER_FLAG_ADD_SLAVE) &&
+            else if ((cc->flags & VALKEYCLUSTER_FLAG_ADD_SLAVE) &&
                      (role_len >= 5 && memcmp(role, "slave", 5) == 0)) {
                 slave = node_get_with_nodes(cc, part, count_part,
                                             VALKEY_ROLE_SLAVE);
@@ -1093,9 +1091,9 @@ static int clusterUpdateRouteHandleReply(valkeyClusterContext *cc,
 
     dict *nodes;
     if (cc->flags & VALKEYCLUSTER_FLAG_ROUTE_USE_SLOTS) {
-        nodes = parse_cluster_slots(cc, reply, cc->flags);
+        nodes = parse_cluster_slots(cc, reply);
     } else {
-        nodes = parse_cluster_nodes(cc, reply, cc->flags);
+        nodes = parse_cluster_nodes(cc, reply);
     }
     freeReplyObject(reply);
     return updateNodesAndSlotmap(cc, nodes);
@@ -2974,7 +2972,7 @@ void clusterSlotsReplyCallback(valkeyAsyncContext *ac, void *r,
     }
 
     valkeyClusterContext *cc = acc->cc;
-    dict *nodes = parse_cluster_slots(cc, reply, cc->flags);
+    dict *nodes = parse_cluster_slots(cc, reply);
     if (updateNodesAndSlotmap(cc, nodes) != VALKEY_OK) {
         /* Ignore failures for now */
     }
@@ -2995,7 +2993,7 @@ void clusterNodesReplyCallback(valkeyAsyncContext *ac, void *r,
     }
 
     valkeyClusterContext *cc = acc->cc;
-    dict *nodes = parse_cluster_nodes(cc, reply, cc->flags);
+    dict *nodes = parse_cluster_nodes(cc, reply);
     if (updateNodesAndSlotmap(cc, nodes) != VALKEY_OK) {
         /* Ignore failures for now */
     }