Moved sdb_proto_send/sdb_proto_select to sdb_write/sdb_select.

[sysdb.git] / src / client / sock.c

diff --git a/src/client/sock.c b/src/client/sock.c
index eaa10ffdb95307a31c0233d10d46b68f33d7f912..d4596cd7a858cda76e1144492c5e2cf71c11291b 100644 (file)
--- a/src/client/sock.c
+++ b/src/client/sock.c
@@ -33,6 +33,7 @@
 #include "utils/error.h"
 #include "utils/strbuf.h"
 #include "utils/proto.h"
 #include "utils/error.h"
 #include "utils/strbuf.h"
 #include "utils/proto.h"

+#include "utils/os.h"

 
 #include <arpa/inet.h>
 
 
 #include <arpa/inet.h>
 


@@ -255,7 +256,7 @@ sdb_client_send(sdb_client_t *client,
        if (sdb_proto_marshal(buf, sizeof(buf), cmd, msg_len, msg) < 0)
                return -1;
 
        if (sdb_proto_marshal(buf, sizeof(buf), cmd, msg_len, msg) < 0)
                return -1;
 

-       return sdb_proto_send(client->fd, sizeof(buf), buf);
+       return sdb_write(client->fd, sizeof(buf), buf);

 } /* sdb_client_send */
 
 ssize_t
 } /* sdb_client_send */
 
 ssize_t


@@ -281,7 +282,7 @@ sdb_client_recv(sdb_client_t *client,
        while (42) {
                ssize_t status;
 
        while (42) {
                ssize_t status;
 

-               if (sdb_proto_select(client->fd, SDB_PROTO_SELECTIN))
+               if (sdb_select(client->fd, SDB_SELECTIN))

                        return -1;
 
                errno = 0;
                        return -1;
 
                errno = 0;