diff src/protocols/jabber/xmlparse.c @ 3127:4e7cefc55971

[gaim-migrate @ 3142] Upgraded jabber to most recent stable version committer: Tailor Script <[e-mail]>

--- a/src/protocols/jabber/xmlparse.c	Thu Apr 04 00:59:12 2002 +0000
+++ b/src/protocols/jabber/xmlparse.c	Thu Apr 04 03:04:57 2002 +0000
@@ -17,15 +17,6 @@
 
 Contributor(s):
 
-Alternatively, the contents of this file may be used under the terms
-of the GNU General Public License (the "GPL"), in which case the
-provisions of the GPL are applicable instead of those above.  If you
-wish to allow use of your version of this file only under the terms of
-the GPL and not to allow others to use your version of this file under
-the MPL, indicate your decision by deleting the provisions above and
-replace them with the notice and other provisions required by the
-GPL. If you do not delete the provisions above, a recipient may use
-your version of this file under either the MPL or the GPL.
 */
 
 #include "xmldef.h"
@@ -190,7 +181,6 @@
 static Processor contentProcessor;
 static Processor cdataSectionProcessor;
 static Processor epilogProcessor;
-static Processor errorProcessor;
 static Processor externalEntityInitProcessor;
 static Processor externalEntityInitProcessor2;
 static Processor externalEntityInitProcessor3;
@@ -2333,15 +2323,6 @@
     }
 }
 
-static
-enum XML_Error errorProcessor(XML_Parser parser,
-                              const char *s,
-                              const char *end,
-                              const char **nextPtr)
-{
-    return errorCode;
-}
-
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *enc, int isCdata,
                     const char *ptr, const char *end,
@@ -2483,10 +2464,11 @@
                                 const char *entityTextPtr,
                                 const char *entityTextEnd)
 {
-    const ENCODING *internalEnc = ns ? XmlGetInternalEncodingNS() : XmlGetInternalEncoding();
+    const ENCODING *internalEnc;
     STRING_POOL *pool = &(dtd.pool);
     entityTextPtr += encoding->minBytesPerChar;
     entityTextEnd -= encoding->minBytesPerChar;
+    internalEnc = ns ? XmlGetInternalEncodingNS() : XmlGetInternalEncoding();
     for (;;) {
         const char *next;
         int tok = XmlEntityValueTok(encoding, entityTextPtr, entityTextEnd, &next);