From 4604cccdb4bbecee81c6345ea6b17f361b8f46bd Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Sat, 3 Oct 2020 13:08:30 -0400 Subject: [PATCH] Rename patty_ax25_sock_assembler_ready() Rename patty_ax25_sock_assembler_ready() to assembler_pending() to better fit naming conventions; ready() is meant more for "does this channel have any I/O readiness conditions", whereas pending() is best suited for "does this state machine have a frame pending receipt" --- include/patty/ax25/sock.h | 2 +- src/server.c | 2 +- src/sock.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/patty/ax25/sock.h b/include/patty/ax25/sock.h index c8dcdb3..655fbde 100644 --- a/include/patty/ax25/sock.h +++ b/include/patty/ax25/sock.h @@ -231,7 +231,7 @@ int patty_ax25_sock_assembler_init(patty_ax25_sock *sock, size_t total); void patty_ax25_sock_assembler_stop(patty_ax25_sock *sock); -int patty_ax25_sock_assembler_ready(patty_ax25_sock *sock, size_t remaining); +int patty_ax25_sock_assembler_pending(patty_ax25_sock *sock, size_t remaining); ssize_t patty_ax25_sock_assembler_save(patty_ax25_sock *sock, void *buf, diff --git a/src/server.c b/src/server.c index 448eab6..5f683b9 100644 --- a/src/server.c +++ b/src/server.c @@ -1607,7 +1607,7 @@ static int handle_segment(patty_ax25_server *server, } } - if (!patty_ax25_sock_assembler_ready(sock, remaining)) { + if (!patty_ax25_sock_assembler_pending(sock, remaining)) { patty_ax25_sock_assembler_stop(sock); goto reply_rej; diff --git a/src/sock.c b/src/sock.c index 7bf0abb..f32a7d3 100644 --- a/src/sock.c +++ b/src/sock.c @@ -481,7 +481,7 @@ error_invalid: return -1; } -int patty_ax25_sock_assembler_ready(patty_ax25_sock *sock, size_t remaining) { +int patty_ax25_sock_assembler_pending(patty_ax25_sock *sock, size_t remaining) { if (sock->assembler == NULL || sock->assembler->total == 0) { return 0; }