pass: Fix coverity and svace reported issue

Change-Id: Ic36b58d4cf04023d733360f30cb186bd3a57ce2e
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/src/pass/pass-parser.c b/src/pass/pass-parser.c
index 856270d42c31d9afa4a8973a7360a3a2c891ffea..28287432acd23bb69567201897653799384e47c3 100644 (file)
--- a/src/pass/pass-parser.c
+++ b/src/pass/pass-parser.c
@@ -420,15 +420,19 @@ static int parse_core(struct parse_result *result, void *user_data)
                return 0;
 
        if (MATCH(result->name, "pass_support")) {
-               ret = sys_strtol(result->value);
-               if (ret < 0)
-                       return ret;
-               res->config_data.state = ret;
+               int state;
+
+               state = sys_strtol(result->value);
+               if (state < 0)
+                       return state;
+               res->config_data.state = state;
        } else if (MATCH(result->name, "pass_gov_type")) {
-               ret = sys_strtol(result->value);
-               if (ret < 0)
-                       return ret;
-               res->config_data.gov_type = ret;
+               int gov_type;
+
+               gov_type = sys_strtol(result->value);
+               if (gov_type < 0)
+                       return gov_type;
+               res->config_data.gov_type = gov_type;
        } else if (MATCH(result->name, "pass_num_levels")) {
                unsigned int num_levels;
 

diff --git a/src/pmqos/pmqos-parser.c b/src/pmqos/pmqos-parser.c
index ccb382d05b46c4e5b7fc83e5408972df26b3288a..77972371287be4da94cf41ea1f6bf047f069d0af 100644 (file)
--- a/src/pmqos/pmqos-parser.c
+++ b/src/pmqos/pmqos-parser.c
@@ -94,9 +94,6 @@ static int pmqos_parse_scenario(struct parse_result *result, void *user_data, un
                        int max_timeout_ms;
 
                        max_timeout_ms = sys_strtol(result->value);
-                       if (max_timeout_ms < 0)
-                               return max_timeout_ms;
-
                        if (max_timeout_ms < 0) {
                                _E("failed to get maximum timeout of scenario");
                                return -ERANGE;
@@ -114,7 +111,7 @@ static int pmqos_parse_scenario(struct parse_result *result, void *user_data, un
                return 0;
 
        /* No item to parse */
-       if (index > scenarios->num)
+       if (index >= scenarios->num)
                return 0;
 
        /* Parse 'Scenario' section */

diff --git a/src/thermal/thermal-parser.c b/src/thermal/thermal-parser.c
index df65bb10aadd6b6f615d817e870c6f67765458ec..7dfdaf1e94d7647cb01058bd3660b9e9dd1473e1 100644 (file)
--- a/src/thermal/thermal-parser.c
+++ b/src/thermal/thermal-parser.c
@@ -98,7 +98,7 @@ static int thermal_parse_scenario(struct parse_result *result, void *user_data,
        if (!scenarios->support || !scenarios->num)
                return 0;
 
-       if (index > scenarios->num)
+       if (index >= scenarios->num)
                return 0;
 
        /* Parse 'Scenario' section */