Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/libxml2/patches/07.proto-mismatch.patch
author Tomas Kuthan <tomas.kuthan@oracle.com>
Mon, 11 Jun 2012 22:35:26 -0700
changeset 866 c6e2467e422e
parent 284 ca417a821aee
permissions -rw-r--r--
7155371 "ldm init-system" on s11u1 hits libcrypto.so.1.0.0`pk11_get_session SEGV in mutex_lock_impl 6980830 Memory leaked when calling ENGINE_load_private_key()
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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) {
upstream/oracle/userland-gate