Move the libxml headers out of the header and into the

implementation file.

The files that #include osrf_message.h compile just fine
without the nested libxml headers, and there's no reason
to make the compiler paw through them.

M    include/opensrf/osrf_message.h
M    src/libopensrf/osrf_message.c

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1854 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/include/opensrf/osrf_message.h b/include/opensrf/osrf_message.h
index 60fa576..d9255ce 100644 (file)
--- a/include/opensrf/osrf_message.h
+++ b/include/opensrf/osrf_message.h
@@ -11,14 +11,6 @@
 #include <opensrf/log.h>
 #include <opensrf/osrf_json.h>
 
-
-/* libxml stuff for the config reader */
-#include <libxml/xmlmemory.h>
-#include <libxml/parser.h>
-#include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
-#include <libxml/tree.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/src/libopensrf/osrf_message.c b/src/libopensrf/osrf_message.c
index d729eb6..c5f8644 100644 (file)
--- a/src/libopensrf/osrf_message.c
+++ b/src/libopensrf/osrf_message.c
@@ -1,10 +1,18 @@
-#include <opensrf/osrf_message.h>
 
 /**
        @file osrf_message.c
        @brief Implementation of osrfMessage.
 */
 
+/* libxml stuff for the config reader */
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+#include <libxml/tree.h>
+
+#include <opensrf/osrf_message.h>
+
 static jsonObject* osrfMessageToJSON( const osrfMessage* msg );
 static osrfMessage* deserialize_one_message( const jsonObject* message );
 
@@ -555,7 +563,7 @@ static osrfMessage* deserialize_one_message( const jsonObject* obj ) {
        // Get the message type.  If it isn't present, default to CONNECT.
        const jsonObject* tmp = jsonObjectGetKeyConst( obj, "type" );
 
-       enum M_TYPE type;
+       enum M_TYPE type = CONNECT;
        const char* t = jsonObjectGetString( tmp );
        if( t ) {