In Solaris, the second argument to dladdr() is just a void *, not a

const void *.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27813 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/capinfos.c b/capinfos.c
index 8d09fcdf9e36493ee41842909b9d44aec1eb4164..777cc0fa562c9975f60acda656396871897a8a4a 100644 (file)
--- a/capinfos.c
+++ b/capinfos.c
@@ -302,8 +302,7 @@ main(int argc, char *argv[])
 #ifdef HAVE_PLUGINS
   /* Register wiretap plugins */
 
-    if ((init_progfile_dir_error = init_progfile_dir(argv[0],
-        (const void *)main))) {
+    if ((init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main))) {
                g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
                g_free(init_progfile_dir_error);
     } else {

diff --git a/dftest.c b/dftest.c
index 7fbadd8bc70316743fd66f9628f527e7a95c8d16..eba59b0ea45eb2d59aaca54f4f712322a8ca184e 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -75,8 +75,7 @@ main(int argc, char **argv)
        /*
         * Attempt to get the pathname of the executable file.
         */
-       init_progfile_dir_error = init_progfile_dir(argv[0],
-           (const void *)main);
+       init_progfile_dir_error = init_progfile_dir(argv[0], (void *)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/editcap.c b/editcap.c
index 9f2fb28d57cbbd80105671fa4662ae82a60f9879..250730c7a89b69bec6813c30da578df5ed7664e6 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -424,8 +424,7 @@ main(int argc, char *argv[])
 
 #ifdef HAVE_PLUGINS
   /* Register wiretap plugins */
-  if ((init_progfile_dir_error = init_progfile_dir(argv[0],
-                                                   (const void *)main))) {
+  if ((init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main))) {
     g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
     g_free(init_progfile_dir_error);
   } else {

diff --git a/epan/filesystem.c b/epan/filesystem.c
index 79312d3a053871c020fda614f33766488295f3ce..dbf5e04f71577d71a88557879bd3999a1d9bcf8c 100644 (file)
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@@ -249,7 +249,7 @@ init_progfile_dir(const char *arg0
 #ifdef _WIN32
        _U_
 #endif
-, const void *main_addr
+, void *main_addr
 #if defined(_WIN32) || !defined(DLADDR_FINDS_EXECUTABLE_PATH)
        _U_
 #endif

diff --git a/epan/filesystem.h b/epan/filesystem.h
index 01c2a60d3ede1fdfa56cd8017844fff8a7b136c0..96adeb74251b5b10ec5d07ad22e3b494da78205b 100644 (file)
--- a/epan/filesystem.h
+++ b/epan/filesystem.h
@@ -36,7 +36,7 @@
  * and save it for future use.  Returns NULL on success, and a
  * g_mallocated string containing an error on failure.
  */
-extern char *init_progfile_dir(const char *arg0, const void *main_addr);
+extern char *init_progfile_dir(const char *arg0, void *main_addr);
 
 /*
  * Get the directory in which the program resides.

diff --git a/gtk/main.c b/gtk/main.c
index 14a96ac8373ff672cb5599cae4025babf5e4c5c3..d763aa87f13a9e50d7b51338a049ca1bf943ba10 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1808,8 +1808,7 @@ main(int argc, char *argv[])
   /*
    * Attempt to get the pathname of the executable file.
    */
-  init_progfile_dir_error = init_progfile_dir(argv[0],
-                                              (const void *)main);
+  init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main);
 
   /* initialize the funnel mini-api */
   initialize_funnel_ops();

diff --git a/rawshark.c b/rawshark.c
index 5b3d07af23464a0c0544054dd99a68d6965d1dc3..f1f31c125e11a71c0432fffcc7e8d0cb73f52565 100644 (file)
--- a/rawshark.c
+++ b/rawshark.c
@@ -460,8 +460,7 @@ main(int argc, char *argv[])
   /*
    * Attempt to get the pathname of the executable file.
    */
-  init_progfile_dir_error = init_progfile_dir(argv[0],
-                                              (const void *)main);
+  init_progfile_dir_error = init_progfile_dir(argv[0], (void *)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/tshark.c b/tshark.c
index 688b0a98362932761885a91f24fbe331bb12315b..bf30086cce733db380c9b51b97a36173094e6482 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -773,8 +773,7 @@ main(int argc, char *argv[])
   /*
    * Attempt to get the pathname of the executable file.
    */
-  init_progfile_dir_error = init_progfile_dir(argv[0],
-                                              (const void *)main);
+  init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main);
   if (init_progfile_dir_error != NULL) {
     fprintf(stderr, "tshark: Can't get pathname of tshark program: %s.\n",
             init_progfile_dir_error);