Rename sbuf_has_no_state() to sbuf_is_empty()

As its used now for more than just suspending, the old does not fit anymore.

diff --git a/src/janitor.c b/src/janitor.c
index 0278a52ee66d2d9eff2b8269a9dbd96a2c9e1cf8..0a645039bec4afd4af4d6f386c1f89508a08775b 100644 (file)
--- a/src/janitor.c
+++ b/src/janitor.c
@@ -40,7 +40,7 @@ static void close_server_list(StatList *sk_list, const char *reason)
 bool suspend_socket(PgSocket *sk)
 {
        if (!sk->suspended) {
-               if (sbuf_has_no_state(&sk->sbuf)) {
+               if (sbuf_is_empty(&sk->sbuf)) {
                        sbuf_pause(&sk->sbuf);
                        sk->suspended = 1;
                } else

diff --git a/src/objects.c b/src/objects.c
index 69b4a28f5b80928aa094aba9a6fd412872f84037..d17cf93fc842a08d66b8e174cafcd617f757b656 100644 (file)
--- a/src/objects.c
+++ b/src/objects.c
@@ -641,7 +641,7 @@ void disconnect_client(PgSocket *client, bool notify, const char *reason)
                if (client->link) {
                        PgSocket *server = client->link;
                        /* ->ready may be set before all is sent */
-                       if (server->ready && sbuf_has_no_state(&server->sbuf)) {
+                       if (server->ready && sbuf_is_empty(&server->sbuf)) {
                                release_server(server);
                        } else {
                                server->link = NULL;

diff --git a/src/sbuf.c b/src/sbuf.c
index 223005c1d5745b038607e718f0ce53bc953d6322..74c319d7e6194c0b295c3fdfbfb964fc20b4cb54 100644 (file)
--- a/src/sbuf.c
+++ b/src/sbuf.c
@@ -468,7 +468,7 @@ try_more:
        sbuf_try_resync(sbuf);
 
        /* notify proto that all is sent */
-       if (sbuf_has_no_state(sbuf))
+       if (sbuf_is_empty(sbuf))
                sbuf_call_proto(sbuf, SBUF_EV_FLUSH);
 }
 

diff --git a/src/sbuf.h b/src/sbuf.h
index 615765e5111b85d9d3d04154278400e73c62cdef..bb39382d5c89ac9a1950543849c4bd49282f053d 100644 (file)
--- a/src/sbuf.h
+++ b/src/sbuf.h
@@ -84,8 +84,11 @@ bool sbuf_answer(SBuf *sbuf, const void *buf, int len);
 
 void sbuf_continue_with_callback(SBuf *sbuf, sbuf_libevent_cb cb);
 
-/* returns true if SBuf is suspendable */
-static inline bool sbuf_has_no_state(SBuf *sbuf)
+/*
+ * Returns true if SBuf is has no data buffered
+ * and is not in a middle of a packet.
+ */
+static inline bool sbuf_is_empty(SBuf *sbuf)
 {
        return sbuf->send_pos == sbuf->recv_pos
                && sbuf->pkt_remain == 0;