Hide valkeyNetRead & valkeyNetWrite

Move valkeyContextDefaultFuncs into net.c, then valkeyNetRead &
valkeyNetWrite could be declared as static functions.

async.h is no longer needed by valkey.c, that makes valkey.c
independent from networking IO specific operations.

Signed-off-by: zhenwei pi <[email protected]>

Author: pizhenwei

include/valkey/net.h

@@ -38,8 +38,6 @@
 #include "valkey.h"
 
 void valkeyNetClose(valkeyContext *c);
-ssize_t valkeyNetRead(valkeyContext *c, char *buf, size_t bufcap);
-ssize_t valkeyNetWrite(valkeyContext *c);
 
 int valkeyCheckSocketError(valkeyContext *c);
 int valkeyContextSetTimeout(valkeyContext *c, const struct timeval tv);

src/net.c

@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <time.h>
 
+#include "async.h"
 #include "net.h"
 #include "sds.h"
 #include "sockcompat.h"
@@ -56,7 +57,7 @@ void valkeyNetClose(valkeyContext *c) {
     }
 }
 
-ssize_t valkeyNetRead(valkeyContext *c, char *buf, size_t bufcap) {
+static ssize_t valkeyNetRead(valkeyContext *c, char *buf, size_t bufcap) {
     ssize_t nread = recv(c->fd, buf, bufcap, 0);
     if (nread == -1) {
         if ((errno == EWOULDBLOCK && !(c->flags & VALKEY_BLOCK)) || (errno == EINTR)) {
@@ -78,7 +79,7 @@ ssize_t valkeyNetRead(valkeyContext *c, char *buf, size_t bufcap) {
     }
 }
 
-ssize_t valkeyNetWrite(valkeyContext *c) {
+static ssize_t valkeyNetWrite(valkeyContext *c) {
     ssize_t nwritten;
 
     nwritten = send(c->fd, c->obuf, sdslen(c->obuf), 0);
@@ -630,3 +631,16 @@ int valkeyContextConnectUnix(valkeyContext *c, const char *path, const struct ti
     valkeySetError(c, VALKEY_ERR_OOM, "Out of memory");
     return VALKEY_ERR;
 }
+
+static valkeyContextFuncs valkeyContextDefaultFuncs = {
+    .close = valkeyNetClose,
+    .free_privctx = NULL,
+    .async_read = valkeyAsyncRead,
+    .async_write = valkeyAsyncWrite,
+    .read = valkeyNetRead,
+    .write = valkeyNetWrite
+};
+
+void valkeyContextSetDefaultFuncs(valkeyContext *c) {
+    c->funcs = &valkeyContextDefaultFuncs;
+}

src/valkey.c

@@ -42,18 +42,8 @@
 #include "valkey_private.h"
 #include "net.h"
 #include "sds.h"
-#include "async.h"
 #include "win32.h"
 
-static valkeyContextFuncs valkeyContextDefaultFuncs = {
-    .close = valkeyNetClose,
-    .free_privctx = NULL,
-    .async_read = valkeyAsyncRead,
-    .async_write = valkeyAsyncWrite,
-    .read = valkeyNetRead,
-    .write = valkeyNetWrite
-};
-
 static valkeyReply *createReplyObject(int type);
 static void *createStringObject(const valkeyReadTask *task, char *str, size_t len);
 static void *createArrayObject(const valkeyReadTask *task, size_t elements);
@@ -718,7 +708,7 @@ static valkeyContext *valkeyContextInit(void) {
     if (c == NULL)
         return NULL;
 
-    c->funcs = &valkeyContextDefaultFuncs;
+    valkeyContextSetDefaultFuncs(c);
 
     c->obuf = sdsempty();
     c->reader = valkeyReaderCreate();

src/valkey_private.h

@@ -122,4 +122,6 @@ static inline int valkeyContextUpdateCommandTimeout(valkeyContext *c,
     return VALKEY_OK;
 }
 
+void valkeyContextSetDefaultFuncs(valkeyContext *c);
+
 #endif  /* VALKEY_VK_PRIVATE_H */