From be4eb3831a2e5b44fb6e4c2d077e3c07edf6b776 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Thu, 26 Dec 2024 15:24:35 -0500 Subject: Revise style and cleanup Signed-off-by: Andrew Opalach --- meson_options.txt | 2 +- src/curl/curl.c | 10 +++++++--- src/curl/http.c | 21 ++++++++++++++------- src/curl/websocket.c | 3 ++- src/line_processor.c | 9 ++++++--- src/multiplex.c | 12 ++++++++---- src/packet_cache.c | 15 ++++++++++----- src/packet_pool.c | 12 ++++++++---- src/packet_stream.c | 40 +++++++++++++++++++++++----------------- src/packet_stream.h | 3 +-- src/rpc.c | 17 ++++++++--------- src/socket/socket_internal.h | 6 ++++-- src/socket/socket_linux.c | 7 ++++--- src/util/buffer.c | 3 ++- src/util/file/file_linux.c | 19 +++++++++++++------ src/util/file/util.c | 6 +++--- src/util/thread/thread_linux.c | 3 ++- src/util/thread/thread_windows.c | 3 ++- src/util/timer/timer_windows.c | 3 ++- subprojects/libalabaster.wrap | 2 +- 20 files changed, 121 insertions(+), 75 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index e20f6af..eb74e99 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ option('event-loop', type: 'feature', value: 'enabled') option('curl', type: 'feature', value: 'disabled') option('json', type: 'feature', value: 'disabled') -option('tests', type: 'boolean', value: true) +option('tests', type: 'boolean', value: false) diff --git a/src/curl/curl.c b/src/curl/curl.c index c996011..d317224 100644 --- a/src/curl/curl.c +++ b/src/curl/curl.c @@ -21,7 +21,9 @@ static void curl_socket_action_callback(struct ev_loop *loop, ev_io *w, s32 reve static void set_sock(struct nn_curl *curl, s32 what) { - if (curl->event.active) ev_io_stop(curl->loop->ev, &curl->event); + if (curl->event.active) { + ev_io_stop(curl->loop->ev, &curl->event); + } s32 action = (what & CURL_POLL_IN ? EV_READ : 0) | (what & CURL_POLL_OUT ? EV_WRITE : 0); ev_io_init(&curl->event, curl_socket_action_callback, curl->sock, action); ev_io_start(curl->loop->ev, &curl->event); @@ -71,8 +73,9 @@ static s32 timer_callback(CURLM *multi, s64 timeout_ms, void *userp) curl->timer_started = false; } - if (timeout_ms == -1) + if (timeout_ms == -1) { return 0; + } curl->timer.data = curl; ev_timer_init(&curl->timer, timeout_callback, timeout_ms / 1000.0, 0.0); @@ -145,8 +148,9 @@ bool nn_curl_remove_handle(struct nn_curl *curl) void nn_curl_close(struct nn_curl *curl) { - if (curl->handle && curl->multi_handle && curl->added) + if (curl->handle && curl->multi_handle && curl->added) { nn_curl_remove_handle(curl); + } if (curl->handle) curl_easy_cleanup(curl->handle); if (curl->multi_handle) curl_multi_cleanup(curl->multi_handle); } diff --git a/src/curl/http.c b/src/curl/http.c index 00d5cd9..60d26f1 100644 --- a/src/curl/http.c +++ b/src/curl/http.c @@ -8,14 +8,16 @@ static void check_status_codes(struct nn_curl *curl) if (http->status_code <= 0) { curl_easy_getinfo(curl->handle, CURLINFO_RESPONSE_CODE, &http->status_code); - if (http->status_code > 0) + if (http->status_code > 0) { http->callback(http->userdata, NNWT_HTTP_RESPONSE_CODE, NULL, http->status_code); + } } if (http->content_length < 0 && http->status_code == 200) { curl_easy_getinfo(curl->handle, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &http->content_length); - if (http->content_length >= 0) + if (http->content_length >= 0) { http->callback(http->userdata, NNWT_HTTP_CONTENT_LENGTH, NULL, (s64)http->content_length); + } } } @@ -37,8 +39,9 @@ static void http_handle_events(void *userdata, struct nn_curl *curl) return; } - if (!nn_curl_remove_handle(curl)) + if (!nn_curl_remove_handle(curl)) { return; + } check_status_codes(curl); @@ -57,8 +60,9 @@ static void http_handle_events(void *userdata, struct nn_curl *curl) http->status_code = -1; http->content_length = -1; - if (!nn_curl_add_handle(curl)) + if (!nn_curl_add_handle(curl)) { return; + } } else { http->callback(http->userdata, NNWT_HTTP_ERROR, NULL, http->status_code); } @@ -137,8 +141,9 @@ static size_t request_callback(void *userdata, u8 op, u8 *buf, s64 int0) al_assert(request->pointer >= 0); size_t size = nn_buffer_get_size(&request->payload); - if (request->pointer + int0 > (off_t)size) + if (request->pointer + int0 > (off_t)size) { int0 = size - request->pointer; + } nn_buffer_read(&request->payload, buf, request->pointer, int0); request->pointer += int0; @@ -186,8 +191,9 @@ static bool init_request_internal(struct nn_http *http, u8 method) curl_easy_setopt(curl->handle, CURLOPT_READFUNCTION, stream_read_callback); curl_easy_setopt(curl->handle, CURLOPT_READDATA, http); - if (http->headers) + if (http->headers) { curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, http->headers); + } curl->handle_events = http_handle_events; @@ -225,8 +231,9 @@ bool nn_http_request(struct nn_http_request *request, u8 method, struct nn_event request->http.userdata = request; size_t payload = nn_buffer_get_size(&request->payload); - if (payload > 0) + if (payload > 0) { curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, (s64)payload); + } request->callback = callback; request->userdata = userdata; diff --git a/src/curl/websocket.c b/src/curl/websocket.c index 25c9996..0bfcb9e 100644 --- a/src/curl/websocket.c +++ b/src/curl/websocket.c @@ -38,8 +38,9 @@ static size_t stream_write_callback(char *buffer, size_t size, size_t nmemb, voi nn_buffer_ensure_space(&ws->frame, frame_size); al_memcpy(nn_buffer_get_ptr(&ws->frame, m->offset), buffer, m->len); - if (m->bytesleft == 0) + if (m->bytesleft == 0) { ws->callback(ws->userdata, m, nn_buffer_get_ptr(&ws->frame, 0), frame_size); + } return m->len; } diff --git a/src/line_processor.c b/src/line_processor.c index f76197b..1d2d8f5 100644 --- a/src/line_processor.c +++ b/src/line_processor.c @@ -11,8 +11,9 @@ static void remove_client(struct nn_line_processor *pro, struct nn_line_processor_client *client) { ev_io_stop(pro->loop->ev, &client->event); - if (pro->type == NNWT_LINE_PROCESSOR_SOCKET) + if (pro->type == NNWT_LINE_PROCESSOR_SOCKET) { nn_socket_close(&client->sock); + } nn_buffer_free(&client->buf); al_array_remove(pro->clients, client); al_free(client); @@ -41,8 +42,9 @@ static void read_callback(struct ev_loop *loop, ev_io *w, s32 revents) al_assert_and_return(); } - if (ret <= 0) + if (ret <= 0) { return; + } cl->index += ret; ptr = nn_buffer_get_ptr(&cl->buf, 0); @@ -155,8 +157,9 @@ void nn_line_processor_stop(struct nn_line_processor *pro) break; } struct nn_line_processor_client *cl; - al_array_foreach(pro->clients, i, cl) + al_array_foreach(pro->clients, i, cl) { remove_client(cl->pro, cl); + } } al_array_free(pro->clients); al_str_free(&pro->delim); diff --git a/src/multiplex.c b/src/multiplex.c index 7007cfc..45be88b 100644 --- a/src/multiplex.c +++ b/src/multiplex.c @@ -4,8 +4,9 @@ bool nn_multiplex_socket_init(struct nn_multiplex_socket *multi, u8 type, bool (*connection_callback)(void *, u8, struct nn_socket *), void *userdata) { multi->sock.type = type; - if (!nn_socket_init(&multi->sock, NNWT_SOCKET_NONBLOCKING)) + if (!nn_socket_init(&multi->sock, NNWT_SOCKET_NONBLOCKING)) { return false; + } multi->connection_callback = connection_callback; multi->userdata = userdata; @@ -20,15 +21,17 @@ static void socket_connection_callback(struct ev_loop *loop, ev_io *w, s32 reven (void)revents; struct nn_socket sock; - if (!nn_socket_accept(&multi->sock, &sock, 0)) + if (!nn_socket_accept(&multi->sock, &sock, 0)) { return; + } u8 id; ssize_t ret = nn_socket_read(&sock, &id, sizeof(u8)); if (ret > 0) { nn_socket_set_blocking(&sock, false); - if (multi->connection_callback(multi->userdata, id, &sock)) + if (multi->connection_callback(multi->userdata, id, &sock)) { return; + } } // Failure case. @@ -37,8 +40,9 @@ static void socket_connection_callback(struct ev_loop *loop, ev_io *w, s32 reven bool nn_multiplex_socket_listen(struct nn_multiplex_socket *multi, struct nn_event_loop *loop, str *addr, u16 port) { - if (!nn_socket_bind(&multi->sock, addr, port) || !nn_socket_listen(&multi->sock)) + if (!nn_socket_bind(&multi->sock, addr, port) || !nn_socket_listen(&multi->sock)) { return false; + } multi->loop = loop; diff --git a/src/packet_cache.c b/src/packet_cache.c index a4e2354..49f2952 100644 --- a/src/packet_cache.c +++ b/src/packet_cache.c @@ -22,8 +22,9 @@ bool nn_packet_cache_send_packet(struct nn_packet_cache *cache, struct nn_packet al_array_push(cache->cache, packet); bool flush = !packet || cache->cache.size >= cache->flush; - if (flush && nn_cond_is_waiting(&cache->cond)) + if (flush && nn_cond_is_waiting(&cache->cond)) { nn_cond_signal(&cache->cond); + } nn_mutex_unlock(&cache->mutex); @@ -33,8 +34,9 @@ bool nn_packet_cache_send_packet(struct nn_packet_cache *cache, struct nn_packet void nn_packet_cache_flush(struct nn_packet_cache *cache) { nn_mutex_lock(&cache->mutex); - if (nn_cond_is_waiting(&cache->cond)) + if (nn_cond_is_waiting(&cache->cond)) { nn_cond_signal(&cache->cond); + } nn_mutex_unlock(&cache->mutex); } @@ -42,8 +44,9 @@ bool nn_packet_cache_wait(struct nn_packet_cache *cache, u32 *count) { nn_mutex_lock(&cache->mutex); - if (!cache->disabled && cache->cache.size == 0) + if (!cache->disabled && cache->cache.size == 0) { nn_cond_wait(&cache->cond, &cache->mutex); + } // If there was an active wait before calling disable(), expected // behavior would be that wait() returns false. @@ -60,8 +63,9 @@ bool nn_packet_cache_wait(struct nn_packet_cache *cache, u32 *count) struct nn_packet *nn_packet_cache_pop(struct nn_packet_cache *cache) { struct nn_packet *packet = NULL; - if (cache->cache.size > 0) + if (cache->cache.size > 0) { al_array_pop_at(cache->cache, 0, packet); + } return packet; } @@ -74,8 +78,9 @@ void nn_packet_cache_disable(struct nn_packet_cache *cache) { nn_mutex_lock(&cache->mutex); cache->disabled = true; - if (nn_cond_is_waiting(&cache->cond)) + if (nn_cond_is_waiting(&cache->cond)) { nn_cond_signal(&cache->cond); + } nn_mutex_unlock(&cache->mutex); } diff --git a/src/packet_pool.c b/src/packet_pool.c index b613253..3645f13 100644 --- a/src/packet_pool.c +++ b/src/packet_pool.c @@ -4,8 +4,9 @@ static void return_internal(struct nn_packet_pool *pool, struct nn_packet *packe { nn_packet_reset(packet); al_array_push(pool->empty, packet); - if (nn_cond_is_waiting(&pool->cond)) + if (nn_cond_is_waiting(&pool->cond)) { nn_cond_signal(&pool->cond); + } } static void signal_callback(struct ev_loop *loop, ev_async *w, s32 revents) @@ -50,8 +51,9 @@ void nn_packet_pool_init(struct nn_packet_pool *pool, u32 size, struct nn_event_ al_array_init(pool->empty); al_array_reserve(pool->empty, size); - for (u32 i = 0; i < size; i++) + for (u32 i = 0; i < size; i++) { al_array_push(pool->empty, nn_packet_create()); + } pool->disabled = false; nn_cond_init(&pool->cond); @@ -136,8 +138,9 @@ void nn_packet_pool_disable(struct nn_packet_pool *pool) } pool->ready.size = 0; - if (nn_cond_is_waiting(&pool->cond)) + if (nn_cond_is_waiting(&pool->cond)) { nn_cond_signal(&pool->cond); + } nn_mutex_unlock(&pool->mutex); } @@ -152,8 +155,9 @@ void nn_packet_pool_enable(struct nn_packet_pool *pool) struct nn_packet *nn_packet_pool_pop(struct nn_packet_pool *pool) { struct nn_packet *packet = NULL; - if (pool->ready.size > 0) + if (pool->ready.size > 0) { al_array_pop_at(pool->ready, 0, packet); + } return packet; } diff --git a/src/packet_stream.c b/src/packet_stream.c index 9a820dd..54fcf94 100644 --- a/src/packet_stream.c +++ b/src/packet_stream.c @@ -18,13 +18,16 @@ static inline void init_io_state(struct nn_packet_stream *stream) stream->out.active = false; } -bool nn_packet_stream_init(struct nn_packet_stream *stream, u8 type, +bool nn_packet_stream_init(struct nn_packet_stream *stream, u8 type, u8 id, bool (*connection_callback)(void *, struct nn_packet_stream *), void (*connection_closed_callback)(void *, struct nn_packet_stream *), void *userdata) { stream->sock.type = type; - if (!nn_socket_init(&stream->sock, NNWT_SOCKET_NONBLOCKING)) + if (!nn_socket_init(&stream->sock, NNWT_SOCKET_NONBLOCKING)) { return false; + } + + stream->id = id; init_io_state(stream); @@ -44,11 +47,6 @@ void nn_packet_stream_set_nodelay(struct nn_packet_stream *stream, s32 nodelay) nn_socket_set_nodelay(&stream->sock, nodelay); } -void nn_packet_stream_set_multiplex(struct nn_packet_stream *stream, u8 id) -{ - stream->id = id; -} - static void start_write_internal(struct nn_packet_stream *stream) { stream->out.active = true; @@ -88,8 +86,9 @@ static void stop_internal(struct nn_packet_stream *stream) } struct nn_packet *packet; - al_array_foreach(stream->out.queue, i, packet) + al_array_foreach(stream->out.queue, i, packet) { stream->packet_sent_callback(stream->userdata, packet); + } stream->out.queue.size = 0; stream->connection_closed_callback(stream->userdata, stream); @@ -107,7 +106,9 @@ static void stream_read_callback(struct ev_loop *loop, ev_io *w, s32 revents) ssize_t ret = nn_socket_read(&stream->sock, ptr, size - stream->in.index); if (ret <= 0 || stream->connect == PACKET_STREAM_DISCONNECTING) { ev_io_stop(stream->loop->ev, &stream->revent); - if (stream->out.active) stop_write_internal(stream); + if (stream->out.active) { + stop_write_internal(stream); + } stop_internal(stream); return; } @@ -155,7 +156,6 @@ static void stream_write_callback(struct ev_loop *loop, ev_io *w, s32 revents) stream->corked = false; ev_io_start(stream->loop->ev, &stream->revent); } - // Callbacks must be set in connection_callback. al_assert(stream->packet_callback && stream->packet_sent_callback); } @@ -187,6 +187,8 @@ static void stream_write_callback(struct ev_loop *loop, ev_io *w, s32 revents) void nn_packet_stream_from_socket(struct nn_packet_stream *stream, struct nn_event_loop *loop, struct nn_socket *sock) { + al_assert(stream->connection_callback && stream->connection_closed_callback); + stream->loop = loop; stream->sock = *sock; @@ -204,8 +206,7 @@ void nn_packet_stream_from_socket(struct nn_packet_stream *stream, struct nn_eve stream->corked = false; ev_io_start(stream->loop->ev, &stream->revent); } - al_assert(stream->connection_callback && stream->connection_closed_callback && - stream->packet_callback && stream->packet_sent_callback); + al_assert(stream->packet_callback && stream->packet_sent_callback); } static void do_connect_internal(struct nn_packet_stream *stream, str *addr, u16 port) @@ -248,25 +249,29 @@ void nn_packet_stream_reconnect(struct nn_packet_stream *stream, str *addr, u16 void nn_packet_stream_cork(struct nn_packet_stream *stream, bool cork) { if (stream->connect == PACKET_STREAM_CONNECTED) { - if (cork && !stream->corked) + if (cork && !stream->corked) { ev_io_stop(stream->loop->ev, &stream->revent); - else if (!cork && stream->corked) + } else if (!cork && stream->corked) { ev_io_start(stream->loop->ev, &stream->revent); + } stream->corked = cork; } } bool nn_packet_stream_send_packet(struct nn_packet_stream *stream, struct nn_packet *packet) { - if (stream->connect == PACKET_STREAM_DISCONNECTING) + if (stream->connect == PACKET_STREAM_DISCONNECTING) { return false; + } al_assert(stream->connect == PACKET_STREAM_CONNECTED); nn_packet_write_size(packet); al_array_push(stream->out.queue, packet); - if (!stream->out.active) start_write_internal(stream); + if (!stream->out.active) { + start_write_internal(stream); + } return true; } @@ -277,8 +282,9 @@ void nn_packet_stream_disconnect(struct nn_packet_stream *stream) // If reusing this stream, keep in mind it will have been set // back to a default state in stop_internal(). - if (stream->connect == PACKET_STREAM_DISCONNECTED) + if (stream->connect == PACKET_STREAM_DISCONNECTED) { return; + } if (stream->connect == PACKET_STREAM_CONNECTING) { // wevent is always active when connect = CONNECTING. diff --git a/src/packet_stream.h b/src/packet_stream.h index 0121d3f..40e5c3c 100644 --- a/src/packet_stream.h +++ b/src/packet_stream.h @@ -33,11 +33,10 @@ struct nn_packet_stream { void *userdata; }; -bool nn_packet_stream_init(struct nn_packet_stream *stream, u8 type, +bool nn_packet_stream_init(struct nn_packet_stream *stream, u8 type, u8 id, bool (*connection_callback)(void *, struct nn_packet_stream *), void (*connection_closed_callback)(void *, struct nn_packet_stream *), void *userdata); void nn_packet_stream_set_nodelay(struct nn_packet_stream *stream, s32 no_delay); -void nn_packet_stream_set_multiplex(struct nn_packet_stream *stream, u8 id); void nn_packet_stream_from_socket(struct nn_packet_stream *stream, struct nn_event_loop *loop, struct nn_socket *sock); void nn_packet_stream_connect(struct nn_packet_stream *stream, struct nn_event_loop *loop, str *addr, u16 port); void nn_packet_stream_reconnect(struct nn_packet_stream *stream, str *addr, u16 port); diff --git a/src/rpc.c b/src/rpc.c index 93a1a2e..cdac4c6 100644 --- a/src/rpc.c +++ b/src/rpc.c @@ -34,8 +34,7 @@ static void packet_callback(void *userdata, struct nn_packet_stream *stream, str return; } } - } - else { // Command + } else { // Command struct nn_rpc_command *command; al_array_foreach_ptr(conn->rpc->commands, i, command) { if (command->op == op) { @@ -45,8 +44,7 @@ static void packet_callback(void *userdata, struct nn_packet_stream *stream, str if (command->callback(command->userdata, conn, packet, rpacket)) { conn->outgoing++; nn_packet_stream_send_packet(stream, rpacket); - } - else { + } else { nn_packet_free(rpacket); } return; @@ -62,8 +60,9 @@ static void packet_sent_callback(void *userdata, struct nn_packet *packet) nn_packet_free(packet); al_assert(conn->outgoing > 0); conn->outgoing--; - if (conn->flushing && conn->outgoing == 0) + if (conn->flushing && conn->outgoing == 0) { nn_packet_stream_disconnect(&conn->stream); + } } static bool stream_connection_callback(void *userdata, struct nn_packet_stream *stream) @@ -71,8 +70,9 @@ static bool stream_connection_callback(void *userdata, struct nn_packet_stream * struct nn_rpc_connection *conn = (struct nn_rpc_connection *)userdata; struct nn_rpc *rpc = conn->rpc; - if (stream->sock.type == NNWT_SOCKET_TCP) + if (stream->sock.type == NNWT_SOCKET_TCP) { nn_packet_stream_set_nodelay(stream, 1); + } stream->packet_callback = packet_callback; stream->packet_sent_callback = packet_sent_callback; @@ -120,12 +120,11 @@ bool nn_rpc_prepare_client(struct nn_rpc *rpc, u8 type, u8 id) struct nn_rpc_connection *conn = al_alloc_object(struct nn_rpc_connection); init_rpc_connection(rpc, conn); - if (!nn_packet_stream_init(&conn->stream, type, - stream_connection_callback, stream_connection_closed_callback, conn)) { + if (!nn_packet_stream_init(&conn->stream, type, id, + stream_connection_callback, stream_connection_closed_callback, conn)) { al_free(conn); return false; } - nn_packet_stream_set_multiplex(&conn->stream, id); rpc->conn = conn; al_array_push(rpc->connections, conn); diff --git a/src/socket/socket_internal.h b/src/socket/socket_internal.h index fd9a001..193fa43 100644 --- a/src/socket/socket_internal.h +++ b/src/socket/socket_internal.h @@ -14,9 +14,11 @@ static inline str *nn_socket_display_addr(str *addr) static inline void nn_socket_apply_flags(struct nn_socket *sock, s32 flags) { - if (flags & NNWT_SOCKET_NONBLOCKING) + if (flags & NNWT_SOCKET_NONBLOCKING) { nn_socket_set_blocking(sock, false); + } - if (flags & NNWT_SOCKET_NODELAY) + if (flags & NNWT_SOCKET_NODELAY) { nn_socket_set_nodelay(sock, 1); + } } diff --git a/src/socket/socket_linux.c b/src/socket/socket_linux.c index c3467dd..0dadfbe 100644 --- a/src/socket/socket_linux.c +++ b/src/socket/socket_linux.c @@ -24,7 +24,6 @@ s32 nn_poll_fds(struct nn_pollfd *fds, nn_nfds nfds, s64 timeout_ns) return ppoll(fds, nfds, tsp, NULL); } - bool nn_socket_init(struct nn_socket *sock, s32 flags) { switch (sock->type) { @@ -137,8 +136,9 @@ bool nn_socket_bind(struct nn_socket *sock, str *addr, u16 port) switch (sock->type) { case NNWT_SOCKET_TCP: case NNWT_SOCKET_UDP: - if (!parse_address(sock, addr, port)) + if (!parse_address(sock, addr, port)) { return false; + } saddr = sock->addrinfo->ai_addr; addrlen = sock->addrinfo->ai_addrlen; break; @@ -228,8 +228,9 @@ bool nn_socket_connect(struct nn_socket *sock, str *addr, u16 port) switch (sock->type) { case NNWT_SOCKET_TCP: case NNWT_SOCKET_UDP: - if (!parse_address(sock, addr, port)) + if (!parse_address(sock, addr, port)) { return false; + } ret = connect(sock->fd, sock->addrinfo->ai_addr, sock->addrinfo->ai_addrlen); break; case NNWT_SOCKET_UNIX: diff --git a/src/util/buffer.c b/src/util/buffer.c index 1d343e3..0bd36b4 100644 --- a/src/util/buffer.c +++ b/src/util/buffer.c @@ -35,8 +35,9 @@ void nn_buffer_write(struct nn_buffer *buf, void *data, size_t index, size_t siz { size_t reach = index + size; nn_buffer_ensure_space(buf, reach); - if (reach > buf->size) + if (reach > buf->size) { buf->size = reach; + } al_memcpy(&buf->data[index], data, size); } diff --git a/src/util/file/file_linux.c b/src/util/file/file_linux.c index 9c6b1ce..a362637 100644 --- a/src/util/file/file_linux.c +++ b/src/util/file/file_linux.c @@ -30,8 +30,9 @@ bool nn_file_open(struct nn_file *file, str *path, s32 flags) { al_assert(!((flags & NNWT_FILE_READONLY) && (flags & NNWT_FILE_LOCK))); s32 oflags = flags & NNWT_FILE_READONLY ? O_RDONLY : O_RDWR; - if (flags & NNWT_FILE_CREATE) + if (flags & NNWT_FILE_CREATE) { oflags |= O_CREAT; + } char *c_str = al_str_to_c_str(path); file->fd = open(c_str, oflags, 0644); @@ -80,8 +81,9 @@ bool nn_file_create(str *path) off_t nn_file_seek(struct nn_file *file, off_t offset, s32 whence) { off_t res = lseek(file->fd, offset, whence); - if (res == (off_t)-1) + if (res == (off_t)-1) { al_log_error("file", "lseek(%jd, %d) failed (%s).", (intmax_t)offset, whence, nn_strerror(errno)); + } return res; } @@ -148,13 +150,16 @@ void *nn_file_mremap(struct nn_file *file, size_t size, void *old_map) void nn_file_munmap(struct nn_file *file, void *map) { s32 ret = munmap(map, file->filesize); - if (ret != 0) + if (ret != 0) { al_log_error("file", "munmap(%p, %zu) failed (%s).", map, file->filesize, nn_strerror(errno)); + } } void nn_file_close(struct nn_file *file) { - if (file->locked) unlock_file_internal(file->fd, file->filesize); + if (file->locked) { + unlock_file_internal(file->fd, file->filesize); + } close(file->fd); } @@ -184,8 +189,9 @@ bool nn_dir_exists(str *path) dir.dir = opendir(c_str); al_free(c_str); if (!dir.dir) { - if (errno != ENOENT) + if (errno != ENOENT) { al_log_error("file", "opendir(%.*s) failed (%s).", AL_STR_PRINTF(path), nn_strerror(errno)); + } return false; } closedir(dir.dir); @@ -207,8 +213,9 @@ bool nn_dir_create(str *path) bool nn_dir_read(struct nn_dir *dir, struct nn_dir_entry *entry) { if (!(entry->entry = readdir(dir->dir))) { - if (errno) + if (errno) { al_log_error("file", "readdir() failed (%s).", nn_strerror(errno)); + } return false; } diff --git a/src/util/file/util.c b/src/util/file/util.c index 50e2c4a..eab9893 100644 --- a/src/util/file/util.c +++ b/src/util/file/util.c @@ -26,9 +26,9 @@ s32 nn_file_read_as_c_str(struct nn_file *file, char **out) s32 nn_file_replace(struct nn_file *file, str *buf) { - if (nn_file_seek(file, 0, SEEK_SET) == (off_t)-1 || - !nn_file_write(file, buf->data, buf->len) || - !nn_file_truncate(file, buf->len)) { + if ((nn_file_seek(file, 0, SEEK_SET) == (off_t)-1) || + (!nn_file_write(file, buf->data, buf->len)) || + (!nn_file_truncate(file, buf->len))) { return -1; } return buf->len; diff --git a/src/util/thread/thread_linux.c b/src/util/thread/thread_linux.c index bb5bcbc..5fc1081 100644 --- a/src/util/thread/thread_linux.c +++ b/src/util/thread/thread_linux.c @@ -70,8 +70,9 @@ void nn_cond_init(struct nn_cond *cond) void nn_cond_wait(struct nn_cond *cond, struct nn_mutex *mutex) { cond->condition = false; - while (!cond->condition) + while (!cond->condition) { pthread_cond_wait(&cond->cond, &mutex->mutex); + } } bool nn_cond_is_waiting(struct nn_cond *cond) diff --git a/src/util/thread/thread_windows.c b/src/util/thread/thread_windows.c index ded3b6c..4104bb3 100644 --- a/src/util/thread/thread_windows.c +++ b/src/util/thread/thread_windows.c @@ -65,8 +65,9 @@ void nn_cond_init(struct nn_cond *cond) void nn_cond_wait(struct nn_cond *cond, struct nn_mutex *mutex) { cond->condition = false; - while (!cond->condition) + while (!cond->condition) { SleepConditionVariableCS(&cond->cond, &mutex->mutex, INFINITE); + } } bool nn_cond_is_waiting(struct nn_cond *cond) diff --git a/src/util/timer/timer_windows.c b/src/util/timer/timer_windows.c index 198cb32..f26e56a 100644 --- a/src/util/timer/timer_windows.c +++ b/src/util/timer/timer_windows.c @@ -16,5 +16,6 @@ u64 nn_get_timestamp(void) { FILETIME ft; GetSystemTimePreciseAsFileTime(&ft); - return (((LARGE_INTEGER){ .LowPart = ft.dwLowDateTime, .HighPart = ft.dwHighDateTime }).QuadPart - UNIX_TIME_START) / 10Lu; + return (((LARGE_INTEGER){ .LowPart = ft.dwLowDateTime, .HighPart = ft.dwHighDateTime }).QuadPart - + UNIX_TIME_START) / 10Lu; } diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap index 206e02f..fec6aa6 100644 --- a/subprojects/libalabaster.wrap +++ b/subprojects/libalabaster.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://git.akon.city/libalabaster -revision = 42c161bbeb30c17c1ef39f84e13e54ff207f09da +revision = 97a20386f6e95923a24a30818e00685999298ddc depth = 1 -- cgit v1.2.3-101-g0448