[Opensrf-commits] r2236 - in trunk: include/opensrf src/libopensrf (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2011-04-30 18:40:54 -0400 (Sat, 30 Apr 2011)
New Revision: 2236

Modified:
   trunk/include/opensrf/transport_session.h
   trunk/src/libopensrf/transport_session.c
Log:
move jabber_state_machine_struct into header to keep 'make check' happy

Modified: trunk/include/opensrf/transport_session.h
===================================================================
--- trunk/include/opensrf/transport_session.h	2011-04-28 16:21:39 UTC (rev 2235)
+++ trunk/include/opensrf/transport_session.h	2011-04-30 22:40:54 UTC (rev 2236)
@@ -35,9 +35,27 @@
 /** Note whether the login information should be sent as plaintext or as a hash digest. */
 enum TRANSPORT_AUTH_TYPE { AUTH_PLAIN, AUTH_DIGEST };
 
-struct jabber_state_machine_struct;
+
+// ---------------------------------------------------------------------------------
+// Jabber state machine.  This is how we know where we are in the Jabber
+// conversation.
+// ---------------------------------------------------------------------------------
+struct jabber_state_machine_struct {
+	int connected;
+	int connecting;
+	int in_message;
+	int in_message_body;
+	int in_thread;
+	int in_subject;
+	int in_error;
+	int in_message_error;
+	int in_iq;
+	int in_presence;
+	int in_status;
+};
 typedef struct jabber_state_machine_struct jabber_machine;
 
+
 /**
 	@brief Collection of things for managing a Jabber session.
 */

Modified: trunk/src/libopensrf/transport_session.c
===================================================================
--- trunk/src/libopensrf/transport_session.c	2011-04-28 16:21:39 UTC (rev 2235)
+++ trunk/src/libopensrf/transport_session.c	2011-04-30 22:40:54 UTC (rev 2236)
@@ -19,24 +19,6 @@
 #define JABBER_STATUS_BUFSIZE    16  /**< buffer size for status code */
 
 // ---------------------------------------------------------------------------------
-// Jabber state machine.  This is how we know where we are in the Jabber
-// conversation.
-// ---------------------------------------------------------------------------------
-struct jabber_state_machine_struct {
-	int connected;
-	int connecting;
-	int in_message;
-	int in_message_body;
-	int in_thread;
-	int in_subject;
-	int in_error;
-	int in_message_error;
-	int in_iq;
-	int in_presence;
-	int in_status;
-};
-
-// ---------------------------------------------------------------------------------
 // Callback for handling the startElement event.  Much of the jabber logic occurs
 // in this and the characterHandler callbacks.
 // Here we check for the various top level jabber elements: body, iq, etc.