Renamed stanza -> stanzas

.gitignore

@@ -33,7 +33,6 @@ src/.deps/
 src/.dirstamp
 src/server/parser.lo
 src/server/server.lo
-src/server/stanza.lo
 src/server/xmppclient.lo
 src/client/.dirstamp
 src/client/stabber.lo
@@ -44,5 +43,6 @@ src/server/prime.lo
 src/server/verify.lo
 src/server/httpapi.lo
 src/server/stream_parser.lo
+src/server/stanzas.lo
 
 stabbertest

Makefile.am

@@ -6,7 +6,7 @@ sources = \
 	src/server/xmppclient.c src/server/xmppclient.h \
 	src/server/stream_parser.c src/server/stream_parser.h \
 	src/server/parser.c src/server/parser.h \
-    src/server/stanza.c src/server/stanza.h \
+    src/server/stanzas.c src/server/stanzas.h \
     src/server/log.c src/server/log.h \
     src/server/prime.c src/server/prime.h \
     src/server/verify.c src/server/verify.h \

src/server/parser.c

@@ -24,7 +24,7 @@
 #include <expat.h>
 #include <glib.h>
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 
 typedef struct parse_state_t {
     int depth;

src/server/parser.h

@@ -23,7 +23,7 @@
 #ifndef __H_PARSER
 #define __H_PARSER
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 
 XMPPStanza* parse_stanza(char *stanza_text);
 

src/server/prime.c

@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/parser.h"
 
 static char *required_passwd = NULL;

src/server/prime.h

@@ -23,7 +23,7 @@
 #ifndef __H_PRIME
 #define __H_PRIME
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 
 void prime_init(void);
 void prime_free_all(void);

src/server/server.c

@@ -31,7 +31,7 @@
 #include "server/xmppclient.h"
 #include "server/stream_parser.h"
 #include "server/prime.h"
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/verify.h"
 #include "server/server.h"
 #include "server/httpapi.h"

src/server/stanzas.c

@@ -1,5 +1,5 @@
 /*
- * stanza.c
+ * stanzas.c
  *
  * Copyright (C) 2015 James Booth <boothj5@gmail.com>
  *
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/log.h"
 
 pthread_mutex_t stanzas_lock;

src/server/stanzas.h

@@ -1,5 +1,5 @@
 /*
- * stanza.h
+ * stanzas.h
  *
  * Copyright (C) 2015 James Booth <boothj5@gmail.com>
  *
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __H_STANZA
-#define __H_STANZA
+#ifndef __H_STANZAS
+#define __H_STANZAS
 
 #include <glib.h>
 

src/server/stream_parser.c

@@ -26,7 +26,7 @@
 #include <glib.h>
 
 #include "server/stream_parser.h"
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/log.h"
 
 static int depth = 0;

src/server/stream_parser.h

@@ -23,7 +23,7 @@
 #ifndef __H_STREAM_PARSER
 #define __H_STREAM_PARSER
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/xmppclient.h"
 
 typedef void (*stream_start_func)(void);

src/server/verify.c

@@ -25,7 +25,7 @@
 
 #include <expat.h>
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/log.h"
 
 static int depth = 0;