diff options
author | David Tardon <dtardon@redhat.com> | 2015-05-26 17:17:03 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2015-05-26 17:29:09 +0200 |
commit | 1378814a8273a0c8f11fef7ca8c42315c33241bb (patch) | |
tree | 085c10820221f063209f915d53e6e2cf4d5d4295 /external | |
parent | 6b72769c1e61b86b579b6dd8b0c221c9e618fe1a (diff) |
fix some problems found by coverity
Change-Id: Icaf543858298da4e6c8bb01c8820fa9755c3b7ae
(cherry picked from commit 06095843f3fbfabff7752f87042fb291185fc501)
Diffstat (limited to 'external')
-rw-r--r-- | external/libetonyek/0001-add-missing-breaks.patch.1 | 36 | ||||
-rw-r--r-- | external/libetonyek/0002-remove-surplus-breaks.patch.1 | 38 | ||||
-rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 2 |
3 files changed, 76 insertions, 0 deletions
diff --git a/external/libetonyek/0001-add-missing-breaks.patch.1 b/external/libetonyek/0001-add-missing-breaks.patch.1 new file mode 100644 index 000000000000..7e1168278705 --- /dev/null +++ b/external/libetonyek/0001-add-missing-breaks.patch.1 @@ -0,0 +1,36 @@ +From 54c63c653deb070c49621bea8acbc18f76118238 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Tue, 26 May 2015 16:56:56 +0200 +Subject: [PATCH 1/2] add missing breaks + +Change-Id: I6a6afd517e61aff89319348de5af3aa97093bd1d +--- + src/lib/KEY2Parser.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp +index bb58efd..4ba70d2 100644 +--- a/src/lib/KEY2Parser.cpp ++++ b/src/lib/KEY2Parser.cpp +@@ -261,8 +261,10 @@ void PointElement::attribute(const int name, const char *const value) + { + case IWORKToken::NS_URI_SFA | IWORKToken::x : + m_point.first = lexical_cast<double>(value); ++ break; + case IWORKToken::NS_URI_SFA | IWORKToken::y : + m_point.second = lexical_cast<double>(value); ++ break; + } + } + +@@ -358,6 +360,7 @@ void PointPathElement::attribute(const int name, const char *const value) + ETONYEK_DEBUG_MSG(("unknown point path type: %s\n", value)); + break; + } ++ break; + } + default : + KEY2XMLElementContextBase::attribute(name, value); +-- +2.4.1 + diff --git a/external/libetonyek/0002-remove-surplus-breaks.patch.1 b/external/libetonyek/0002-remove-surplus-breaks.patch.1 new file mode 100644 index 000000000000..be6b94a9bbd8 --- /dev/null +++ b/external/libetonyek/0002-remove-surplus-breaks.patch.1 @@ -0,0 +1,38 @@ +From 91d39222d9f120211c0189f69299898702a65d3d Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Tue, 26 May 2015 17:01:22 +0200 +Subject: [PATCH 2/2] remove surplus breaks + +Change-Id: Ib98a4a5bcd7d9f9eb03874f0715b45bb141ef12d +--- + src/lib/KEY2Parser.cpp | 1 - + src/lib/contexts/IWORKStylesContext.cpp | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp +index 4ba70d2..9a37dcd 100644 +--- a/src/lib/KEY2Parser.cpp ++++ b/src/lib/KEY2Parser.cpp +@@ -124,7 +124,6 @@ IWORKXMLContextPtr_t StylesContext::element(const int name) + return makeContext<KEY2StyleContext>(getState(), name); + + case IWORKToken::NS_URI_SF | IWORKToken::layoutstyle_ref : +- break; + return makeContext<KEY2StyleRefContext>(getState(), name, false, m_anonymous); + } + +diff --git a/src/lib/contexts/IWORKStylesContext.cpp b/src/lib/contexts/IWORKStylesContext.cpp +index ef3041b..24efa1d 100644 +--- a/src/lib/contexts/IWORKStylesContext.cpp ++++ b/src/lib/contexts/IWORKStylesContext.cpp +@@ -43,7 +43,6 @@ IWORKXMLContextPtr_t IWORKStylesContext::element(const int name) + case IWORKToken::NS_URI_SF | IWORKToken::liststyle_ref : + case IWORKToken::NS_URI_SF | IWORKToken::paragraphstyle_ref : + case IWORKToken::NS_URI_SF | IWORKToken::vector_style_ref : +- break; + return makeContext<IWORKStyleRefContext>(getState(), name, false, m_anonymous); + } + +-- +2.4.1 + diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 834bef2bfa32..24167e51d0a3 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -18,6 +18,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ external/libetonyek/0001-missing-include.patch.1 \ external/libetonyek/win_build.patch.1 \ external/libetonyek/ubsan.patch \ + external/libetonyek/0001-add-missing-breaks.patch.1 \ + external/libetonyek/0002-remove-surplus-breaks.patch.1 \ )) ifeq ($(COM_GCC_IS_CLANG),TRUE) |