blob: 5cc28b2b84a3255889367a4d6896986534750454 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From: Scott Graham <scottmg@chromium.org>
Date: Tue, 30 Jun 2015 10:47:16 +0800
Subject: Fix a self assignment issue raised by clang
For https://bugzilla.gnome.org/show_bug.cgi?id=751679
Also added a few newline cleanups
---
xmlschemas.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/xmlschemas.c b/xmlschemas.c
index 0657b66..d47512f 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;
|
