lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-23 01:52:48 +03:00
Code Activity

Fix -Wmisleading-indentation warnings

Browse Source
This commit is contained in:
Nick Wellnhofer
2017-11-13 21:13:46 +01:00
parent 8cb8e31773
commit 359e750482
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
xmlsave.c
View File

@@ -1595,31 +1595,31 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
if (cur->properties != NULL) if (cur->properties != NULL)
xhtmlAttrListDumpOutput(ctxt, cur->properties); xhtmlAttrListDumpOutput(ctxt, cur->properties);
if ((cur->type == XML_ELEMENT_NODE) && if ((cur->type == XML_ELEMENT_NODE) &&
(cur->parent != NULL) && (cur->parent != NULL) &&
(cur->parent->parent == (xmlNodePtr) cur->doc) && (cur->parent->parent == (xmlNodePtr) cur->doc) &&
xmlStrEqual(cur->name, BAD_CAST"head") && xmlStrEqual(cur->name, BAD_CAST"head") &&
xmlStrEqual(cur->parent->name, BAD_CAST"html")) { xmlStrEqual(cur->parent->name, BAD_CAST"html")) {
tmp = cur->children; tmp = cur->children;
while (tmp != NULL) { while (tmp != NULL) {
if (xmlStrEqual(tmp->name, BAD_CAST"meta")) { if (xmlStrEqual(tmp->name, BAD_CAST"meta")) {
xmlChar *httpequiv; xmlChar *httpequiv;
httpequiv = xmlGetProp(tmp, BAD_CAST"http-equiv"); httpequiv = xmlGetProp(tmp, BAD_CAST"http-equiv");
if (httpequiv != NULL) { if (httpequiv != NULL) {
if (xmlStrcasecmp(httpequiv, BAD_CAST"Content-Type") == 0) { if (xmlStrcasecmp(httpequiv, BAD_CAST"Content-Type") == 0) {
xmlFree(httpequiv); xmlFree(httpequiv);
break; break;
} }
xmlFree(httpequiv); xmlFree(httpequiv);
} }
} }
tmp = tmp->next; tmp = tmp->next;
} }
if (tmp == NULL) if (tmp == NULL)
addmeta = 1; addmeta = 1;
} }
if ((cur->type == XML_ELEMENT_NODE) && (cur->children == NULL)) { if ((cur->type == XML_ELEMENT_NODE) && (cur->children == NULL)) {
if (((cur->ns == NULL) || (cur->ns->prefix == NULL)) && if (((cur->ns == NULL) || (cur->ns->prefix == NULL)) &&

8
xmlschemas.c
View File

@@ -2842,7 +2842,7 @@ xmlSchemaPResCompAttrErr(xmlSchemaParserCtxtPtr ctxt,
xmlSchemaFormatItemForReport(&des, NULL, ownerItem, ownerElem); xmlSchemaFormatItemForReport(&des, NULL, ownerItem, ownerElem);
if (refTypeStr == NULL) if (refTypeStr == NULL)
refTypeStr = (const char *) xmlSchemaItemTypeToStr(refType); refTypeStr = (const char *) xmlSchemaItemTypeToStr(refType);
xmlSchemaPErrExt(ctxt, ownerElem, error, xmlSchemaPErrExt(ctxt, ownerElem, error,
NULL, NULL, NULL, NULL, NULL, NULL,
"%s, attribute '%s': The QName value '%s' does not resolve to a(n) " "%s, attribute '%s': The QName value '%s' does not resolve to a(n) "
"%s.\n", BAD_CAST des, BAD_CAST name, "%s.\n", BAD_CAST des, BAD_CAST name,
@@ -7391,8 +7391,8 @@ attr_next:
*/ */
if (defValue != NULL) if (defValue != NULL)
use->defValue = defValue; use->defValue = defValue;
if (defValueType == WXS_ATTR_DEF_VAL_FIXED) if (defValueType == WXS_ATTR_DEF_VAL_FIXED)
use->flags |= XML_SCHEMA_ATTR_USE_FIXED; use->flags |= XML_SCHEMA_ATTR_USE_FIXED;
} }
check_children: check_children:
@@ -27837,7 +27837,7 @@ xmlSchemaSetValidStructuredErrors(xmlSchemaValidCtxtPtr ctxt,
{ {
if (ctxt == NULL) if (ctxt == NULL)
return; return;
ctxt->serror = serror; ctxt->serror = serror;
ctxt->error = NULL; ctxt->error = NULL;
ctxt->warning = NULL; ctxt->warning = NULL;
ctxt->errCtxt = ctx; ctxt->errCtxt = ctx;