ccan/io: make enum io_state namespace-safe.

[ccan] / ccan / io / backend.h

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index bc88c289b7bf412d8d12d46497e1f375616a8e72..d75b516b763e85ef06278ff07271204b19f6c90d 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -21,19 +21,17 @@ struct io_listener {
        void *conn_arg;
 };
 
+enum io_result {
+       RESULT_AGAIN,
+       RESULT_FINISHED,
+       RESULT_CLOSE
+};
+
 enum io_state {
-       /* These wait for something to input */
-       READ,
-       READPART,
-
-       /* These wait for room to output */
-       WRITE,
-       WRITEPART,
-
-       NEXT, /* eg starting, woken from idle, return from io_break. */
-       IDLE,
-       FINISHED,
-       PROCESSING /* We expect them to change this now. */
+       IO_IO,
+       IO_NEXT, /* eg starting, woken from idle, return from io_break. */
+       IO_IDLE,
+       IO_FINISHED
 };
 
 static inline enum io_state from_ioplan(struct io_plan *op)
@@ -82,6 +80,8 @@ struct io_conn {
        struct io_conn *duplex;
        struct io_timeout *timeout;
 
+       enum io_result (*io)(struct io_conn *conn);
+
        int pollflag; /* 0, POLLIN or POLLOUT */
        enum io_state state;
        union {