Minor cleanup of rss parser in preparation for some upcoming changes.

[citadel.git] / citadel / modules / xmpp / serv_xmpp.h

diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h
index 84bc29d5cf9a04386d08b89510c7492ffc4d1cd0..27f3410544f857ee5defc7d907e19a9b4702da76 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.h
+++ b/citadel/modules/xmpp/serv_xmpp.h
@@ -1,23 +1,16 @@
 /*
- * Copyright (c) 2007-2009 by Art Cancro
+ * Copyright (c) 2007-2009 by the citadel.org team
  *
- *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3.
- *  
- *  
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-typedef struct _citxmpp {                      /* Information about the current session */
-       StrBuf *OutBuf;
+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;
@@ -65,15 +58,6 @@ enum {
        XMPP_EVT_LOGOUT
 };
 
-
-typedef void (*xmpp_handler_func)(void *data, const char *supplied_el, const char **attr);
-
-typedef struct __xmpp_handler {
-       int               Flags;
-       xmpp_handler_func Handler;
-}xmpp_handler;
-
-
 void xmpp_cleanup_function(void);
 void xmpp_greeting(void);
 void xmpp_command_loop(void);
@@ -81,6 +65,7 @@ void xmpp_async_loop(void);
 void xmpp_sasl_auth(char *, char *);
 void xmpp_output_auth_mechs(void);
 void xmpp_query_namespace(char *, char *, char *, char *);
+void xmpp_wholist_presence_dump(void);
 void xmpp_output_incoming_messages(void);
 void xmpp_queue_event(int, char *);
 void xmpp_process_events(void);
@@ -104,23 +89,3 @@ extern int XMPPSrvDebugEnable;
 #define XMPPM_syslog(LEVEL, FORMAT)            \
        DBGLOG(LEVEL) syslog(LEVEL,             \
                             "XMPP: " FORMAT);
-
-
-void XUnbuffer(void);
-void XPutBody(const char *Str, long Len);
-void XPutProp(const char *Str, long Len);
-void XPut(const char *Str, long Len);
-#define XPUT(CONSTSTR) XPut(CONSTSTR, sizeof(CONSTSTR) -1)
-
-void XPrintf(const char *Format, ...);
-
-
-void AddXMPPStartHandler(const char *key,
-                        long len,
-                        xmpp_handler_func Handler,
-                        int Flags);
-
-void AddXMPPEndHandler(const char *key,
-                      long len,
-                      xmpp_handler_func Handler,
-                      int Flags);