daemon/io_create() nits

diff --git a/daemon/io.c b/daemon/io.c
index 2f06f1a8ebd38a5c2ef1aed6eb59f8e51f18ebad..cd60e74431142fe8d4eb8ee2a502d244cf1045eb 100644 (file)
--- a/daemon/io.c
+++ b/daemon/io.c
@@ -381,7 +381,7 @@ static void tcp_accept_internal(uv_stream_t *master, int status, enum kr_proto g
                return;
        }
 
-       uv_handle_t *client = { 0 };
+       uv_handle_t *client;
        if (io_create(master->loop, &client, SOCK_STREAM, AF_UNSPEC)) {
                return;
        }
@@ -930,8 +930,9 @@ int io_create(uv_loop_t *loop, uv_handle_t **handle,
                uv_tcp_t *tcp = malloc(sizeof(uv_tcp_t));
                kr_require(tcp);
                ret = uv_tcp_init_ex(loop, tcp, family);
-               uv_tcp_nodelay(tcp, 1);
-
+               if (ret != 0) {
+                       uv_tcp_nodelay(tcp, 1);
+               }
                *handle = (uv_handle_t *)tcp;
        } else {
                kr_require(false && "io_create: invalid socket type");

diff --git a/daemon/worker.c b/daemon/worker.c
index 31774aef990a66bc208652657c5299a9d79712a8..3ac3f844adc1bf6846ded89c254905b9bc62e218 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -157,7 +157,7 @@ static struct session2 *ioreq_spawn(int socktype, sa_family_t family,
        }
 
        /* Create connection for iterative query */
-       uv_handle_t *handle = { 0 };
+       uv_handle_t *handle;
        if (io_create(the_worker->loop, &handle, socktype, family)) {
                return NULL;
        }