Rename patty_ax25_if_ready() to if_pending()

Rename patty_ax25_if_ready() to if_pending() in src/if.c, as well as in
each driver implementing this method and any direct invocations of said
driver methods
This commit is contained in:
XANTRONIX Development 2020-10-03 13:06:27 -04:00 committed by XANTRONIX Industrial
parent b97b927e0c
commit 80469ac535
7 changed files with 16 additions and 16 deletions

View file

@ -41,7 +41,7 @@ ssize_t patty_ax25_aprs_is_fill(patty_ax25_aprs_is *aprs);
ssize_t patty_ax25_aprs_is_drain(patty_ax25_aprs_is *, void *buf, size_t len);
int patty_ax25_aprs_is_ready(patty_ax25_aprs_is *);
int patty_ax25_aprs_is_pending(patty_ax25_aprs_is *);
ssize_t patty_ax25_aprs_is_flush(patty_ax25_aprs_is *);

View file

@ -39,7 +39,7 @@ typedef ssize_t (patty_ax25_if_driver_fill)(void *);
typedef ssize_t (patty_ax25_if_driver_drain)(void *, void *, size_t);
typedef int (patty_ax25_if_driver_ready)(void *);
typedef int (patty_ax25_if_driver_pending)(void *);
typedef ssize_t (patty_ax25_if_driver_flush)(void *);
@ -52,7 +52,7 @@ typedef struct _patty_ax25_if_driver {
patty_ax25_if_driver_fd *fd;
patty_ax25_if_driver_fill *fill;
patty_ax25_if_driver_drain *drain;
patty_ax25_if_driver_ready *ready;
patty_ax25_if_driver_pending *pending;
patty_ax25_if_driver_flush *flush;
patty_ax25_if_driver_send *send;
} patty_ax25_if_driver;
@ -108,7 +108,7 @@ ssize_t patty_ax25_if_fill(patty_ax25_if *iface);
ssize_t patty_ax25_if_drain(patty_ax25_if *iface, void *buf, size_t len);
int patty_ax25_if_ready(patty_ax25_if *iface);
int patty_ax25_if_pending(patty_ax25_if *iface);
ssize_t patty_ax25_if_flush(patty_ax25_if *iface);

View file

@ -41,7 +41,7 @@ ssize_t patty_kiss_tnc_fill(patty_kiss_tnc *tnc);
ssize_t patty_kiss_tnc_drain(patty_kiss_tnc *tnc, void *buf, size_t len);
int patty_kiss_tnc_ready(patty_kiss_tnc *tnc);
int patty_kiss_tnc_pending(patty_kiss_tnc *tnc);
ssize_t patty_kiss_tnc_flush(patty_kiss_tnc *tnc);

View file

@ -304,7 +304,7 @@ error:
return -1;
}
int patty_ax25_aprs_is_ready(patty_ax25_aprs_is *aprs) {
int patty_ax25_aprs_is_pending(patty_ax25_aprs_is *aprs) {
return aprs->state == APRS_IS_COMPLETE? 1: 0;
}
@ -444,7 +444,7 @@ patty_ax25_if_driver *patty_ax25_aprs_is_driver() {
.fd = (patty_ax25_if_driver_fd *)patty_ax25_aprs_is_fd,
.fill = (patty_ax25_if_driver_fill *)patty_ax25_aprs_is_fill,
.drain = (patty_ax25_if_driver_drain *)patty_ax25_aprs_is_drain,
.ready = (patty_ax25_if_driver_ready *)patty_ax25_aprs_is_ready,
.pending = (patty_ax25_if_driver_pending *)patty_ax25_aprs_is_pending,
.flush = (patty_ax25_if_driver_flush *)patty_ax25_aprs_is_flush,
.send = (patty_ax25_if_driver_send *)patty_ax25_aprs_is_send
};

View file

@ -280,8 +280,8 @@ ssize_t patty_ax25_if_drain(patty_ax25_if *iface, void *buf, size_t len) {
return iface->driver->drain(iface->phy, buf, len);
}
int patty_ax25_if_ready(patty_ax25_if *iface) {
return iface->driver->ready(iface->phy);
int patty_ax25_if_pending(patty_ax25_if *iface) {
return iface->driver->pending(iface->phy);
}
ssize_t patty_ax25_if_flush(patty_ax25_if *iface) {
@ -313,7 +313,7 @@ error_handle_promisc_frame:
}
ssize_t patty_ax25_if_recv(patty_ax25_if *iface, void *buf, size_t len) {
while (!patty_ax25_if_ready(iface)) {
while (!patty_ax25_if_pending(iface)) {
ssize_t drained;
if ((drained = patty_ax25_if_drain(iface, buf, len)) < 0) {

View file

@ -2059,7 +2059,7 @@ static int handle_iface(patty_ax25_server *server, struct if_entry *entry) {
goto error_io;
}
if (!patty_ax25_if_ready(iface)) {
if (!patty_ax25_if_pending(iface)) {
break;
}
@ -2153,7 +2153,7 @@ static int handle_sock_raw(patty_ax25_server *server,
goto error_io;
}
if (!patty_kiss_tnc_ready(raw)) {
if (!patty_kiss_tnc_pending(raw)) {
break;
}

View file

@ -312,12 +312,12 @@ error_io:
return -1;
}
int patty_kiss_tnc_ready(patty_kiss_tnc *tnc) {
int patty_kiss_tnc_pending(patty_kiss_tnc *tnc) {
return tnc->state == KISS_FRAME_COMMAND && tnc->offset_o > 0? 1: 0;
}
ssize_t patty_kiss_tnc_flush(patty_kiss_tnc *tnc) {
if (patty_kiss_tnc_ready(tnc)) {
if (patty_kiss_tnc_pending(tnc)) {
ssize_t ret = (ssize_t)tnc->offset_o;
tnc->state = KISS_NONE;
@ -331,7 +331,7 @@ ssize_t patty_kiss_tnc_flush(patty_kiss_tnc *tnc) {
}
ssize_t patty_kiss_tnc_recv(patty_kiss_tnc *tnc, void *buf, size_t len) {
while (!patty_kiss_tnc_ready(tnc)) {
while (!patty_kiss_tnc_pending(tnc)) {
ssize_t drained;
if ((drained = patty_kiss_tnc_drain(tnc, buf, len)) < 0) {
@ -368,7 +368,7 @@ patty_ax25_if_driver *patty_kiss_tnc_driver() {
.fd = (patty_ax25_if_driver_fd *)patty_kiss_tnc_fd,
.fill = (patty_ax25_if_driver_fill *)patty_kiss_tnc_fill,
.drain = (patty_ax25_if_driver_drain *)patty_kiss_tnc_drain,
.ready = (patty_ax25_if_driver_ready *)patty_kiss_tnc_ready,
.pending = (patty_ax25_if_driver_pending *)patty_kiss_tnc_pending,
.flush = (patty_ax25_if_driver_flush *)patty_kiss_tnc_flush,
.send = (patty_ax25_if_driver_send *)patty_kiss_tnc_send
};