factored out connect() result handling

Author: zevv

src/core/ev.c

@@ -2481,6 +2481,31 @@ typedef struct {
 #endif
 } StateWrite;
 
+static JanetAsyncStatus handle_connect(JanetListenerState *s) {
+#ifdef JANET_WINDOWS
+    int res = 0;
+    int size = sizeof(res);
+    int r = getsockopt((SOCKET)s->stream->handle, SOL_SOCKET, SO_ERROR, (char *)&res, &size);
+#else
+    int res = 0;
+    socklen_t size = sizeof res;
+    int r = getsockopt(s->stream->handle, SOL_SOCKET, SO_ERROR, &res, &size);
+#endif
+    if (r == 0) {
+        if (res == 0) {
+            janet_schedule(s->fiber, janet_wrap_abstract(s->stream));
+        } else {
+            janet_cancel(s->fiber, janet_cstringv(strerror(res)));
+            // TODO help needed. janet_stream_close(s->stream);
+        }
+        return JANET_ASYNC_STATUS_DONE;
+    } else {
+        // TODO panic? assert?
+        return JANET_ASYNC_STATUS_NOT_DONE;
+    }
+}
+
+
 JanetAsyncStatus ev_machine_write(JanetListenerState *s, JanetAsyncEvent event) {
     StateWrite *state = (StateWrite *) s;
     switch (event) {
@@ -2512,21 +2537,7 @@ JanetAsyncStatus ev_machine_write(JanetListenerState *s, JanetAsyncEvent event)
         case JANET_ASYNC_EVENT_USER: {
 #ifdef JANET_NET
             if (state->mode == JANET_ASYNC_WRITEMODE_CONNECT) {
-                int res = 0;
-                int size = sizeof res;
-                int r = getsockopt((SOCKET)s->stream->handle, SOL_SOCKET, SO_ERROR, (char *)&res, &size);
-                if (r == 0) {
-                    if (res == 0) {
-                        janet_schedule(s->fiber, janet_wrap_abstract(s->stream));
-                    } else {
-                        // TODO JSOCKCLOSE(s->sock) but is in net.c;
-                        janet_cancel(s->fiber, janet_cstringv(strerror(res)));
-                    }
-                    return JANET_ASYNC_STATUS_DONE;
-                } else {
-                    // TODO panic? assert?
-                    return JANET_ASYNC_STATUS_NOT_DONE;
-                }
+                return handle_connect(s);
             }
 #endif
             /* Begin write */
@@ -2594,21 +2605,7 @@ JanetAsyncStatus ev_machine_write(JanetListenerState *s, JanetAsyncEvent event)
         case JANET_ASYNC_EVENT_WRITE: {
 #ifdef JANET_NET
             if (state->mode == JANET_ASYNC_WRITEMODE_CONNECT) {
-                int res = 0;
-                socklen_t size = sizeof res;
-                int r = getsockopt(s->stream->handle, SOL_SOCKET, SO_ERROR, &res, &size);
-                if (r == 0) {
-                    if (res == 0) {
-                        janet_schedule(s->fiber, janet_wrap_abstract(s->stream));
-                    } else {
-                        // TODO JSOCKCLOSE(s->sock) but is in net.c;
-                        janet_cancel(s->fiber, janet_cstringv(strerror(res)));
-                    }
-                    return JANET_ASYNC_STATUS_DONE;
-                } else {
-                    // TODO panic? assert?
-                    return JANET_ASYNC_STATUS_NOT_DONE;
-                }
+                return handle_connect(s);
             }
 #endif
             int32_t start, len;

src/core/net.c

@@ -500,16 +500,16 @@ JANET_CORE_FN(cfun_net_connect,
 
     if (status != 0) {
 #ifdef JANET_WINDOWS
-        if(err != WSAEWOULDBLOCK) {
+        if (err != WSAEWOULDBLOCK) {
 #else
-        if(err != EINPROGRESS) {
+        if (err != EINPROGRESS) {
 #endif
             JSOCKCLOSE(sock);
             Janet lasterr = janet_ev_lasterr();
             janet_panicf("could not connect socket: %V", lasterr);
         }
     }
-   
+
     /* Handle the connect() result in the event loop*/
     janet_ev_connect(stream, MSG_NOSIGNAL);