Refactor: libcrmcommon: New pcmk__mainloop_child_exit_fn_t typedef

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

include/crm/common/mainloop.h

@@ -44,6 +44,10 @@ typedef struct mainloop_child_s mainloop_child_t;
 // NOTE: sbd (as of at least 1.5.2) uses this
 typedef struct mainloop_timer_s mainloop_timer_t;
 
+//! \deprecated This has been for internal use only since its creation.
+typedef void (*pcmk__mainloop_child_exit_fn_t)(mainloop_child_t *p, int core,
+                                               int signo, int exitcode);
+
 void mainloop_cleanup(void);
 
 // NOTE: sbd (as of at least 1.5.2) uses this
@@ -167,20 +171,13 @@ void mainloop_del_fd(mainloop_io_t * client);
  * Create a new tracked process
  * To track a process group, use -pid
  */
-void mainloop_child_add(pid_t pid,
-                        int timeout,
-                        const char *desc,
+void mainloop_child_add(pid_t pid, int timeout, const char *desc,
                         void *userdata,
-                        void (*callback)(mainloop_child_t *p, int core,
-                                         int signo, int exitcode));
+                        pcmk__mainloop_child_exit_fn_t exit_fn);
 
-void mainloop_child_add_with_flags(pid_t pid,
-                        int timeout,
-                        const char *desc,
-                        void *userdata,
-                        enum mainloop_child_flags,
-                        void (*callback)(mainloop_child_t *p, int core,
-                                         int signo, int exitcode));
+void mainloop_child_add_with_flags(pid_t pid, int timeout, const char *desc,
+                                   void *userdata, enum mainloop_child_flags,
+                                   pcmk__mainloop_child_exit_fn_t exit_fn);
 
 void *mainloop_child_userdata(mainloop_child_t * child);
 int mainloop_child_timeout(mainloop_child_t * child);

include/crm/common/mainloop_internal.h

@@ -35,7 +35,7 @@ struct mainloop_child_s {
     enum mainloop_child_flags flags;
 
     /* Called when a process dies */
-    void (*callback)(mainloop_child_t *p, int core, int signo, int exitcode);
+    pcmk__mainloop_child_exit_fn_t exit_fn;
 };
 
 int pcmk__add_mainloop_ipc(crm_ipc_t *ipc, int priority, void *userdata,

lib/common/mainloop.c

@@ -1158,8 +1158,8 @@ child_waitpid(mainloop_child_t *child, int flags)
         callback_needed = false;
     }
 
-    if (callback_needed && child->callback) {
-        child->callback(child, core, signo, exitcode);
+    if (callback_needed && child->exit_fn) {
+        child->exit_fn(child, core, signo, exitcode);
     }
     return callback_needed;
 }
@@ -1251,9 +1251,10 @@ mainloop_child_kill(pid_t pid)
  *       completed process.
  */
 void
-mainloop_child_add_with_flags(pid_t pid, int timeout, const char *desc, void *privatedata, enum mainloop_child_flags flags, 
-                              void (*callback)(mainloop_child_t *p, int core,
-                                               int signo, int exitcode))
+mainloop_child_add_with_flags(pid_t pid, int timeout, const char *desc,
+                              void *privatedata,
+                              enum mainloop_child_flags flags,
+                              pcmk__mainloop_child_exit_fn_t exit_fn)
 {
     static bool need_init = TRUE;
     mainloop_child_t *child = pcmk__assert_alloc(1, sizeof(mainloop_child_t));
@@ -1262,7 +1263,7 @@ mainloop_child_add_with_flags(pid_t pid, int timeout, const char *desc, void *pr
     child->timerid = 0;
     child->timeout = FALSE;
     child->privatedata = privatedata;
-    child->callback = callback;
+    child->exit_fn = exit_fn;
     child->flags = flags;
     child->desc = pcmk__str_copy(desc);
 
@@ -1284,10 +1285,9 @@ mainloop_child_add_with_flags(pid_t pid, int timeout, const char *desc, void *pr
 
 void
 mainloop_child_add(pid_t pid, int timeout, const char *desc, void *privatedata,
-                   void (*callback)(mainloop_child_t *p, int core, int signo,
-                                    int exitcode))
+                   pcmk__mainloop_child_exit_fn_t exit_fn)
 {
-    mainloop_child_add_with_flags(pid, timeout, desc, privatedata, 0, callback);
+    mainloop_child_add_with_flags(pid, timeout, desc, privatedata, 0, exit_fn);
 }
 
 static gboolean