Format libvalkeycluster code after renaming

valkey-io · Jun 19, 2024 · 6ce9fef · 6ce9fef
1 parent f38dc71
commit 6ce9fef
Show file tree

Hide file tree

Showing 32 changed files with 351 additions and 309 deletions.
diff --git a/libvalkeycluster/adapters/ae.h b/libvalkeycluster/adapters/ae.h
@@ -39,7 +39,7 @@ static int valkeyAeAttach_link(valkeyAsyncContext *ac, void *base) {
 }
 
 static int valkeyClusterAeAttach(aeEventLoop *loop,
-                                valkeyClusterAsyncContext *acc) {
+                                 valkeyClusterAsyncContext *acc) {
 
     if (acc == NULL || loop == NULL) {
         return VALKEY_ERR;

diff --git a/libvalkeycluster/adapters/glib.h b/libvalkeycluster/adapters/glib.h
@@ -47,7 +47,7 @@ static int valkeyGlibAttach_link(valkeyAsyncContext *ac, void *adapter) {
 }
 
 static int valkeyClusterGlibAttach(valkeyClusterAsyncContext *acc,
-                                  valkeyClusterGlibAdapter *adapter) {
+                                   valkeyClusterGlibAdapter *adapter) {
     if (acc == NULL || adapter == NULL) {
         return VALKEY_ERR;
     }

diff --git a/libvalkeycluster/adapters/libev.h b/libvalkeycluster/adapters/libev.h
@@ -39,7 +39,7 @@ static int valkeyLibevAttach_link(valkeyAsyncContext *ac, void *loop) {
 }
 
 static int valkeyClusterLibevAttach(valkeyClusterAsyncContext *acc,
-                                   struct ev_loop *loop) {
+                                    struct ev_loop *loop) {
     if (loop == NULL || acc == NULL) {
         return VALKEY_ERR;
     }

diff --git a/libvalkeycluster/adapters/libevent.h b/libvalkeycluster/adapters/libevent.h
@@ -39,7 +39,7 @@ static int valkeyLibeventAttach_link(valkeyAsyncContext *ac, void *base) {
 }
 
 static int valkeyClusterLibeventAttach(valkeyClusterAsyncContext *acc,
-                                      struct event_base *base) {
+                                       struct event_base *base) {
 
     if (acc == NULL || base == NULL) {
         return VALKEY_ERR;

diff --git a/libvalkeycluster/adapters/libuv.h b/libvalkeycluster/adapters/libuv.h
@@ -39,7 +39,7 @@ static int valkeyLibuvAttach_link(valkeyAsyncContext *ac, void *loop) {
 }
 
 static int valkeyClusterLibuvAttach(valkeyClusterAsyncContext *acc,
-                                   uv_loop_t *loop) {
+                                    uv_loop_t *loop) {
 
     if (acc == NULL || loop == NULL) {
         return VALKEY_ERR;

diff --git a/libvalkeycluster/adlist.c b/libvalkeycluster/adlist.c
@@ -27,8 +27,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include <valkey/alloc.h>
 #include <stdlib.h>
+#include <valkey/alloc.h>
 
 #include "adlist.h"
 #include "vkutil.h"

diff --git a/libvalkeycluster/dict.c b/libvalkeycluster/dict.c
@@ -34,9 +34,9 @@
  */
 
 #include <assert.h>
-#include <valkey/alloc.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <valkey/alloc.h>
 
 #include "dict.h"
 

diff --git a/libvalkeycluster/examples/src/example.c b/libvalkeycluster/examples/src/example.c
@@ -1,6 +1,6 @@
-#include <valkeycluster/valkeycluster.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <valkeycluster/valkeycluster.h>
 
 int main(int argc, char **argv) {
     UNUSED(argc);
@@ -23,7 +23,8 @@ int main(int argc, char **argv) {
     printf("SET: %s\n", reply->str);
     freeReplyObject(reply);
 
-    valkeyReply *reply2 = (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key");
+    valkeyReply *reply2 =
+        (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key");
     printf("GET: %s\n", reply2->str);
     freeReplyObject(reply2);
 

diff --git a/libvalkeycluster/examples/src/example_async.c b/libvalkeycluster/examples/src/example_async.c
@@ -1,7 +1,7 @@
-#include <valkeycluster/adapters/libevent.h>
-#include <valkeycluster/valkeycluster.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <valkeycluster/adapters/libevent.h>
+#include <valkeycluster/valkeycluster.h>
 
 void getCallback(valkeyClusterAsyncContext *cc, void *r, void *privdata) {
     valkeyReply *reply = (valkeyReply *)r;
@@ -60,25 +60,25 @@ int main(int argc, char **argv) {
 
     int status;
     status = valkeyClusterAsyncCommand(cc, setCallback, (char *)"THE_ID",
-                                      "SET %s %s", "key", "value");
+                                       "SET %s %s", "key", "value");
     if (status != VALKEY_OK) {
         printf("error: err=%d errstr=%s\n", cc->err, cc->errstr);
     }
 
     status = valkeyClusterAsyncCommand(cc, getCallback, (char *)"THE_ID",
-                                      "GET %s", "key");
+                                       "GET %s", "key");
     if (status != VALKEY_OK) {
         printf("error: err=%d errstr=%s\n", cc->err, cc->errstr);
     }
 
     status = valkeyClusterAsyncCommand(cc, setCallback, (char *)"THE_ID",
-                                      "SET %s %s", "key2", "value2");
+                                       "SET %s %s", "key2", "value2");
     if (status != VALKEY_OK) {
         printf("error: err=%d errstr=%s\n", cc->err, cc->errstr);
     }
 
     status = valkeyClusterAsyncCommand(cc, getCallback, (char *)"THE_ID",
-                                      "GET %s", "key2");
+                                       "GET %s", "key2");
     if (status != VALKEY_OK) {
         printf("error: err=%d errstr=%s\n", cc->err, cc->errstr);
     }

diff --git a/libvalkeycluster/examples/src/example_tls.c b/libvalkeycluster/examples/src/example_tls.c
@@ -1,9 +1,9 @@
+#include <stdio.h>
+#include <stdlib.h>
 #include <valkey/valkey.h>
 #include <valkey/valkey_ssl.h>
 #include <valkeycluster/valkeycluster.h>
 #include <valkeycluster/valkeycluster_ssl.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #define CLUSTER_NODE_TLS "127.0.0.1:7301"
 
@@ -16,7 +16,7 @@ int main(int argc, char **argv) {
 
     valkeyInitOpenSSL();
     ssl = valkeyCreateSSLContext("ca.crt", NULL, "client.crt", "client.key",
-                                NULL, &ssl_error);
+                                 NULL, &ssl_error);
     if (!ssl) {
         printf("SSL Context error: %s\n", valkeySSLContextGetError(ssl_error));
         exit(1);
@@ -46,7 +46,8 @@ int main(int argc, char **argv) {
     printf("SET: %s\n", reply->str);
     freeReplyObject(reply);
 
-    valkeyReply *reply2 = (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key");
+    valkeyReply *reply2 =
+        (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key");
     if (!reply2) {
         printf("Reply missing: %s\n", cc->errstr);
         exit(-1);

diff --git a/libvalkeycluster/tests/clusterclient_async.c b/libvalkeycluster/tests/clusterclient_async.c
@@ -34,8 +34,8 @@
  */
 
 #include "adapters/libevent.h"
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -83,7 +83,7 @@ void replyCallback(valkeyClusterAsyncContext *acc, void *r, void *privdata) {
         if (resend_failed_cmd) {
             printf("resend '%s'\n", cmd_history[cmd_id]);
             if (valkeyClusterAsyncCommand(acc, replyCallback, (void *)cmd_id,
-                                         cmd_history[cmd_id]) != VALKEY_OK)
+                                          cmd_history[cmd_id]) != VALKEY_OK)
                 printf("send error\n");
             return;
         }

diff --git a/libvalkeycluster/tests/clusterclient_reconnect_async.c b/libvalkeycluster/tests/clusterclient_reconnect_async.c
@@ -10,8 +10,8 @@
  */
 
 #include "adapters/libevent.h"
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,7 +29,8 @@ void connectToValkey(valkeyClusterAsyncContext *acc) {
     int status = valkeyClusterConnect2(acc->cc);
     if (status == VALKEY_OK) {
         // cluster mode
-    } else if (acc->cc->err && strcmp(acc->cc->errstr, VALKEY_ENOCLUSTER) == 0) {
+    } else if (acc->cc->err &&
+               strcmp(acc->cc->errstr, VALKEY_ENOCLUSTER) == 0) {
         printf("[no cluster]\n");
         acc->cc->err = 0;
         memset(acc->cc->errstr, '\0', strlen(acc->cc->errstr));
@@ -81,7 +82,7 @@ void sendNextCommand(int fd, short kind, void *arg) {
 
         // coverity[tainted_scalar]
         int status = valkeyClusterAsyncCommandToNode(acc, node, replyCallback,
-                                                    NULL, command);
+                                                     NULL, command);
         ASSERT_MSG(status == VALKEY_OK, acc->errstr);
     } else {
         // disconnect if nothing is left to read from stdin

diff --git a/libvalkeycluster/tests/ct_async.c b/libvalkeycluster/tests/ct_async.c
@@ -1,6 +1,6 @@
 #include "adapters/libevent.h"
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,20 +48,20 @@ void eventCallback(const valkeyClusterContext *cc, int event, void *privdata) {
     if (event == VALKEYCLUSTER_EVENT_READY) {
         int status;
         status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"ID",
-                                          "SET key12345 value");
+                                           "SET key12345 value");
         ASSERT_MSG(status == VALKEY_OK, acc->errstr);
 
         /* This command will trigger a disconnect in its reply callback. */
         status = valkeyClusterAsyncCommand(acc, getCallback, (char *)"ID",
-                                          "GET key12345");
+                                           "GET key12345");
         ASSERT_MSG(status == VALKEY_OK, acc->errstr);
 
         status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"ID",
-                                          "SET key23456 value2");
+                                           "SET key23456 value2");
         ASSERT_MSG(status == VALKEY_OK, acc->errstr);
 
         status = valkeyClusterAsyncCommand(acc, getCallback, (char *)"ID",
-                                          "GET key23456");
+                                           "GET key23456");
         ASSERT_MSG(status == VALKEY_OK, acc->errstr);
     }
 }

diff --git a/libvalkeycluster/tests/ct_async_glib.c b/libvalkeycluster/tests/ct_async_glib.c
@@ -1,6 +1,6 @@
 #include "adapters/glib.h"
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 #include <assert.h>
 
 #define CLUSTER_NODE "127.0.0.1:7000"

diff --git a/libvalkeycluster/tests/ct_async_libev.c b/libvalkeycluster/tests/ct_async_libev.c
@@ -1,6 +1,6 @@
 #include "adapters/libev.h"
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 #include <assert.h>
 
 #define CLUSTER_NODE "127.0.0.1:7000"
@@ -47,7 +47,7 @@ int main(int argc, char **argv) {
     valkeyClusterAsyncSetDisconnectCallback(acc, disconnectCallback);
 
     status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"ID",
-                                      "SET key value");
+                                       "SET key value");
     ASSERT_MSG(status == VALKEY_OK, acc->errstr);
 
     status =

diff --git a/libvalkeycluster/tests/ct_async_libuv.c b/libvalkeycluster/tests/ct_async_libuv.c
@@ -1,6 +1,6 @@
 #include "adapters/libuv.h"
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 #include <assert.h>
 
 #define CLUSTER_NODE "127.0.0.1:7000"
@@ -48,7 +48,7 @@ int main(int argc, char **argv) {
     valkeyClusterAsyncSetDisconnectCallback(acc, disconnectCallback);
 
     status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"ID",
-                                      "SET key value");
+                                       "SET key value");
     ASSERT_MSG(status == VALKEY_OK, acc->errstr);
 
     status =

diff --git a/libvalkeycluster/tests/ct_commands.c b/libvalkeycluster/tests/ct_commands.c
@@ -1,5 +1,5 @@
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 #include "win32.h"
 #include <assert.h>
 #include <stdio.h>
@@ -26,7 +26,8 @@ void test_exists(valkeyClusterContext *cc) {
     CHECK_REPLY_OK(cc, reply);
     freeReplyObject(reply);
 
-    reply = (valkeyReply *)valkeyClusterCommand(cc, "EXISTS key1 key2 nosuchkey");
+    reply =
+        (valkeyReply *)valkeyClusterCommand(cc, "EXISTS key1 key2 nosuchkey");
     CHECK_REPLY_INT(cc, reply, 2);
     freeReplyObject(reply);
 }
@@ -118,8 +119,8 @@ void test_hset_hget_hdel_hexists(valkeyClusterContext *cc) {
     freeReplyObject(reply);
 
     // Set second hash field
-    reply =
-        (valkeyReply *)valkeyClusterCommand(cc, "HSET myhash field3 hsetvalue3");
+    reply = (valkeyReply *)valkeyClusterCommand(
+        cc, "HSET myhash field3 hsetvalue3");
     CHECK_REPLY_INT(cc, reply, 1); // Set 1 field
     freeReplyObject(reply);
 
@@ -179,7 +180,7 @@ void test_eval(valkeyClusterContext *cc) {
 
     // Single key, string response
     reply = (valkeyReply *)valkeyClusterCommand(cc, "eval %s 1 %s",
-                                              "return KEYS[1]", "key1");
+                                                "return KEYS[1]", "key1");
     CHECK_REPLY_STR(cc, reply, "key1");
     freeReplyObject(reply);
 
@@ -328,12 +329,14 @@ void test_xgroup(valkeyClusterContext *cc) {
     CHECK_REPLY_TYPE(r, VALKEY_REPLY_INTEGER);
     freeReplyObject(r);
 
-    r = valkeyClusterCommand(cc, "XGROUP CREATE mystream consumer-group-name 0");
+    r = valkeyClusterCommand(cc,
+                             "XGROUP CREATE mystream consumer-group-name 0");
     CHECK_REPLY_OK(cc, r);
     freeReplyObject(r);
 
     /* Attempting to create an already existing group gives error */
-    r = valkeyClusterCommand(cc, "XGROUP CREATE mystream consumer-group-name 0");
+    r = valkeyClusterCommand(cc,
+                             "XGROUP CREATE mystream consumer-group-name 0");
     CHECK_REPLY_ERROR(cc, r, "BUSYGROUP");
     freeReplyObject(r);
 
@@ -382,7 +385,8 @@ void test_xinfo(valkeyClusterContext *cc) {
     CHECK_REPLY_TYPE(r, VALKEY_REPLY_ARRAY);
     freeReplyObject(r);
 
-    r = valkeyClusterCommand(cc, "XINFO CONSUMERS mystream consumer-group-name");
+    r = valkeyClusterCommand(cc,
+                             "XINFO CONSUMERS mystream consumer-group-name");
     CHECK_REPLY_TYPE(r, VALKEY_REPLY_ARRAY);
     freeReplyObject(r);
 }

diff --git a/libvalkeycluster/tests/ct_connection.c b/libvalkeycluster/tests/ct_connection.c
@@ -1,6 +1,6 @@
 #include "adapters/libevent.h"
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 
 #include <assert.h>
 #include <stdbool.h>
@@ -588,7 +588,7 @@ void test_async_command_timeout(void) {
     ExpectedResult r = {
         .noreply = true, .errstr = "Timeout", .disconnect = true};
     status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, &r,
-                                            "DEBUG SLEEP 0.2");
+                                             "DEBUG SLEEP 0.2");
     assert(status == VALKEY_OK);
 
     event_base_dispatch(base);

diff --git a/libvalkeycluster/tests/ct_connection_ipv6.c b/libvalkeycluster/tests/ct_connection_ipv6.c
@@ -1,5 +1,5 @@
-#include "valkeycluster.h"
 #include "test_utils.h"
+#include "valkeycluster.h"
 #include "win32.h"
 #include <assert.h>
 #include <stdio.h>