From 35babf392fb592e6f3c0732ca100e12450fde2a8 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 6 Jun 2015 23:00:05 +0100
Subject: [PATCH] Renamed stanza verification functions

---
 src/server/server.c        | 2 +-
 src/server/stanzas.c       | 8 ++++----
 src/server/stanzas.h       | 8 ++++----
 src/server/stream_parser.c | 2 +-
 src/server/verify.c        | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/server/server.c b/src/server/server.c
index b1d0df0..9b58069 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -407,7 +407,7 @@ _shutdown(void)
     close(listen_socket);
 
     prime_free_all();
-    stanza_free_all();
+    stanzas_free_all();
 
     pthread_mutex_lock(&send_queue_lock);
     g_list_free_full(send_queue, free);
diff --git a/src/server/stanzas.c b/src/server/stanzas.c
index 04bc5c9..25eeb1d 100644
--- a/src/server/stanzas.c
+++ b/src/server/stanzas.c
@@ -55,7 +55,7 @@ stanzas_contains_id(char *id)
 }
 
 void
-stanza_add(XMPPStanza *stanza)
+stanzas_add(XMPPStanza *stanza)
 {
     pthread_mutex_lock(&stanzas_lock);
     stanzas = g_list_append(stanzas, stanza);
@@ -149,7 +149,7 @@ _stanzas_equal(XMPPStanza *first, XMPPStanza *second)
 }
 
 int
-stanza_verify_any(XMPPStanza *stanza)
+stanzas_verify_any(XMPPStanza *stanza)
 {
     pthread_mutex_lock(&stanzas_lock);
     if (!stanzas) {
@@ -173,7 +173,7 @@ stanza_verify_any(XMPPStanza *stanza)
 }
 
 int
-stanza_verify_last(XMPPStanza *stanza)
+stanzas_verify_last(XMPPStanza *stanza)
 {
     pthread_mutex_lock(&stanzas_lock);
     if (!stanzas) {
@@ -198,7 +198,7 @@ stanza_verify_last(XMPPStanza *stanza)
 }
 
 void
-stanza_free_all(void)
+stanzas_free_all(void)
 {
     pthread_mutex_lock(&stanzas_lock);
     g_list_free_full(stanzas, (GDestroyNotify)stanza_free);
diff --git a/src/server/stanzas.h b/src/server/stanzas.h
index 1b37354..2fed655 100644
--- a/src/server/stanzas.h
+++ b/src/server/stanzas.h
@@ -27,13 +27,13 @@
 
 #include "server/stanza.h"
 
-void stanza_add(XMPPStanza *stanza);
+void stanzas_add(XMPPStanza *stanza);
 
-int stanza_verify_any(XMPPStanza *stanza);
-int stanza_verify_last(XMPPStanza *stanza);
+int stanzas_verify_any(XMPPStanza *stanza);
+int stanzas_verify_last(XMPPStanza *stanza);
 
 int stanzas_contains_id(char *id);
 
-void stanza_free_all(void);
+void stanzas_free_all(void);
 
 #endif
diff --git a/src/server/stream_parser.c b/src/server/stream_parser.c
index df5a9f6..ae18bb3 100644
--- a/src/server/stream_parser.c
+++ b/src/server/stream_parser.c
@@ -75,7 +75,7 @@ end_element(void *data, const char *element)
         curr_stanza = curr_stanza->parent;
     } else {
         log_println("RECV: %s", curr_string->str);
-        stanza_add(curr_stanza);
+        stanzas_add(curr_stanza);
         if (stanza_get_child_by_ns(curr_stanza, "jabber:iq:auth")) {
             auth_cb(curr_stanza);
         } else {
diff --git a/src/server/verify.c b/src/server/verify.c
index 2307139..198663e 100644
--- a/src/server/verify.c
+++ b/src/server/verify.c
@@ -96,12 +96,12 @@ verify_any(char *stanza_text)
 
     int result = 0;
     if (timeoutsecs <= 0) {
-        result = stanza_verify_any(curr_stanza);
+        result = stanzas_verify_any(curr_stanza);
     } else {
         double elapsed = 0.0;
         GTimer *timer = g_timer_new();
         while (elapsed < timeoutsecs * 1.0) {
-            result = stanza_verify_any(curr_stanza);
+            result = stanzas_verify_any(curr_stanza);
             if (result) {
                 break;
             }
@@ -136,12 +136,12 @@ verify_last(char *stanza_text)
 
     int result = 0;
     if (timeoutsecs <= 0) {
-        result = stanza_verify_last(curr_stanza);
+        result = stanzas_verify_last(curr_stanza);
     } else {
         double elapsed = 0.0;
         GTimer *timer = g_timer_new();
         while (elapsed < timeoutsecs * 1.0) {
-            result = stanza_verify_last(curr_stanza);
+            result = stanzas_verify_last(curr_stanza);
             if (result) {
                 break;
             }