From 7fb37e4d9347c9d86b7893052603a946ab2d9e4a Mon Sep 17 00:00:00 2001
From: Ananda Ravuri <33236856+anandaravuri@users.noreply.github.com>
Date: Mon, 28 Jan 2019 14:58:13 -0800
Subject: [PATCH] xfpga: fix static code scanner issues for metrics (#1122)

---
 libopae/plugins/xfpga/metrics/afu_metrics.c   | 5 ++---
 libopae/plugins/xfpga/metrics/metrics.c       | 4 ----
 libopae/plugins/xfpga/metrics/metrics_utils.c | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libopae/plugins/xfpga/metrics/afu_metrics.c b/libopae/plugins/xfpga/metrics/afu_metrics.c
index 9ea8b9e0be07..1109233e785c 100644
--- a/libopae/plugins/xfpga/metrics/afu_metrics.c
+++ b/libopae/plugins/xfpga/metrics/afu_metrics.c
@@ -161,7 +161,6 @@ fpga_result get_afu_metric_value(fpga_handle handle,
 			result = xfpga_fpgaReadMMIO64(handle, 0, _fpga_enum_metric->mmio_offset, &metric_csr.csr);
 
 				fpga_metric->value.ivalue = metric_csr.value;
-				result = FPGA_OK;
 
 		}
 
@@ -204,8 +203,8 @@ fpga_result add_afu_metrics_vector(fpga_metric_vector *vector,
 
 	*metric_id = *metric_id + 1;
 
-	add_metric_vector(vector, *metric_id, qualifier_name, group_name, "",
-		metric_name, "", metric_units, FPGA_METRIC_DATATYPE_INT, FPGA_METRIC_TYPE_AFU, FPGA_HW_MCP, metric_offset);
+	result = add_metric_vector(vector, *metric_id, qualifier_name, group_name, "",
+			metric_name, "", metric_units, FPGA_METRIC_DATATYPE_INT, FPGA_METRIC_TYPE_AFU, FPGA_HW_MCP, metric_offset);
 
 	return result;
 }
diff --git a/libopae/plugins/xfpga/metrics/metrics.c b/libopae/plugins/xfpga/metrics/metrics.c
index 7d9f345586b1..ae2b4f8b7345 100644
--- a/libopae/plugins/xfpga/metrics/metrics.c
+++ b/libopae/plugins/xfpga/metrics/metrics.c
@@ -273,8 +273,6 @@ fpga_result __FPGA_API__ xfpga_fpgaGetMetricsByIndex(fpga_handle handle,
 			result = FPGA_OK;
 		}
 
-	} else {
-		result = FPGA_INVALID_PARAM;
 	}
 
 out_unlock:
@@ -408,8 +406,6 @@ fpga_result __FPGA_API__ xfpga_fpgaGetMetricsByName(fpga_handle handle,
 		} else {
 			result = FPGA_OK;
 		}
-	} else {
-		result = FPGA_INVALID_PARAM;
 	}
 
 out_unlock:
diff --git a/libopae/plugins/xfpga/metrics/metrics_utils.c b/libopae/plugins/xfpga/metrics/metrics_utils.c
index 1d2749aa8fdc..b23a93923a1b 100644
--- a/libopae/plugins/xfpga/metrics/metrics_utils.c
+++ b/libopae/plugins/xfpga/metrics/metrics_utils.c
@@ -1002,7 +1002,7 @@ fpga_result get_bmc_metrics_values(fpga_handle handle,
 		snprintf_s_s(_handle->_bmc_metric_cache_value[x].metric_name, sizeof(_handle->_bmc_metric_cache_value[x].metric_name), "%s", details.name);
 		_handle->_bmc_metric_cache_value[x].fpga_metric.value.dvalue = tmp;
 
-		strcasecmp_s(details.name, sizeof(details.name), _fpga_enum_metric->metric_name, &metric_indicator);
+		strcasecmp_s(details.name, strnlen_s(details.name, SYSFS_PATH_MAX), _fpga_enum_metric->metric_name, &metric_indicator);
 		if (metric_indicator == 0) {
 			fpga_metric->value.dvalue = tmp;
 		}