Author: alg
Date: Thu Jul 19 16:04:50 2012
New Revision: 1363408
URL: http://svn.apache.org/viewvc?rev=1363408&view=rev
Log:
redland: fix some warnings in raptor
Patch by: Michael Stahl
Added:
incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.fixes
Modified:
incubator/ooo/trunk/main/redland/raptor/makefile.mk
Modified: incubator/ooo/trunk/main/redland/raptor/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/raptor/makefile.mk?rev=1363408&r1=1363407&r2=1363408&view=diff
==============================================================================
--- incubator/ooo/trunk/main/redland/raptor/makefile.mk (original)
+++ incubator/ooo/trunk/main/redland/raptor/makefile.mk Thu Jul 19 16:04:50 2012
@@ -52,7 +52,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \
-
+ $(TARFILE_NAME).patch.fixes
PATCH_FILES=$(OOO_PATCH_FILES)
Added: incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.fixes
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.fixes?rev=1363408&view=auto
==============================================================================
--- incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.fixes (added)
+++ incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.fixes Thu Jul
19 16:04:50 2012
@@ -0,0 +1,42 @@
+--- misc/raptor-1.4.18/src/raptor_abbrev.c 2008-06-15 09:34:06.000000000
+0200
++++ misc/build/raptor-1.4.18/src/raptor_abbrev.c 2011-05-18
18:58:35.440435467 +0200
+@@ -124,6 +124,7 @@
+ case RAPTOR_IDENTIFIER_TYPE_UNKNOWN:
+ default:
+ RAPTOR_FREE(raptor_abbrev_node, node);
++ node = NULL;
+ }
+
+ }
+--- misc/raptor-1.4.18/src/raptor_parse.c 2008-06-15 09:18:50.000000000
+0200
++++ misc/build/raptor-1.4.18/src/raptor_parse.c 2011-05-18
18:58:32.143702301 +0200
+@@ -1870,7 +1870,7 @@
+ ((char*)buffer)[FIRSTN]=c;
+ }
+
+- if(i > MAX_PARSERS) {
++ if(i >= MAX_PARSERS) {
+ raptor_finish();
+ RAPTOR_FATAL2("Number of parsers greater than static buffer size %d\n",
+ MAX_PARSERS);
+--- misc/raptor-1.4.18/src/raptor_rdfxml.c 2008-06-15 10:12:06.000000000
+0200
++++ misc/build/raptor-1.4.18/src/raptor_rdfxml.c 2011-05-18
18:58:30.031671100 +0200
+@@ -404,7 +404,7 @@
+ static const char *
+
raptor_rdfxml_element_content_type_as_string(raptor_rdfxml_element_content_type
type)
+ {
+- if(type > RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
++ if(type >= RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
+ return "INVALID";
+ return rdf_content_type_info[type].name;
+ }
+--- misc/raptor-1.4.18/src/raptor_serialize_dot.c 2008-06-15
09:34:29.000000000 +0200
++++ misc/build/raptor-1.4.18/src/raptor_serialize_dot.c 2011-05-18
18:58:33.986920218 +0200
+@@ -266,6 +266,7 @@
+ case RAPTOR_IDENTIFIER_TYPE_UNKNOWN:
+ default:
+ RAPTOR_FREE(raptor_dot_serializer_node, node);
++ node = NULL;
+ }
+
+ }
