Add full warnings and improve code.

Author: viferga

plthook_elf.c

@@ -187,7 +187,6 @@
 #endif
 #endif /* __LP64__ */
 
-/* TODO: Add debug info for library listing */
 #ifdef PLTHOOK_DEBUG
 #define DEBUG_MSG(...) fprintf(stderr, __VA_ARGS__)
 #else
@@ -332,14 +331,17 @@ int plthook_open_by_address(plthook_t **plthook_out, void *address)
     return plthook_open_real(plthook_out, &data.lmap);
 #else
     Dl_info info;
-    struct link_map *lmap = NULL;
+    union {
+        struct link_map *lmap;
+        void *ptr;
+    } addr = { NULL };
 
     *plthook_out = NULL;
-    if (dladdr1(address, &info, (void**)&lmap, RTLD_DL_LINKMAP) == 0) {
+    if (dladdr1(address, &info, (void**)(&addr.ptr), RTLD_DL_LINKMAP) == 0) {
         set_errmsg("dladdr error");
         return PLTHOOK_FILE_NOT_FOUND;
     }
-    return plthook_open_real(plthook_out, lmap);
+    return plthook_open_real(plthook_out, addr.lmap);
 #endif
 }
 
@@ -826,6 +828,7 @@ static int check_rel(const plthook_t *plthook, const Elf_Plt_Rel *plt, Elf_Xword
         }
         *name_out = plthook->dynstr + idx;
         *addr_out = (void**)(plthook->plt_addr_base + plt->r_offset);
+        DEBUG_MSG("%s (%p)\n", *name_out, (void *)(*addr_out));
         return 0;
     }
     return -1;

test/Makefile

@@ -5,7 +5,7 @@
 UNAME_S := $(shell uname -s)
 
 CFLAGS_SHARED = -shared -fPIC
-CFLAGS_WARNING = -Wall
+CFLAGS_WARNING = -Wall -Wpedantic -Wextra
 CFLAGS = $(CFLAGS_WARNING) $(EXTRA_CFLAGS) $(OPT_CFLAGS)
 LDFLAGS = $(EXTRA_LDFLAGS) $(OPT_LDFLAGS)
 EXEEXT =

test/testprog.c

@@ -219,24 +219,41 @@ static void hook_function_calls_in_executable(enum open_mode open_mode)
     void *handle;
 
     switch (open_mode) {
-    case OPEN_MODE_DEFAULT:
-        CHK_PH(plthook_open(&plthook, NULL));
-        break;
-    case OPEN_MODE_BY_HANDLE:
+        case OPEN_MODE_DEFAULT:
+        {
+            CHK_PH(plthook_open(&plthook, NULL));
+            break;
+        }
+        case OPEN_MODE_BY_HANDLE:
+        {
 #ifdef WIN32
-        handle = GetModuleHandle(NULL);
+            handle = GetModuleHandle(NULL);
 #else
-        handle = dlopen(NULL, RTLD_LAZY);
+            handle = dlopen(NULL, RTLD_LAZY);
 #endif
-        assert(handle != NULL);
-        CHK_PH(plthook_open_by_handle(&plthook, handle));
-        break;
-    case OPEN_MODE_BY_ADDRESS:
-        CHK_PH(plthook_open_by_address(&plthook, &show_usage));
-        break;
+            assert(handle != NULL);
+            CHK_PH(plthook_open_by_handle(&plthook, handle));
+            break;
+        }
+        case OPEN_MODE_BY_ADDRESS:
+        {
+            union {
+                void (*fp)(const char *);
+                void *ptr;
+            } cast = { &show_usage };
+            CHK_PH(plthook_open_by_address(&plthook, cast.ptr));
+            break;
+        }
     }
     test_plthook_enum(plthook, funcs_called_by_main);
-    CHK_PH(plthook_replace(plthook, "strtod_cdecl", (void*)strtod_cdecl_hook_func, (void**)&strtod_cdecl_old_func));
+
+    {
+        union {
+            double (*fp)(const char *, char**);
+            void *ptr;
+        } cast = { &strtod_cdecl_hook_func };
+        CHK_PH(plthook_replace(plthook, "strtod_cdecl", cast.ptr, (void**)&strtod_cdecl_old_func));
+    }
 #if defined _WIN32 || defined __CYGWIN__
     CHK_PH(plthook_replace(plthook, "strtod_stdcall", (void*)strtod_stdcall_hook_func, (void**)&strtod_stdcall_old_func));
     CHK_PH(plthook_replace(plthook, "strtod_fastcall", (void*)strtod_fastcall_hook_func, (void**)&strtod_fastcall_old_func));
@@ -287,7 +304,13 @@ static void hook_function_calls_in_library(enum open_mode open_mode)
         break;
     }
     test_plthook_enum(plthook, funcs_called_by_libtest);
-    CHK_PH(plthook_replace(plthook, "strtod", (void*)strtod_hook_func, NULL));
+    {
+        union {
+            double (*fp)(const char *, char**);
+            void *ptr;
+        } cast = { &strtod_hook_func };
+        CHK_PH(plthook_replace(plthook, "strtod", cast.ptr, NULL));
+    }
     plthook_close(plthook);
 }