From 2347d9e73241e4885b671db1210665653ba51551 Mon Sep 17 00:00:00 2001
From: Scott Cyphers <diyessi@users.noreply.github.com>
Date: Fri, 10 Jan 2020 17:15:55 -0800
Subject: [PATCH] Fix klocwork issues (#4162)

---
 src/ngraph/op/util/arithmetic_reduction.cpp        | 2 +-
 src/ngraph/op/util/logical_reduction.cpp           | 2 +-
 src/ngraph/op/util/logical_reduction_keep_dims.cpp | 2 +-
 src/ngraph/pass/constant_folding_one_hot.cpp       | 8 --------
 src/ngraph/runtime/reference/one_hot.hpp           | 3 +--
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/ngraph/op/util/arithmetic_reduction.cpp b/src/ngraph/op/util/arithmetic_reduction.cpp
index cced4b06e28..e0b4a226bad 100644
--- a/src/ngraph/op/util/arithmetic_reduction.cpp
+++ b/src/ngraph/op/util/arithmetic_reduction.cpp
@@ -81,7 +81,7 @@ void op::util::ArithmeticReduction::validate_and_infer_types()
             {
                 axis = normalize_axis(this, axis, size_t(input_rank));
             }
-            catch (const ngraph_error& err)
+            catch (const ngraph_error&)
             {
                 NODE_VALIDATION_CHECK(this,
                                       false,
diff --git a/src/ngraph/op/util/logical_reduction.cpp b/src/ngraph/op/util/logical_reduction.cpp
index 52a25a975a1..80e64879ebb 100644
--- a/src/ngraph/op/util/logical_reduction.cpp
+++ b/src/ngraph/op/util/logical_reduction.cpp
@@ -80,7 +80,7 @@ void op::util::LogicalReduction::validate_and_infer_types()
             {
                 axis = normalize_axis(this, axis, size_t(input_rank));
             }
-            catch (const ngraph_error& err)
+            catch (const ngraph_error&)
             {
                 NODE_VALIDATION_CHECK(this,
                                       false,
diff --git a/src/ngraph/op/util/logical_reduction_keep_dims.cpp b/src/ngraph/op/util/logical_reduction_keep_dims.cpp
index 1996f090f47..bea0cb8239a 100644
--- a/src/ngraph/op/util/logical_reduction_keep_dims.cpp
+++ b/src/ngraph/op/util/logical_reduction_keep_dims.cpp
@@ -54,7 +54,7 @@ void op::util::LogicalReductionKeepDims::validate_and_infer_types()
                 {
                     axis = normalize_axis(this, axis, size_t(input_rank));
                 }
-                catch (const ngraph_error& err)
+                catch (const ngraph_error&)
                 {
                     NODE_VALIDATION_CHECK(this,
                                           false,
diff --git a/src/ngraph/pass/constant_folding_one_hot.cpp b/src/ngraph/pass/constant_folding_one_hot.cpp
index 3a51db3651e..53eb239a95c 100644
--- a/src/ngraph/pass/constant_folding_one_hot.cpp
+++ b/src/ngraph/pass/constant_folding_one_hot.cpp
@@ -64,35 +64,27 @@ shared_ptr<op::Constant> fold_constant_one_hot(const shared_ptr<op::Constant>& i
     case element::Type_t::i8:
         return fold_constant_one_hot_ref<int8_t, OUTPUT_TYPE>(
             indices, on_value, off_value, output_shape, axis);
-        break;
     case element::Type_t::i16:
         return fold_constant_one_hot_ref<int16_t, OUTPUT_TYPE>(
             indices, on_value, off_value, output_shape, axis);
-        break;
     case element::Type_t::i32:
         return fold_constant_one_hot_ref<int32_t, OUTPUT_TYPE>(
             indices, on_value, off_value, output_shape, axis);
-        break;
     case element::Type_t::i64:
         return fold_constant_one_hot_ref<int64_t, OUTPUT_TYPE>(
             indices, on_value, off_value, output_shape, axis);
-        break;
     case element::Type_t::u8:
         return fold_constant_one_hot_ref<uint8_t, OUTPUT_TYPE>(
             indices, on_value, off_value, output_shape, axis);
-        break;
     case element::Type_t::u16:
         return fold_constant_one_hot_ref<uint16_t, OUTPUT_TYPE>(
             indices, on_value, off_value, output_shape, axis);
-        break;
     case element::Type_t::u32:
         return fold_constant_one_hot_ref<uint32_t, OUTPUT_TYPE>(
             indices, on_value, off_value, output_shape, axis);
-        break;
     case element::Type_t::u64:
         return fold_constant_one_hot_ref<uint64_t, OUTPUT_TYPE>(
             indices, on_value, off_value, output_shape, axis);
-        break;
     }
 }
 
diff --git a/src/ngraph/runtime/reference/one_hot.hpp b/src/ngraph/runtime/reference/one_hot.hpp
index 51dbb603f71..99a9d410a96 100644
--- a/src/ngraph/runtime/reference/one_hot.hpp
+++ b/src/ngraph/runtime/reference/one_hot.hpp
@@ -79,8 +79,7 @@ namespace ngraph
             {
                 const T on_value = 1;
                 const T off_value = 0;
-                return one_hot<T, T>(
-                    arg, out, in_shape, out_shape, one_hot_axis, on_value, off_value);
+                one_hot<T, T>(arg, out, in_shape, out_shape, one_hot_axis, on_value, off_value);
             }
         }
     }