mirrors
/
janet
mirror of https://github.com/janet-lang/janet
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Fix formatting.

This commit is contained in:
Calvin Rose 2020-11-11 15:35:44 -06:00
parent 93bd2c11fa
commit caa6576719
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ev.c
View File

@ -779,7 +779,7 @@ void janet_loop1_impl(int has_timeout, JanetTimestamp to) {
JanetAsyncStatus status = state->machine(state, JANET_ASYNC_EVENT_COMPLETE); JanetAsyncStatus status = state->machine(state, JANET_ASYNC_EVENT_COMPLETE);
if (status == JANET_ASYNC_STATUS_DONE) { if (status == JANET_ASYNC_STATUS_DONE) {
janet_unlisten(state); janet_unlisten(state);
} }
break; break;
} else { } else {
state = state->_next; state = state->_next;

31
src/core/net.c
View File

@ -103,12 +103,12 @@ static Janet net_lasterr(void) {
char msgbuf[256]; char msgbuf[256];
msgbuf[0] = '\0'; msgbuf[0] = '\0';
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, NULL,
code, code,
MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
msgbuf, msgbuf,
sizeof (msgbuf), sizeof(msgbuf),
NULL); NULL);
if (!*msgbuf) sprintf(msgbuf, "%d", code); if (!*msgbuf) sprintf(msgbuf, "%d", code);
char *c = msgbuf; char *c = msgbuf;
while (*c) { while (*c) {
@ -222,7 +222,7 @@ JanetAsyncStatus net_machine_read(JanetListenerState *s, JanetAsyncEvent event)
case JANET_ASYNC_EVENT_COMPLETE: { case JANET_ASYNC_EVENT_COMPLETE: {
/* Called when read finished */ /* Called when read finished */
if (s->bytes == 0 && !state->is_recv_from) { if (s->bytes == 0 && !state->is_recv_from) {
janet_schedule(s->fiber, janet_wrap_nil()); janet_schedule(s->fiber, janet_wrap_nil());
return JANET_ASYNC_STATUS_DONE; return JANET_ASYNC_STATUS_DONE;
} }
@ -244,8 +244,7 @@ JanetAsyncStatus net_machine_read(JanetListenerState *s, JanetAsyncEvent event)
} }
/* fallthrough */ /* fallthrough */
case JANET_ASYNC_EVENT_USER: case JANET_ASYNC_EVENT_USER: {
{
state->flags = 0; state->flags = 0;
int32_t chunk_size = state->bytes_left > JANET_NET_CHUNKSIZE ? JANET_NET_CHUNKSIZE : state->bytes_left; int32_t chunk_size = state->bytes_left > JANET_NET_CHUNKSIZE ? JANET_NET_CHUNKSIZE : state->bytes_left;
state->wbuf.len = (ULONG) chunk_size; state->wbuf.len = (ULONG) chunk_size;
@ -557,7 +556,7 @@ JanetAsyncStatus net_machine_accept(JanetListenerState *s, JanetAsyncEvent event
if (state->astream) janet_mark(janet_wrap_abstract(state->astream)); if (state->astream) janet_mark(janet_wrap_abstract(state->astream));
if (state->function) janet_mark(janet_wrap_abstract(state->function)); if (state->function) janet_mark(janet_wrap_abstract(state->function));
break; break;
} }
case JANET_ASYNC_EVENT_CLOSE: case JANET_ASYNC_EVENT_CLOSE:
janet_schedule(s->fiber, janet_wrap_nil()); janet_schedule(s->fiber, janet_wrap_nil());
return JANET_ASYNC_STATUS_DONE; return JANET_ASYNC_STATUS_DONE;
@ -565,16 +564,16 @@ JanetAsyncStatus net_machine_accept(JanetListenerState *s, JanetAsyncEvent event
int seconds; int seconds;
int bytes = sizeof(seconds); int bytes = sizeof(seconds);
if (NO_ERROR != getsockopt((SOCKET) state->astream->handle, SOL_SOCKET, SO_CONNECT_TIME, if (NO_ERROR != getsockopt((SOCKET) state->astream->handle, SOL_SOCKET, SO_CONNECT_TIME,
(char *)&seconds, &bytes)) { (char *)&seconds, &bytes)) {
janet_cancel(s->fiber, janet_cstringv("failed to accept connection")); janet_cancel(s->fiber, janet_cstringv("failed to accept connection"));
return JANET_ASYNC_STATUS_DONE; return JANET_ASYNC_STATUS_DONE;
} }
if (NO_ERROR != setsockopt((SOCKET) state->astream->handle, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, if (NO_ERROR != setsockopt((SOCKET) state->astream->handle, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT,
(char *)&(state->lstream->handle), sizeof(SOCKET))) { (char *) & (state->lstream->handle), sizeof(SOCKET))) {
janet_cancel(s->fiber, janet_cstringv("failed to accept connection")); janet_cancel(s->fiber, janet_cstringv("failed to accept connection"));
return JANET_ASYNC_STATUS_DONE; return JANET_ASYNC_STATUS_DONE;
} }
Janet streamv = janet_wrap_abstract(state->astream); Janet streamv = janet_wrap_abstract(state->astream);
if (state->function) { if (state->function) {
/* Schedule worker */ /* Schedule worker */
@ -587,7 +586,7 @@ JanetAsyncStatus net_machine_accept(JanetListenerState *s, JanetAsyncEvent event
return JANET_ASYNC_STATUS_DONE; return JANET_ASYNC_STATUS_DONE;
} }
} else { } else {
janet_schedule(s->fiber, streamv); janet_schedule(s->fiber, streamv);
return JANET_ASYNC_STATUS_DONE; return JANET_ASYNC_STATUS_DONE;
} }
} }
@ -1071,7 +1070,7 @@ static const JanetReg net_cfuns[] = {
JDOC("(net/address host port &opt type)\n\n" JDOC("(net/address host port &opt type)\n\n"
"Look up the connection information for a given hostname, port, and connection type. Returns " "Look up the connection information for a given hostname, port, and connection type. Returns "
"a handle that can be used to send datagrams over network without establishing a connection. " "a handle that can be used to send datagrams over network without establishing a connection. "
"On Posix platforms, you can use :unix for host to connet to a unix domain socket, where the name is " "On Posix platforms, you can use :unix for host to connect to a unix domain socket, where the name is "
"given in the port argument. On Linux, abstract " "given in the port argument. On Linux, abstract "
"unix domain sockets are specified with a leading '@' character in port.") "unix domain sockets are specified with a leading '@' character in port.")
}, },