Revert "Remove oio_err - use ints"

This reverts commit 111536c9e567a08530516b904c6d7f34d307538a.

oio-unix.c

@@ -63,13 +63,13 @@ int oio_flag_is_set(oio_handle* handle, int flag) {
 }
 
 
-static int oio_err_new(oio_handle* handle, int e) {
+static oio_err oio_err_new(oio_handle* handle, int e) {
   handle->err = e;
   return e;
 }
 
 
-int oio_err_last(oio_handle *handle) {
+oio_err oio_err_last(oio_handle *handle) {
   return handle->err;
 }
 
@@ -377,7 +377,7 @@ void oio__read(oio_handle* handle) {
       assert(ev_is_active(&handle->read_watcher));
       ev_io_start(EV_DEFAULT_ &handle->read_watcher);
     } else {
-      int err = oio_err_new(handle, errorno);
+      oio_err err = oio_err_new(handle, errorno);
       if (cb) {
         cb(req, 0);
       }
@@ -459,7 +459,7 @@ void oio_tcp_connect(oio_handle* handle) {
     return;
 
   } else {
-    int err = oio_err_new(handle, error);
+    oio_err err = oio_err_new(handle, error);
 
     oio_connect_cb connect_cb = req->cb;
     if (connect_cb) {
@@ -599,7 +599,7 @@ int oio_read(oio_req *req, oio_buf* bufs, int bufcnt) {
 
   if (nread < 0 && errorno != EAGAIN) {
     /* Real error. */
-    int err = oio_err_new(handle, errorno);
+    oio_err err = oio_err_new(handle, errorno);
 
     if (cb) {
       cb(req, nread);

oio-unix.h

@@ -49,7 +49,7 @@ typedef struct {
 #define oio_handle_private_fields \
   int fd; \
   int flags; \
-  int err; \
+  oio_err err; \
   oio_read_cb read_cb; \
   oio_accept_cb accept_cb; \
   int accepted_fd; \

oio-win.c

@@ -394,7 +394,7 @@ int oio_accept(oio_handle* server, oio_handle* client,
 }
 
 
-static int oio_close_error(oio_handle* handle, int e) {
+static int oio_close_error(oio_handle* handle, oio_err e) {
   oio_req *req;
 
   if (handle->flags & OIO_HANDLE_CLOSING)
@@ -660,7 +660,7 @@ int oio_read(oio_req *req, oio_buf* bufs, int bufcnt) {
 }
 
 
-int oio_last_error() {
+oio_err oio_last_error() {
   return oio_errno_;
 }
 

oio-win.h

@@ -62,4 +62,4 @@ typedef struct oio_buf {
   struct oio_accept_req_s* accept_reqs;   \
   unsigned int flags;                     \
   unsigned int reqs_pending;              \
-  int error;
+  oio_err error;

oio.h

@@ -29,6 +29,8 @@
 #include <stddef.h> /* size_t */
 
 
+typedef int oio_err; /* FIXME */
+
 typedef struct oio_req_s oio_req;
 typedef struct oio_handle_s oio_handle;
 
@@ -36,8 +38,8 @@ typedef struct oio_handle_s oio_handle;
 typedef void (*oio_read_cb)(oio_req* req, size_t nread);
 typedef void (*oio_write_cb)(oio_req* req);
 typedef void (*oio_accept_cb)(oio_handle* handle);
-typedef void (*oio_close_cb)(oio_handle* handle, int e);
-typedef void (*oio_connect_cb)(oio_req* req, int e);
+typedef void (*oio_close_cb)(oio_handle* handle, oio_err e);
+typedef void (*oio_connect_cb)(oio_req* req, oio_err e);
 typedef void (*oio_shutdown_cb)(oio_req* req);
 typedef void (*oio_timer_cb)(oio_req* req, int64_t skew);
 
@@ -97,8 +99,8 @@ struct oio_req_s {
  * On error the user should then call oio_last_error() to determine
  * the error code.
  */
-int oio_last_error();
-const char* oio_err_str(int err);
+oio_err oio_last_error();
+const char* oio_err_str(oio_err err);
 
 
 void oio_init();

test/benchmark-ping-pongs.c

@@ -50,7 +50,7 @@ typedef struct {
 void pinger_try_read(pinger_t* pinger);
 
 
-void pinger_on_close(oio_handle* handle, int err) {
+void pinger_on_close(oio_handle* handle, oio_err err) {
   pinger_t* pinger = (pinger_t*)handle->data;
 
   printf("%d pings\n", pinger->pongs);
@@ -121,7 +121,7 @@ void pinger_try_read(pinger_t* pinger) {
 }
 
 
-void pinger_on_connect(oio_req *req, int err) {
+void pinger_on_connect(oio_req *req, oio_err err) {
   pinger_t *pinger = (pinger_t*)req->handle->data;
 
   ASSERT(!err);

test/echo-server.c

@@ -39,7 +39,7 @@ oio_handle server;
 void after_write(oio_req* req);
 void after_read(oio_req* req, size_t nread);
 void try_read(peer_t* peer);
-void on_close(oio_handle* peer, int err);
+void on_close(oio_handle* peer, oio_err err);
 void on_accept(oio_handle* handle);
 
 
@@ -75,7 +75,7 @@ void try_read(peer_t* peer) {
 }
 
 
-void on_close(oio_handle* peer, int err) {
+void on_close(oio_handle* peer, oio_err err) {
   if (err) {
     fprintf(stdout, "Socket error\n");
   }
@@ -95,7 +95,7 @@ void on_accept(oio_handle* server) {
 }
 
 
-void on_server_close(oio_handle* handle, int err) {
+void on_server_close(oio_handle* handle, oio_err err) {
   ASSERT(handle == &server);
   ASSERT(!err);
 }

test/test-callback-stack.c

@@ -32,7 +32,7 @@ int nested = 0;
 int close_cb_called = 0;
 
 
-void close_cb(oio_handle *handle, int err) {
+void close_cb(oio_handle *handle, oio_err err) {
   ASSERT(!err);
   ASSERT(nested == 0 && "oio_close_cb must be called from a fresh stack");
   close_cb_called++;

test/test-connection-fail.c

@@ -32,13 +32,13 @@ static int connect_cb_calls;
 static int close_cb_calls;
 
 
-static void on_close(oio_handle* handle, int err) {
+static void on_close(oio_handle* handle, oio_err err) {
   ASSERT(!err);
   close_cb_calls++;
 }
 
 
-static void on_connect(oio_req *req, int err) {
+static void on_connect(oio_req *req, oio_err err) {
   ASSERT(err);
   connect_cb_calls++;
 }

test/test-ping-pong.c

@@ -48,7 +48,7 @@ typedef struct {
 void pinger_try_read(pinger_t* pinger);
 
 
-void pinger_on_close(oio_handle* handle, int err) {
+void pinger_on_close(oio_handle* handle, oio_err err) {
   pinger_t* pinger = (pinger_t*)handle->data;
 
   ASSERT(!err);
@@ -121,7 +121,7 @@ void pinger_try_read(pinger_t* pinger) {
 }
 
 
-void pinger_on_connect(oio_req *req, int err) {
+void pinger_on_connect(oio_req *req, oio_err err) {
   pinger_t *pinger = (pinger_t*)req->handle->data;
 
   ASSERT(!err);