aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Graham <scottmg@chromium.org>2015-06-30 10:47:16 +0800
committerDaniel Veillard <veillard@redhat.com>2015-06-30 10:47:16 +0800
commit58b84e1f822d9323b4bbadeb07ee147cccc96e7e (patch)
treef798b428958acf7584897bed5a371cb1e3ed890c
parent709a952110e98621c9b78c4f26462a9d8333102e (diff)
downloadandroid_external_libxml2-58b84e1f822d9323b4bbadeb07ee147cccc96e7e.tar.gz
android_external_libxml2-58b84e1f822d9323b4bbadeb07ee147cccc96e7e.tar.bz2
android_external_libxml2-58b84e1f822d9323b4bbadeb07ee147cccc96e7e.zip
Fix a self assignment issue raised by clang
For https://bugzilla.gnome.org/show_bug.cgi?id=751679 Also added a few newline cleanups
-rw-r--r--xmlschemas.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmlschemas.c b/xmlschemas.c
index 0657b66a..d47512f0 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -24186,6 +24186,7 @@ xmlSchemaValidateFacets(xmlSchemaAbstractCtxtPtr actxt,
else
goto pattern_and_enum;
}
+
/*
* Whitespace handling is only of importance for string-based
* types.
@@ -24196,14 +24197,13 @@ xmlSchemaValidateFacets(xmlSchemaAbstractCtxtPtr actxt,
ws = xmlSchemaGetWhiteSpaceFacetValue(type);
} else
ws = XML_SCHEMA_WHITESPACE_COLLAPSE;
+
/*
* If the value was not computed (for string or
* anySimpleType based types), then use the provided
* type.
*/
- if (val == NULL)
- valType = valType;
- else
+ if (val != NULL)
valType = xmlSchemaGetValType(val);
ret = 0;