From b97b927e0c8313baae63c4d2f6fc49f5753c36a8 Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Sat, 3 Oct 2020 13:03:30 -0400 Subject: [PATCH] Remove unused patty_ax25_if_pending() Remove unused patty_ax25_if_pending() from src/if.c, as well as from all drivers implementing this method --- include/patty/ax25/aprs_is.h | 2 -- include/patty/ax25/if.h | 5 ----- include/patty/kiss/tnc.h | 2 -- src/aprs_is.c | 5 ----- src/if.c | 4 ---- src/tnc.c | 5 ----- 6 files changed, 23 deletions(-) diff --git a/include/patty/ax25/aprs_is.h b/include/patty/ax25/aprs_is.h index 3ed26e7..66cabb1 100644 --- a/include/patty/ax25/aprs_is.h +++ b/include/patty/ax25/aprs_is.h @@ -37,8 +37,6 @@ void patty_ax25_aprs_is_destroy(patty_ax25_aprs_is *aprs); int patty_ax25_aprs_is_fd(patty_ax25_aprs_is *aprs); -ssize_t patty_ax25_aprs_is_pending(patty_ax25_aprs_is *aprs); - 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); diff --git a/include/patty/ax25/if.h b/include/patty/ax25/if.h index 7eddf6a..41bd7d9 100644 --- a/include/patty/ax25/if.h +++ b/include/patty/ax25/if.h @@ -35,8 +35,6 @@ typedef patty_ax25_if_stats *(patty_ax25_if_driver_stats)(void *); typedef int (patty_ax25_if_driver_fd)(void *); -typedef int (patty_ax25_if_driver_pending)(void *); - typedef ssize_t (patty_ax25_if_driver_fill)(void *); typedef ssize_t (patty_ax25_if_driver_drain)(void *, void *, size_t); @@ -52,7 +50,6 @@ typedef struct _patty_ax25_if_driver { patty_ax25_if_driver_destroy *destroy; patty_ax25_if_driver_stats *stats; patty_ax25_if_driver_fd *fd; - patty_ax25_if_driver_pending *pending; patty_ax25_if_driver_fill *fill; patty_ax25_if_driver_drain *drain; patty_ax25_if_driver_ready *ready; @@ -107,8 +104,6 @@ void patty_ax25_if_drop(patty_ax25_if *iface); int patty_ax25_if_fd(patty_ax25_if *iface); -int patty_ax25_if_pending(patty_ax25_if *iface); - 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); diff --git a/include/patty/kiss/tnc.h b/include/patty/kiss/tnc.h index 24ee8b8..8bbcd7e 100644 --- a/include/patty/kiss/tnc.h +++ b/include/patty/kiss/tnc.h @@ -37,8 +37,6 @@ int patty_kiss_tnc_fd(patty_kiss_tnc *tnc); void patty_kiss_tnc_destroy(patty_kiss_tnc *tnc); -int patty_kiss_tnc_pending(patty_kiss_tnc *tnc); - 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); diff --git a/src/aprs_is.c b/src/aprs_is.c index e2981c3..8d0015a 100644 --- a/src/aprs_is.c +++ b/src/aprs_is.c @@ -173,10 +173,6 @@ int patty_ax25_aprs_is_fd(patty_ax25_aprs_is *aprs) { return aprs->fd; } -ssize_t patty_ax25_aprs_is_pending(patty_ax25_aprs_is *aprs) { - return aprs->offset_i < aprs->readlen? 1: 0; -} - ssize_t patty_ax25_aprs_is_fill(patty_ax25_aprs_is *aprs) { int attempt = 0; @@ -446,7 +442,6 @@ patty_ax25_if_driver *patty_ax25_aprs_is_driver() { .destroy = (patty_ax25_if_driver_destroy *)patty_ax25_aprs_is_destroy, .stats = (patty_ax25_if_driver_stats *)patty_ax25_aprs_is_stats, .fd = (patty_ax25_if_driver_fd *)patty_ax25_aprs_is_fd, - .pending = (patty_ax25_if_driver_pending *)patty_ax25_aprs_is_pending, .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, diff --git a/src/if.c b/src/if.c index 97acf34..fcfd5e3 100644 --- a/src/if.c +++ b/src/if.c @@ -272,10 +272,6 @@ int patty_ax25_if_fd(patty_ax25_if *iface) { return iface->driver->fd(iface->phy); } -int patty_ax25_if_pending(patty_ax25_if *iface) { - return iface->driver->pending(iface->phy); -} - ssize_t patty_ax25_if_fill(patty_ax25_if *iface) { return iface->driver->fill(iface->phy); } diff --git a/src/tnc.c b/src/tnc.c index ab0c3a3..904b20f 100644 --- a/src/tnc.c +++ b/src/tnc.c @@ -210,10 +210,6 @@ static void tnc_drop(patty_kiss_tnc *tnc) { tnc->stats.dropped++; } -int patty_kiss_tnc_pending(patty_kiss_tnc *tnc) { - return tnc->offset_i < tnc->readlen? 1: 0; -} - ssize_t patty_kiss_tnc_fill(patty_kiss_tnc *tnc) { if ((tnc->readlen = read(tnc->fd, tnc->buf, tnc->bufsz)) < 0) { goto error_read; @@ -370,7 +366,6 @@ patty_ax25_if_driver *patty_kiss_tnc_driver() { .destroy = (patty_ax25_if_driver_destroy *)patty_kiss_tnc_destroy, .stats = (patty_ax25_if_driver_stats *)patty_kiss_tnc_stats, .fd = (patty_ax25_if_driver_fd *)patty_kiss_tnc_fd, - .pending = (patty_ax25_if_driver_pending *)patty_kiss_tnc_pending, .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,