Update libxml to 2.7.7.

third_party/libxml/xmlwriter.c

 
 /*
  * xmlwriter.c: XML text writer implementation
  *
  * For license and disclaimer see the license and disclaimer of
  * libxml2.
  *
  * alfred@mickautsch.de
  */
 
@@ skipping 111 matching lines @@
  *
  * Handle a writer error
  */
 static void
 xmlWriterErrMsg(xmlTextWriterPtr ctxt, xmlParserErrors error,
                const char *msg)
 {
     if (ctxt != NULL) {
         __xmlRaiseError(NULL, NULL, NULL, ctxt->ctxt,
                     NULL, XML_FROM_WRITER, error, XML_ERR_FATAL,
-                    NULL, 0, NULL, NULL, NULL, 0, 0, msg);
+                    NULL, 0, NULL, NULL, NULL, 0, 0, "%s", msg);
     } else {
         __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_WRITER, error,
-                    XML_ERR_FATAL, NULL, 0, NULL, NULL, NULL, 0, 0, msg);
+                    XML_ERR_FATAL, NULL, 0, NULL, NULL, NULL, 0, 0, "%s", msg);
     }
 }
 
 /**
  * xmlWriterErrMsgInt:
  * @ctxt:  a writer context
  * @error:  the error number
  * @msg:  the error message
  * @val:  an int
  *
@@ skipping 89 matching lines @@
  * Returns the new xmlTextWriterPtr or NULL in case of error
  */
 xmlTextWriterPtr
 xmlNewTextWriterFilename(const char *uri, int compression)
 {
     xmlTextWriterPtr ret;
     xmlOutputBufferPtr out;
 
     out = xmlOutputBufferCreateFilename(uri, NULL, compression);
     if (out == NULL) {
-        xmlWriterErrMsg(NULL, XML_ERR_NO_MEMORY,
-                        "xmlNewTextWriterFilename : out of memory!\n");
+        xmlWriterErrMsg(NULL, XML_IO_EIO,
+                        "xmlNewTextWriterFilename : cannot open uri\n");
         return NULL;
     }
 
     ret = xmlNewTextWriter(out);
     if (ret == NULL) {
         xmlWriterErrMsg(NULL, XML_ERR_NO_MEMORY,
                         "xmlNewTextWriterFilename : out of memory!\n");
         xmlOutputBufferClose(out);
         return NULL;
     }
@@ skipping 106 matching lines @@
 
     memset(&saxHandler, '\0', sizeof(saxHandler));
     xmlSAX2InitDefaultSAXHandler(&saxHandler, 1);
     saxHandler.startDocument = xmlTextWriterStartDocumentCallback;
     saxHandler.startElement = xmlSAX2StartElement;
     saxHandler.endElement = xmlSAX2EndElement;
 
     ctxt = xmlCreatePushParserCtxt(&saxHandler, NULL, NULL, 0, NULL);
     if (ctxt == NULL) {
         xmlWriterErrMsg(NULL, XML_ERR_INTERNAL_ERROR,
-                        "xmlNewTextWriterDoc : error at xmlCreatePushParserCtxt!\n");
+                "xmlNewTextWriterDoc : error at xmlCreatePushParserCtxt!\n");
         return NULL;
     }
     /*
      * For some reason this seems to completely break if node names
      * are interned.
      */
     ctxt->dictNames = 0;
 
     ctxt->myDoc = xmlNewDoc(BAD_CAST XML_DEFAULT_VERSION);
     if (ctxt->myDoc == NULL) {
         xmlFreeParserCtxt(ctxt);
         xmlWriterErrMsg(NULL, XML_ERR_INTERNAL_ERROR,
                         "xmlNewTextWriterDoc : error at xmlNewDoc!\n");
         return NULL;
     }
 
     ret = xmlNewTextWriterPushParser(ctxt, compression);
     if (ret == NULL) {
+        xmlFreeDoc(ctxt->myDoc);
+        xmlFreeParserCtxt(ctxt);
         xmlWriterErrMsg(NULL, XML_ERR_INTERNAL_ERROR,
-                        "xmlNewTextWriterDoc : error at xmlNewTextWriterPushParser!\n");
+                "xmlNewTextWriterDoc : error at xmlNewTextWriterPushParser!\n");
         return NULL;
     }
 
     xmlSetDocCompressMode(ctxt->myDoc, compression);
 
     if (doc != NULL) {
         *doc = ctxt->myDoc;
         ret->no_doc_free = 1;
     }
 
