Make init_progfile_dir() take a function pointer [-Wpedantic]

Change-Id: I45f8ea5ee6ccc5a484c60ad6e686aaf30f6b0c98
Reviewed-on: https://code.wireshark.org/review/12557
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

12 files changed, 17 insertions, 13 deletions

diff --git a/capinfos.c b/capinfos.c
index 9180678d5c..5e5c9530dd 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -1440,7 +1440,7 @@ main(int argc, char *argv[])
   init_open_routines();
 
 #ifdef HAVE_PLUGINS
-  if ((init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main))) {
+  if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
     g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
     g_free(init_progfile_dir_error);
   } else {
diff --git a/captype.c b/captype.c
index 697ff8a4a4..13b5673f9c 100644
--- a/captype.c
+++ b/captype.c
@@ -161,7 +161,7 @@ main(int argc, char *argv[])
   init_open_routines();
 
 #ifdef HAVE_PLUGINS
-  if ((init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main))) {
+  if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
     g_warning("captype: init_progfile_dir(): %s", init_progfile_dir_error);
     g_free(init_progfile_dir_error);
   } else {
diff --git a/dftest.c b/dftest.c
index 9af46c16a1..9b4276ecac 100644
--- a/dftest.c
+++ b/dftest.c
@@ -70,7 +70,7 @@ main(int argc, char **argv)
 	/*
 	 * Attempt to get the pathname of the executable file.
 	 */
-	init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main);
+	init_progfile_dir_error = init_progfile_dir(argv[0], main);
 	if (init_progfile_dir_error != NULL) {
 		fprintf(stderr, "dftest: Can't get pathname of dftest program: %s.\n",
 			init_progfile_dir_error);
diff --git a/echld/dispatcher.c b/echld/dispatcher.c
index 53907d182d..36642c194a 100644
--- a/echld/dispatcher.c
+++ b/echld/dispatcher.c
@@ -474,7 +474,7 @@ static void preinit_epan(char* argv0, int (*main)(int, char **)) {
 	int dp_open_errno, dp_read_errno;
 	char* error;
 
-	error = init_progfile_dir(argv0, (void *)main);
+	error = init_progfile_dir(argv0, main);
 
 	comp_info_str = get_compiled_version_info(NULL, epan_get_compiled_version_info);
 
diff --git a/editcap.c b/editcap.c
index c8977e0b1c..fc38be24f6 100644
--- a/editcap.c
+++ b/editcap.c
@@ -985,7 +985,7 @@ main(int argc, char *argv[])
 
 #ifdef HAVE_PLUGINS
     /* Register wiretap plugins */
-    if ((init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main))) {
+    if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
         g_warning("editcap: init_progfile_dir(): %s", init_progfile_dir_error);
         g_free(init_progfile_dir_error);
     } else {
diff --git a/rawshark.c b/rawshark.c
index b757124101..523313c7c5 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -484,7 +484,7 @@ main(int argc, char *argv[])
     /*
      * Attempt to get the pathname of the executable file.
      */
-    init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main);
+    init_progfile_dir_error = init_progfile_dir(argv[0], main);
     if (init_progfile_dir_error != NULL) {
         fprintf(stderr, "rawshark: Can't get pathname of rawshark program: %s.\n",
                 init_progfile_dir_error);
diff --git a/tfshark.c b/tfshark.c
index 015184dec9..fea110c1e5 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -835,7 +835,7 @@ main(int argc, char *argv[])
   /*
    * Attempt to get the pathname of the executable file.
    */
-  init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main);
+  init_progfile_dir_error = init_progfile_dir(argv[0], main);
   if (init_progfile_dir_error != NULL) {
     fprintf(stderr, "tfshark: Can't get pathname of tfshark program: %s.\n",
             init_progfile_dir_error);
diff --git a/tshark.c b/tshark.c
index 67e64ae9f0..10b9ecf8df 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1059,7 +1059,7 @@ main(int argc, char *argv[])
   /*
    * Attempt to get the pathname of the executable file.
    */
-  init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main);
+  init_progfile_dir_error = init_progfile_dir(argv[0], main);
   if (init_progfile_dir_error != NULL) {
     fprintf(stderr, "tshark: Can't get pathname of tshark program: %s.\n",
             init_progfile_dir_error);
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 7a40b467dd..add9afb484 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2266,7 +2266,7 @@ main(int argc, char *argv[])
     /*
      * Attempt to get the pathname of the executable file.
      */
-    init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main);
+    init_progfile_dir_error = init_progfile_dir(argv[0], main);
 
     /* initialize the funnel mini-api */
     initialize_funnel_ops();
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 16cde1c367..dc6db3c681 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -518,7 +518,7 @@ int main(int argc, char *argv[])
      * Attempt to get the pathname of the executable file.
      */
     /* init_progfile_dir_error = */ init_progfile_dir(ws_argv[0],
-        (void *) get_gui_compiled_info);
+        (int (*)(int, char **)) get_gui_compiled_info);
     g_log(NULL, G_LOG_LEVEL_DEBUG, "progfile_dir: %s", get_progfile_dir());
 
 #ifdef _WIN32
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index 787ad6ebb4..e8bdea325a 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -62,6 +62,7 @@
 #include <wsutil/report_err.h>
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
+#include <wsutil/ws_diag_control.h>
 
 #include <wiretap/wtap.h>   /* for WTAP_ERR_SHORT_WRITE */
 
@@ -454,7 +455,7 @@ init_progfile_dir(const char *arg0
 #ifdef _WIN32
     _U_
 #endif
-, void *function_addr
+, int (*function_addr)(int, char **)
 #if defined(_WIN32) || !defined(HAVE_DLADDR)
     _U_
 #endif
@@ -560,8 +561,11 @@ init_progfile_dir(const char *arg0
          * path and obviate the need for us to determine the absolute
          * path.
          */
-        if (dladdr(function_addr, &info))
+DIAG_OFF(pedantic)
+        if (dladdr((void *)function_addr, &info)) {
+DIAG_ON(pedantic)
             execname = info.dli_fname;
+        }
     }
 #endif
     if (execname == NULL) {
diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h
index 03d2877e65..137f0dae63 100644
--- a/wsutil/filesystem.h
+++ b/wsutil/filesystem.h
@@ -40,7 +40,7 @@ extern "C" {
  * and save it for future use.  Returns NULL on success, and a
  * g_mallocated string containing an error on failure.
  */
-WS_DLL_PUBLIC char *init_progfile_dir(const char *arg0, void *function_addr);
+WS_DLL_PUBLIC char *init_progfile_dir(const char *arg0, int (*function_addr)(int, char **));
 
 /*
  * Get the directory in which the program resides.