From 6f0753df9a14c895b9b7ee8be94927382bf43b6e Mon Sep 17 00:00:00 2001 From: scottmk Date: Fri, 9 Jan 2009 20:14:35 +0000 Subject: [PATCH] Move the xmlSAXHandler out of the header and into the implementation file, along with the prototypes of the associated callback functions (which are now static) git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1614 9efc2488-bf62-4759-914b-345cdb29e865 --- src/jserver/osrf_chat.c | 55 ++++++++++++++++++++++++++++++++++++----- src/jserver/osrf_chat.h | 46 ---------------------------------- 2 files changed, 49 insertions(+), 52 deletions(-) diff --git a/src/jserver/osrf_chat.c b/src/jserver/osrf_chat.c index ed929d8..82f872c 100644 --- a/src/jserver/osrf_chat.c +++ b/src/jserver/osrf_chat.c @@ -18,6 +18,49 @@ GNU General Public License for more details. #include #include +static void osrfChatStartStream( void* blob ); +static void osrfChatStartElement( void* blob, const xmlChar *name, const xmlChar **atts ); +static void osrfChatEndElement( void* blob, const xmlChar* name ); +static void osrfChatHandleCharacter(void* blob, const xmlChar *ch, int len); +static void osrfChatParseError( void* blob, const char* msg, ... ); + +static xmlSAXHandler osrfChatSaxHandlerStruct = { + NULL, /* internalSubset */ + NULL, /* isStandalone */ + NULL, /* hasInternalSubset */ + NULL, /* hasExternalSubset */ + NULL, /* resolveEntity */ + NULL, /* getEntity */ + NULL, /* entityDecl */ + NULL, /* notationDecl */ + NULL, /* attributeDecl */ + NULL, /* elementDecl */ + NULL, /* unparsedEntityDecl */ + NULL, /* setDocumentLocator */ + osrfChatStartStream, /* startDocument */ + NULL, /* endDocument */ + osrfChatStartElement, /* startElement */ + osrfChatEndElement, /* endElement */ + NULL, /* reference */ + osrfChatHandleCharacter, /* characters */ + NULL, /* ignorableWhitespace */ + NULL, /* processingInstruction */ + NULL, /* comment */ + osrfChatParseError, /* xmlParserWarning */ + osrfChatParseError, /* xmlParserError */ + NULL, /* xmlParserFatalError : unused */ + NULL, /* getParameterEntity */ + NULL, /* cdataBlock; */ + NULL, /* externalSubset; */ + 1, + NULL, + NULL, /* startElementNs */ + NULL, /* endElementNs */ + NULL /* xmlStructuredErrorFunc */ +}; + +static const xmlSAXHandlerPtr osrfChatSaxHandler = &osrfChatSaxHandlerStruct; + #ifndef HOST_NAME_MAX #define HOST_NAME_MAX 256 #endif @@ -437,12 +480,12 @@ int osrfChatPushData( osrfChatServer* server, osrfChatNode* node, char* data ) { } -void osrfChatStartStream( void* blob ) { +static void osrfChatStartStream( void* blob ) { osrfLogDebug( OSRF_LOG_MARK, "Starting new client stream..."); } -void osrfChatStartElement( void* blob, const xmlChar *name, const xmlChar **atts ) { +static void osrfChatStartElement( void* blob, const xmlChar *name, const xmlChar **atts ) { if(!(blob && name)) return; osrfChatNode* node = (osrfChatNode*) blob; @@ -707,7 +750,7 @@ int osrfChatHandleS2SResponse( osrfChatNode* node, const char* name, const xmlCh -void osrfChatEndElement( void* blob, const xmlChar* name ) { +static void osrfChatEndElement( void* blob, const xmlChar* name ) { if(!(blob && name)) return; osrfChatNode* node = (osrfChatNode*) blob; @@ -759,14 +802,14 @@ void osrfChatEndElement( void* blob, const xmlChar* name ) { } -void osrfChatHandleCharacter( void* blob, const xmlChar *ch, int len) { +static void osrfChatHandleCharacter( void* blob, const xmlChar *ch, int len) { if(!(blob && ch && len)) return; osrfChatNode* node = (osrfChatNode*) blob; /* osrfLogDebug( OSRF_LOG_MARK, "Char Handler: state %d, xmlstate %d, chardata %s", node->state, node->xmlstate, (char*) ch ); - */ + */ if( node->state == OSRF_CHAT_STATE_CONNECTING ) { if( node->xmlstate & OSRF_CHAT_STATE_INIQ ) { @@ -822,7 +865,7 @@ void osrfChatHandleCharacter( void* blob, const xmlChar *ch, int len) { } -void osrfChatParseError( void* blob, const char* msg, ... ) { +static void osrfChatParseError( void* blob, const char* msg, ... ) { osrfChatXMLErrorOcurred = 1; } diff --git a/src/jserver/osrf_chat.h b/src/jserver/osrf_chat.h index df9b273..a7eb2af 100644 --- a/src/jserver/osrf_chat.h +++ b/src/jserver/osrf_chat.h @@ -202,13 +202,6 @@ void osrfChatNodeFinish( osrfChatServer* server, osrfChatNode* node ); /* initializes the negotiation of a server to server connection */ int osrfChatInitS2S( osrfChatServer* cs, char* remote, char* toAddr, char* msgXML ); - -void osrfChatStartStream( void* blob ); -void osrfChatStartElement( void* blob, const xmlChar *name, const xmlChar **atts ); -void osrfChatEndElement( void* blob, const xmlChar* name ); -void osrfChatHandleCharacter(void* blob, const xmlChar *ch, int len); -void osrfChatParseError( void* blob, const char* msg, ... ); - int osrfChatHandleNewConnection( osrfChatNode* node, const char* name, const xmlChar** atts ); int osrfChatHandleConnecting( osrfChatNode* node, const char* name, const xmlChar** atts ); int osrfChatHandleConnected( osrfChatNode* node, const char* name, const xmlChar** atts ); @@ -220,48 +213,9 @@ int osrfChatHandleS2SConnected( osrfChatNode* node, const char* nm, const xmlCha void osrfChatS2SMessageFree(void* n); - - /* generates a random sha1 hex key */ char* osrfChatMkAuthKey(); -static xmlSAXHandler osrfChatSaxHandlerStruct = { - NULL, /* internalSubset */ - NULL, /* isStandalone */ - NULL, /* hasInternalSubset */ - NULL, /* hasExternalSubset */ - NULL, /* resolveEntity */ - NULL, /* getEntity */ - NULL, /* entityDecl */ - NULL, /* notationDecl */ - NULL, /* attributeDecl */ - NULL, /* elementDecl */ - NULL, /* unparsedEntityDecl */ - NULL, /* setDocumentLocator */ - osrfChatStartStream, /* startDocument */ - NULL, /* endDocument */ - osrfChatStartElement, /* startElement */ - osrfChatEndElement, /* endElement */ - NULL, /* reference */ - osrfChatHandleCharacter, /* characters */ - NULL, /* ignorableWhitespace */ - NULL, /* processingInstruction */ - NULL, /* comment */ - osrfChatParseError, /* xmlParserWarning */ - osrfChatParseError, /* xmlParserError */ - NULL, /* xmlParserFatalError : unused */ - NULL, /* getParameterEntity */ - NULL, /* cdataBlock; */ - NULL, /* externalSubset; */ - 1, - NULL, - NULL, /* startElementNs */ - NULL, /* endElementNs */ - NULL /* xmlStructuredErrorFunc */ -}; - -static const xmlSAXHandlerPtr osrfChatSaxHandler = &osrfChatSaxHandlerStruct; - #ifdef __cplusplus } #endif -- 2.43.2