| author | pavel heimlich<Pavel.Heimlich@Oracle.COM> |
| Fri, 09 Nov 2012 03:55:37 -0800 | |
| branch | s11-update |
| changeset 2421 | b8903076d1c2 |
| parent 284 | ca417a821aee |
| permissions | -rw-r--r-- |
|
148
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
1 |
--- libxml2-2.7.6/relaxng.c.proto-mismatch Thu Oct 8 00:39:20 2009 |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
2 |
+++ libxml2-2.7.6/relaxng.c Thu Oct 8 00:41:57 2009 |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
3 |
@@ -5369,7 +5369,7 @@ |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
4 |
} else {
|
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
5 |
xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
6 |
"expecting name, anyName, nsName or choice : got %s\n", |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
7 |
- (node == NULL ? "nothing" : node->name), NULL); |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
8 |
+ (node == NULL ? (const unsigned char *)"nothing" : node->name), NULL); |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
9 |
return (NULL); |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
10 |
} |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
11 |
if (ret != def) {
|