Merge pull request #2091 from kgaillot/2.0

Static analysis fixes
ClusterLabs · Jun 15, 2020 · ddc09cd · ddc09cd
2 parents 44045c0 + ac89c66
commit ddc09cd
Show file tree

Hide file tree

Showing 4 changed files with 312 additions and 263 deletions.
diff --git a/cts/cts-cli.in b/cts/cts-cli.in
@@ -66,8 +66,6 @@ CRM_EX_EXISTS=108
 CRM_EX_MULTIPLE=109
 CRM_EX_EXPIRED=110
 CRM_EX_NOT_YET_IN_EFFECT=111
-CRM_EX_INDETERMINATE=112
-CRM_EX_UNSATISFIED=113
 
 function test_assert() {
     target=$1; shift

diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
@@ -2069,7 +2069,7 @@ stonith_api_validate(stonith_t *st, int call_options, const char *rsc_id,
     if (rc != pcmk_rc_ok) {
         crm_warn("Could not replace secret parameters for validation of %s: %s",
                  agent, pcmk_rc_str(rc));
-        rc = pcmk_rc2legacy(rc);
+        // rc is standard return value, don't return it in this function
     }
 #endif