summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common.c2
-rw-r--r--src/multiplex.c2
-rw-r--r--src/packet_stream.c11
-rw-r--r--src/util/error.c3
4 files changed, 8 insertions, 10 deletions
diff --git a/src/common.c b/src/common.c
index 01483f0..d0bd863 100644
--- a/src/common.c
+++ b/src/common.c
@@ -88,7 +88,7 @@ bool nn_common_init(const char *thread_name)
free, malloc_lock, malloc_unlock);
#endif
- al_rand_init((u32)(nn_get_timestamp() / 1000000));
+ al_random_init((u32)(nn_get_timestamp() / 1000000));
#ifdef NAUNET_ON_WINDOWS
if (!nn_windows_init()) return false;
diff --git a/src/multiplex.c b/src/multiplex.c
index 9744957..2de4621 100644
--- a/src/multiplex.c
+++ b/src/multiplex.c
@@ -34,7 +34,7 @@ static void socket_read_callback(struct ev_loop *loop, ev_io *w, s32 revents)
return;
}
- log_trace("ID byte: 0x%hhx.\n", id);
+ log_trace("ID byte: 0x%hhx.", id);
switch (id) {
case 0x48: // '(H)EAD'
break;
diff --git a/src/packet_stream.c b/src/packet_stream.c
index 0cf296c..7868242 100644
--- a/src/packet_stream.c
+++ b/src/packet_stream.c
@@ -31,13 +31,6 @@ static void stop_write_internal(struct nn_packet_stream *stream)
ev_io_stop(stream->loop->ev, &stream->wevent);
}
-static void shutdown_internal(struct nn_packet_stream *stream)
-{
- stream->connect = PACKET_STREAM_DISCONNECTING;
- // This assumes select()/poll() will return after shutdown().
- nn_socket_shutdown(&stream->sock);
-}
-
static void discard_out_queue_internal(struct nn_packet_stream *stream)
{
// stream->out.running can be true here. The stream will stop the
@@ -352,7 +345,9 @@ void nn_packet_stream_disconnect(struct nn_packet_stream *stream)
// This relies on stream_read_callback() to resolve and call stop_internal().
// Note that read() can still return data after shutdown(). This is why we have to
// check if connect = DISCONNECTING in send_packet().
- shutdown_internal(stream);
+ stream->connect = PACKET_STREAM_DISCONNECTING;
+ // This assumes select()/poll() will return after shutdown().
+ nn_socket_shutdown(&stream->sock);
}
}
diff --git a/src/util/error.c b/src/util/error.c
index 61c6136..97c7502 100644
--- a/src/util/error.c
+++ b/src/util/error.c
@@ -22,6 +22,7 @@ char *nn_strerror(s32 errnum)
// https://stackoverflow.com/a/46104456
char *nn_win32_error_message(s32 err)
{
+ /*
DWORD ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
err,
@@ -30,5 +31,7 @@ char *nn_win32_error_message(s32 err)
NNWT_ERROR_STR_MAXLEN,
NULL);
return !ret ? NULL : errorbuf;
+ */
+ return NULL;
}
#endif