@@ skipping 487 matching lines @@
     int rc;
     xmlChar *buf;
 
     if (writer == NULL) {
         xmlWriterErrMsg(writer, XML_ERR_INTERNAL_ERROR,
                         "xmlTextWriterWriteVFormatComment : invalid writer!\n");
         return -1;
     }
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteComment(writer, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteComment:
  * @writer:  the xmlTextWriterPtr
@@ skipping 320 matching lines @@
             /* Output namespace declarations */
             count = xmlTextWriterOutputNSDecl(writer);
             if (count < 0)
                 return -1;
             sum += count;
 
             count = xmlOutputBufferWriteString(writer->out, ">");
             if (count < 0)
                 return -1;
             sum += count;
+            if (writer->indent)
+                writer->doindent = 0;
             /* fallthrough */
         case XML_TEXTWRITER_TEXT:
+            if ((writer->indent) && (writer->doindent)) {
+                count = xmlTextWriterWriteIndent(writer);
+                sum += count;
+                writer->doindent = 1;
+            } else
+                writer->doindent = 1;
             count = xmlOutputBufferWriteString(writer->out, "</");
             if (count < 0)
                 return -1;
             sum += count;
             count = xmlOutputBufferWriteString(writer->out,
                                                (const char *) p->name);
             if (count < 0)
                 return -1;
             sum += count;
             count = xmlOutputBufferWriteString(writer->out, ">");
@@ skipping 53 matching lines @@
 xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer, const char *format,
                              va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteRaw(writer, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteRawLen:
  * @writer:  the xmlTextWriterPtr
@@ skipping 107 matching lines @@
 xmlTextWriterWriteVFormatString(xmlTextWriterPtr writer,
                                 const char *format, va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if ((writer == NULL) || (format == NULL))
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteString(writer, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteString:
  * @writer:  the xmlTextWriterPtr
@@ skipping 36 matching lines @@
                                                NULL, content);
                     break;
                 default:
                     break;
             }
         }
     }
 
     if (buf != NULL) {
         count = xmlTextWriterWriteRaw(writer, buf);
+
+        if (buf != content)     /* buf was allocated by us, so free it */
+            xmlFree(buf);
+
         if (count < 0)
             return -1;
         sum += count;
-
-        if (buf != content)     /* buf was allocated by us, so free it */
-            xmlFree(buf);
     }
 
     return sum;
 }
 
 /**
  * xmlOutputBufferWriteBase64:
  * @out: the xmlOutputBufferPtr
  * @data:   binary data
  * @len:  the number of bytes to encode
@@ skipping 461 matching lines @@
                                    const xmlChar * name,
                                    const char *format, va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteAttribute(writer, name, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteAttribute:
  * @writer:  the xmlTextWriterPtr
@@ skipping 80 matching lines @@
                                      const xmlChar * namespaceURI,
                                      const char *format, va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteAttributeNS(writer, prefix, name, namespaceURI,
                                        buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteAttributeNS:
@@ skipping 79 matching lines @@
                                  const xmlChar * name, const char *format,
                                  va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteElement(writer, name, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteElement:
  * @writer:  the xmlTextWriterPtr
@@ skipping 80 matching lines @@
                                    const xmlChar * namespaceURI,
                                    const char *format, va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteElementNS(writer, prefix, name, namespaceURI,
                                      buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteElementNS:
@@ skipping 227 matching lines @@
                             const xmlChar * target, const char *format,
                             va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWritePI(writer, target, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWritePI:
  * @writer:  the xmlTextWriterPtr
@@ skipping 191 matching lines @@
 xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer, const char *format,
                                va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteCDATA(writer, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteCDATA:
  * @writer:  the xmlTextWriterPtr
@@ skipping 296 matching lines @@
                              const xmlChar * sysid,
                              const char *format, va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteDTD(writer, name, pubid, sysid, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteDTD:
  * @writer:  the xmlTextWriterPtr
@@ skipping 216 matching lines @@
                                     const xmlChar * name,
                                     const char *format, va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteDTDElement(writer, name, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteDTDElement:
  * @writer:  the xmlTextWriterPtr
@@ skipping 215 matching lines @@
                                     const xmlChar * name,
                                     const char *format, va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteDTDAttlist(writer, name, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteDTDAttlist:
  * @writer:  the xmlTextWriterPtr
@@ skipping 240 matching lines @@
                                            const char *format,
                                            va_list argptr)
 {
     int rc;
     xmlChar *buf;
 
     if (writer == NULL)
         return -1;
 
     buf = xmlTextWriterVSprintf(format, argptr);
-    if (buf == 0)
-        return 0;
+    if (buf == NULL)
+        return -1;
 
     rc = xmlTextWriterWriteDTDInternalEntity(writer, pe, name, buf);
 
     xmlFree(buf);
     return rc;
 }
 
 /**
  * xmlTextWriterWriteDTDEntity:
  * @writer:  the xmlTextWriterPtr
@@ skipping 867 matching lines @@
             return -1;
         sum += count;
     }
 
     return sum;
 }
 
 #define bottom_xmlwriter
 #include "elfgcchack.h"
 #endif