[csw-devel] SF.net SVN: gar:[7569] csw/mgar/pkg/libxml2/trunk

[bdwalton at users.sourceforge.net]

Revision: 7569
          http://gar.svn.sourceforge.net/gar/?rev=7569&view=rev
Author:   bdwalton
Date:     2009-12-07 03:02:36 +0000 (Mon, 07 Dec 2009)

Log Message:
-----------
libxml2: clean up patch for upstream submission

Modified Paths:
--------------
    csw/mgar/pkg/libxml2/trunk/checksums
    csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch

Modified: csw/mgar/pkg/libxml2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libxml2/trunk/checksums	2009-12-06 17:38:21 UTC (rev 7568)
+++ csw/mgar/pkg/libxml2/trunk/checksums	2009-12-07 03:02:36 UTC (rev 7569)
@@ -1,3 +1,3 @@
-f0a8df3f16e7e44d6252d6f0f1896214  0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch
+238e60413c73cb046ac5ee90dac8c848  0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch
 5e371e0f0921fc7b366c34aded6ae993  ld-symbol-handling-fixup.patch
 7740a8ec23878a2f50120e1faa2730f2  libxml2-2.7.6.tar.gz

Modified: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch	2009-12-06 17:38:21 UTC (rev 7568)
+++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch	2009-12-07 03:02:36 UTC (rev 7569)
@@ -1,4 +1,4 @@
-From 960433c24da65100dcb57ec9ce801d59a86722cb Mon Sep 17 00:00:00 2001
+From e7372dda4881e8421b55b80f556f62ec977bfe0f Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at artsci.utoronto.ca>
 Date: Sat, 5 Dec 2009 13:32:49 -0500
 Subject: [PATCH] relaxng.c: add cast to allow compilation with sun studio 11
@@ -6,34 +6,37 @@
 Sun Studio 11 was failing to compile relaxng.c due to a type mismatch
 when calling xmlRngPErr.  The issue was caused by a type mismatch with
 in the outcomes of a ternary operation ("nothing" vs node->name).
+Cast the string literal to const xmlChar * so that both outcomes are
+of the same type and compatible with the xmlRngPErr function prototype.
 
 Cleanup another warning by casting a string literal to const unsigned
 char *.
 
 Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
 ---
- relaxng.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ relaxng.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/relaxng.c b/relaxng.c
-index 075fc4a..9c6019d 100644
+index 075fc4a..e78fa18 100644
 --- a/relaxng.c
 +++ b/relaxng.c
-@@ -5369,7 +5369,7 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
+@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
      } else {
          xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
                     "expecting name, anyName, nsName or choice : got %s\n",
 -                   (node == NULL ? "nothing" : node->name), NULL);
-+                   (node == NULL ? (const unsigned char *) "nothing" : node->name), NULL);
++                   (node == NULL ? (const xmlChar *) "nothing" : node->name),
++		   NULL);
          return (NULL);
      }
      if (ret != def) {
-@@ -9459,7 +9459,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt,
+@@ -9459,7 +9460,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt,
              ctxt->states = NULL;
              if (found == 0) {
                  if (cur == NULL) {
 -                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
-+		     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname");
++		    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname");
                  } else {
                      VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
                  }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.