show_help: convert opal_show_[v]help back into a function

Commit a525e70 converted opal_show_[v]help into global function
pointer variables that were re-assigned a few times during the
lifecycle of an application.  This allows calls top
opal_show_[v]help() to emit error messages different ways at different
times -- e.g., before various subsystems were initialized, after they
were initialized, and after they were shutdown.

Long ago, however, the show_help infrastructure was converted to use
PMIx under the covers, and this switcharoo was no longer necessary.
Specifically: show_help always just calls PMIx and PMIx does the Right
Things during at different stages of the process lifecycle.  This
commit changes opal_show_[v]help back to be a regular function -- not
a function pointer.

Signed-off-by: Jeff Squyres <[email protected]>

Author: jsquyres

opal/util/show_help.c

@@ -53,10 +53,6 @@ static bool opal_help_want_aggregate = true;
 /*
  * Local functions
  */
-static int opal_show_vhelp_internal(const char *filename, const char *topic, int want_error_header,
-                                    va_list arglist);
-static int opal_show_help_internal(const char *filename, const char *topic, int want_error_header,
-                                   ...);
 static void opal_show_help_finalize(void);
 
 typedef struct {
@@ -65,9 +61,6 @@ typedef struct {
     char *msg;
 } opal_log_info_t;
 
-opal_show_help_fn_t opal_show_help = opal_show_help_internal;
-opal_show_vhelp_fn_t opal_show_vhelp = opal_show_vhelp_internal;
-
 int opal_show_help_init(void)
 {
     opal_output_stream_t lds;
@@ -269,8 +262,8 @@ char *opal_show_help_string(const char *filename, const char *topic, int want_er
     return output;
 }
 
-static int opal_show_vhelp_internal(const char *filename, const char *topic, int want_error_header,
-                                    va_list arglist)
+int opal_show_vhelp(const char *filename, const char *topic, int want_error_header,
+                    va_list arglist)
 {
     char *output;
 
@@ -285,8 +278,7 @@ static int opal_show_vhelp_internal(const char *filename, const char *topic, int
     return (NULL == output) ? OPAL_ERROR : OPAL_SUCCESS;
 }
 
-static int opal_show_help_internal(const char *filename, const char *topic, int want_error_header,
-                                   ...)
+int opal_show_help(const char *filename, const char *topic, int want_error_header, ...)
 {
     va_list arglist;
     int rc;

opal/util/show_help.h

@@ -128,17 +128,15 @@ OPAL_DECLSPEC int opal_show_help_init(void);
  * promotion to va_start() has undefined behavior (according to clang
  * warnings on MacOS High Sierra).
  */
-typedef int (*opal_show_help_fn_t)(const char *filename, const char *topic, int want_error_header,
-                                   ...);
-OPAL_DECLSPEC extern opal_show_help_fn_t opal_show_help;
+OPAL_DECLSPEC int opal_show_help(const char *filename, const char *topic, int want_error_header,
+                                 ...);
 
 /**
  * This function does the same thing as opal_show_help(), but accepts
  * a va_list form of varargs.
  */
-typedef int (*opal_show_vhelp_fn_t)(const char *filename, const char *topic, int want_error_header,
-                                    va_list ap);
-OPAL_DECLSPEC extern opal_show_vhelp_fn_t opal_show_vhelp;
+OPAL_DECLSPEC int opal_show_vhelp(const char *filename, const char *topic, int want_error_header,
+                                  va_list ap);
 
 /**
  * This function does the same thing as opal_show_help(), but returns