diff options
author | Michael Stahl <mst@openoffice.org> | 2012-07-27 17:31:34 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-07-27 17:50:23 +0200 |
commit | 31dbc60506da093ec35911db6dde03b4ce31169b (patch) | |
tree | 2b77ccb4aa64cf7353ef29cc0ea3e8046fee32eb /redland | |
parent | 91d3cbe0801c609ae39087129bd926b1c0d32300 (diff) |
redland: fix some warnings in raptor
Diffstat (limited to 'redland')
-rw-r--r-- | redland/raptor/makefile.mk | 1 | ||||
-rw-r--r-- | redland/raptor/raptor-1.4.18.patch.fixes | 42 |
2 files changed, 43 insertions, 0 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 9d8dcf9f7219..635ac56a916d 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -57,6 +57,7 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.win32 \ + $(TARFILE_NAME).patch.fixes \ $(TARFILE_NAME).patch.rindex \ raptor-aix.patch \ $(TARFILE_NAME).entities.patch diff --git a/redland/raptor/raptor-1.4.18.patch.fixes b/redland/raptor/raptor-1.4.18.patch.fixes new file mode 100644 index 000000000000..7b7c959fe8f2 --- /dev/null +++ b/redland/raptor/raptor-1.4.18.patch.fixes @@ -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; + } + + } |