ccan/io: io_close_cb()

[ccan] / ccan / io / test / run-06-idle.c

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index d75a216db6a48d5cbc68aa6a093e4ba7c0496c77..51cca961a077416c47287a5b78d697cd5513d554 100644 (file)
--- a/ccan/io/test/run-06-idle.c
+++ b/ccan/io/test/run-06-idle.c
@@ -9,6 +9,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
 #include <sys/stat.h>
 #include <fcntl.h>
 

+#ifndef PORT
+#define PORT "65006"
+#endif
+

 static struct io_conn *idler;
 
 struct data {
 static struct io_conn *idler;
 
 struct data {


@@ -20,7 +24,7 @@ static struct io_plan read_done(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 2 || d->state == 3);
        d->state++;
 {
        ok1(d->state == 2 || d->state == 3);
        d->state++;

-       return io_close(conn, NULL);
+       return io_close();

 }
 
 static void finish_waker(struct io_conn *conn, struct data *d)
 }
 
 static void finish_waker(struct io_conn *conn, struct data *d)


@@ -48,12 +52,14 @@ static void init_conn(int fd, struct data *d)
 
        ok1(d->state == 0);
        d->state++;
 
        ok1(d->state == 0);
        d->state++;

-       idler = io_new_conn(fd, io_idle(), finish_idle, d);
+       idler = io_new_conn(fd, io_idle());
+       io_set_finish(idler, finish_idle, d);

 
        /* This will wake us up, as read will fail. */
        fd2 = open("/dev/null", O_RDONLY);
        ok1(fd2 >= 0);
 
        /* This will wake us up, as read will fail. */
        fd2 = open("/dev/null", O_RDONLY);
        ok1(fd2 >= 0);

-       ok1(io_new_conn(fd2, io_read(idler, 1, never, NULL), finish_waker, d));
+       io_set_finish(io_new_conn(fd2, io_read(idler, 1, never, NULL)),
+                     finish_waker, d);

 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)


@@ -96,9 +102,9 @@ int main(void)
        int fd, status;
 
        /* This is how many tests you plan to run */
        int fd, status;
 
        /* This is how many tests you plan to run */

-       plan_tests(14);
+       plan_tests(13);

        d->state = 0;
        d->state = 0;

-       fd = make_listen_fd("65006", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);

        ok1(fd >= 0);
        l = io_new_listener(fd, init_conn, d);
        ok1(l);
        ok1(fd >= 0);
        l = io_new_listener(fd, init_conn, d);
        ok1(l);