Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Fri, 31 Jan 2014 06:27:24 +0000 (07:27 +0100)
committerSebastian Harl <sh@tokkee.org>
Fri, 31 Jan 2014 06:27:24 +0000 (07:27 +0100)
1  2 
src/client/sock.c

diff --combined src/client/sock.c
index c722addb16d011355526d2b661919075601a28f8,49cefdf0935fb8315cda15c6b8921bbfa6d0a510..59c77873e08411b22a9c1e5a6a857a8e269210f5
@@@ -190,6 -190,14 +190,14 @@@ sdb_client_connect(sdb_client_t *client
        return 0;
  } /* sdb_client_connect */
  
+ int
+ sdb_client_sockfd(sdb_client_t *client)
+ {
+       if (! client)
+               return -1;
+       return client->fd;
+ } /* sdb_client_sockfd */
  void
  sdb_client_close(sdb_client_t *client)
  {
@@@ -222,14 -230,14 +230,14 @@@ sdb_client_recv(sdb_client_t *client
  
        size_t data_offset = sdb_strbuf_len(buf);
  
 +      if (code)
 +              *code = UINT32_MAX;
 +
        if ((! client) || (! client->fd) || (! buf)) {
                errno = EBADF;
                return -1;
        }
  
 -      if (code)
 -              *code = UINT32_MAX;
 -
        while (42) {
                ssize_t status;