Refactor: controller: Use register_fsa_error() in more places

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

daemons/controld/controld_fsa.c

@@ -496,7 +496,7 @@ s_crmd_fsa_actions(fsa_data_t * fsa_data)
             crm_err("Action %s not supported " QB_XS " %" PRIx64,
                     fsa_action2string(controld_globals.fsa_actions),
                     controld_globals.fsa_actions);
-            register_fsa_error_adv(I_ERROR, fsa_data, NULL, __func__);
+            register_fsa_error(I_ERROR, fsa_data);
         }
     }
 }

daemons/controld/controld_join_dc.c

@@ -695,7 +695,7 @@ finalize_sync_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, voi
         }
 
         /* restart the whole join process */
-        register_fsa_error_adv(I_ELECTION_DC, NULL, NULL, __func__);
+        register_fsa_error(I_ELECTION_DC, NULL);
 
     } else if (!AM_I_DC) {
         crm_debug("Sync'ed CIB for join-%d but no longer DC", current_join_id);

daemons/controld/controld_schedulerd.c

@@ -45,7 +45,7 @@ save_cib_contents(xmlNode *msg, int call_id, int rc, xmlNode *output,
 {
     const char *id = user_data;
 
-    register_fsa_error_adv(I_ERROR, NULL, NULL, __func__);
+    register_fsa_error(I_ERROR, NULL);
     CRM_CHECK(id != NULL, return);
 
     if (rc == pcmk_ok) {
@@ -465,7 +465,7 @@ do_pe_invoke_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
     if (rc != pcmk_ok) {
         crm_err("Could not retrieve the Cluster Information Base: %s "
                 QB_XS " rc=%d call=%d", pcmk_strerror(rc), rc, call_id);
-        register_fsa_error_adv(I_ERROR, NULL, NULL, __func__);
+        register_fsa_error(I_ERROR, NULL);
         return;
 
     } else if (call_id != fsa_pe_query) {
@@ -517,7 +517,7 @@ do_pe_invoke_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
         free(ref);
         crm_err("Could not contact the scheduler: %s " QB_XS " rc=%d",
                 pcmk_rc_str(rc), rc);
-        register_fsa_error_adv(I_ERROR, NULL, NULL, __func__);
+        register_fsa_error(I_ERROR, NULL);
     } else {
         pcmk__assert(ref != NULL);
         controld_expect_sched_reply(ref);

daemons/controld/controld_timers.c

@@ -220,7 +220,7 @@ crm_timer_popped(gpointer data)
                  crmd_join_phase_count(controld_join_integrated));
         if (crmd_join_phase_count(controld_join_welcomed) == 0) {
             // If we don't even have ourselves, start again
-            register_fsa_error_adv(I_ELECTION, NULL, NULL, __func__);
+            register_fsa_error(I_ELECTION, NULL);
 
         } else {
             controld_fsa_prepend(C_TIMER_POPPED, timer->fsa_input, NULL);