| Index: third_party/libxml/debugXML.c
|
| diff --git a/third_party/libxml/debugXML.c b/third_party/libxml/debugXML.c
|
| index de6fd6c7623ce5a3b3efd6505daef5ce3e23fca6..415889a657ee0b76e3b3f9e510469a2a6ef91632 100644
|
| --- a/third_party/libxml/debugXML.c
|
| +++ b/third_party/libxml/debugXML.c
|
| @@ -141,9 +141,9 @@ xmlCtxtDumpSpaces(xmlDebugCtxtPtr ctxt)
|
| return;
|
| if ((ctxt->output != NULL) && (ctxt->depth > 0)) {
|
| if (ctxt->depth < 50)
|
| - fprintf(ctxt->output, &ctxt->shift[100 - 2 * ctxt->depth]);
|
| + fprintf(ctxt->output, "%s", &ctxt->shift[100 - 2 * ctxt->depth]);
|
| else
|
| - fprintf(ctxt->output, ctxt->shift);
|
| + fprintf(ctxt->output, "%s", ctxt->shift);
|
| }
|
| }
|
|
|
| @@ -162,7 +162,7 @@ xmlDebugErr(xmlDebugCtxtPtr ctxt, int error, const char *msg)
|
| NULL, ctxt->node, XML_FROM_CHECK,
|
| error, XML_ERR_ERROR, NULL, 0,
|
| NULL, NULL, NULL, 0, 0,
|
| - msg);
|
| + "%s", msg);
|
| }
|
| static void
|
| xmlDebugErr2(xmlDebugCtxtPtr ctxt, int error, const char *msg, int extra)
|
| @@ -259,7 +259,9 @@ xmlCtxtCheckName(xmlDebugCtxtPtr ctxt, const xmlChar * name)
|
| "Name is not an NCName '%s'", (const char *) name);
|
| }
|
| if ((ctxt->dict != NULL) &&
|
| - (!xmlDictOwns(ctxt->dict, name))) {
|
| + (!xmlDictOwns(ctxt->dict, name)) &&
|
| + ((ctxt->doc == NULL) ||
|
| + ((ctxt->doc->parseFlags & (XML_PARSE_SAX1 | XML_PARSE_NODICT)) == 0))) {
|
| xmlDebugErr3(ctxt, XML_CHECK_OUTSIDE_DICT,
|
| "Name is not from the document dictionnary '%s'",
|
| (const char *) name);
|
| @@ -2801,7 +2803,6 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
|
| {
|
| char prompt[500] = "/ > ";
|
| char *cmdline = NULL, *cur;
|
| - int nbargs;
|
| char command[100];
|
| char arg[400];
|
| int i;
|
| @@ -2853,7 +2854,6 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
|
| * Parse the command itself
|
| */
|
| cur = cmdline;
|
| - nbargs = 0;
|
| while ((*cur == ' ') || (*cur == '\t'))
|
| cur++;
|
| i = 0;
|
| @@ -2866,7 +2866,6 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
|
| command[i] = 0;
|
| if (i == 0)
|
| continue;
|
| - nbargs++;
|
|
|
| /*
|
| * Parse the argument
|
| @@ -2880,8 +2879,6 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
|
| arg[i++] = *cur++;
|
| }
|
| arg[i] = 0;
|
| - if (i != 0)
|
| - nbargs++;
|
|
|
| /*
|
| * start interpreting the command
|
|
|