Changeset 41ca004 for protocols/jabber

Timestamp:

2006-05-19T07:55:53Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

68b518d6

Parents:

ac83732 (diff), 881fd4e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from main development tree.

Location:

protocols/jabber

Files:

• jabber.c (modified) (1 diff)
• xmlparse.c (modified) (4 diffs)

protocols/jabber/jabber.c

@@ -1553 +1553 @@
         if(jd->gjc != NULL) {
                 gjab_delete(jd->gjc);
+                /* YAY for modules with their own memory pool managers!...
                 g_free(jd->gjc->sid);
+                And a less sarcastic yay for valgrind. :-) */
                 jd->gjc = NULL;
         }

protocols/jabber/xmlparse.c

@@ -1461 +1461 @@
 s = protocolEncodingName;
 #endif
-    if ((ns ? XmlInitEncodingNS : XmlInitEncoding)(&initEncoding, &encoding, s))
+    if (ns ? XmlInitEncodingNS(&initEncoding, &encoding, s) : XmlInitEncoding(&initEncoding, &encoding, s))
         return XML_ERROR_NONE;
     return handleUnknownEncoding(parser, protocolEncodingName);
@@ -1475 +1475 @@
     int standalone = -1;
     if (!(ns
-            ? XmlParseXmlDeclNS
-            : XmlParseXmlDecl)(isGeneralTextEntity,
+            ? XmlParseXmlDeclNS(isGeneralTextEntity,
                                encoding,
                                s,
@@ -1484 +1483 @@
                                &encodingName,
                                &newEncoding,
-                               &standalone))
+                               &standalone)
+            : XmlParseXmlDecl(isGeneralTextEntity,
+                               encoding,
+                               s,
+                               next,
+                               &eventPtr,
+                               &version,
+                               &encodingName,
+                               &newEncoding,
+                               &standalone)))
         return XML_ERROR_SYNTAX;
     if (!isGeneralTextEntity && standalone == 1)
@@ -1537 +1545 @@
             }
             enc = (ns
-                   ? XmlInitUnknownEncodingNS
-                   : XmlInitUnknownEncoding)(unknownEncodingMem,
+                   ? XmlInitUnknownEncodingNS(unknownEncodingMem,
                                              info.map,
                                              info.convert,
-                                             info.data);
+                                             info.data)
+                   : XmlInitUnknownEncoding(unknownEncodingMem,
+                                             info.map,
+                                             info.convert,
+                                             info.data));
             if (enc) {
                 unknownEncodingData = info.data;