From: Wilfried Göesgens <willi@citadel.org>
Date: Mon, 3 May 2010 21:16:31 +0000 (+0000)
Subject: * rather have one typedef than dozends of structs all over the source
X-Git-Tag: v7.86~228
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=16f6e0e64488358e65bc28a207de9a24681f5bc6

* rather have one typedef than dozends of structs all over the source
---

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index bab30ab7f..a4a5f28ec 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -409,7 +409,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 
 void xmpp_xml_chardata(void *data, const XML_Char *s, int len)
 {
-	struct citxmpp *X = XMPP;
+	citxmpp *X = XMPP;
 
 	if (X->chardata_alloc == 0) {
 		X->chardata_alloc = SIZ;
@@ -453,8 +453,8 @@ void xmpp_cleanup_function(void) {
  */
 void xmpp_greeting(void) {
 	strcpy(CC->cs_clientname, "XMPP session");
-	CC->session_specific_data = malloc(sizeof(struct citxmpp));
-	memset(XMPP, 0, sizeof(struct citxmpp));
+	CC->session_specific_data = malloc(sizeof(citxmpp));
+	memset(XMPP, 0, sizeof(citxmpp));
 	XMPP->last_event_processed = queue_event_seq;
 
 	/* XMPP does not use a greeting, but we still have to initialize some things. */
diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h
index d8e29e9e1..af405ea5b 100644
--- a/citadel/modules/xmpp/serv_xmpp.h
+++ b/citadel/modules/xmpp/serv_xmpp.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-struct citxmpp {			/* Information about the current session */
+typedef struct _citxmpp {			/* Information about the current session */
 	XML_Parser xp;			/* XML parser instance for incoming client stream */
 	char server_name[256];		/* who they think we are */
 	char *chardata;
@@ -45,9 +45,9 @@ struct citxmpp {			/* Information about the current session */
 
 	int bind_requested;		/* In this stanza, client is asking server to bind a resource. */
 	int ping_requested;		/* In this stanza, client is pinging the server. */
-};
+} citxmpp;
 
-#define XMPP ((struct citxmpp *)CC->session_specific_data)
+#define XMPP ((citxmpp *)CC->session_specific_data)
 
 struct xmpp_event {
 	struct xmpp_event *next;