Cleanup for PR

.gitignore

@@ -7,4 +7,4 @@ tags
 *.core
 .cache
 .idea
-.vscode
+.vscode

test/CMakeLists.txt

@@ -13,4 +13,4 @@ add_subdirectory(wrap_main)
 #add_subdirectory(multi_agent_dlopen)
 add_subdirectory(symver)
 add_subdirectory(function_ptr)
-add_subdirectory(dispatcher)
+add_subdirectory(dispatcher)

test/dispatcher/CMakeLists.txt

@@ -5,4 +5,4 @@ add_executable(test_dispatcher main.c)
 target_link_libraries(test_dispatcher gotcha dispatcher)
 gotcha_add_test(dispatcher_test test_dispatcher)
 set_property(TEST dispatcher_test APPEND PROPERTY ENVIRONMENT "GOTCHA_DEBUG=3")
-set_property(TEST dispatcher_test APPEND PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}")
+set_property(TEST dispatcher_test APPEND PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}")

test/dispatcher/libdispatcher.c

@@ -14,15 +14,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #define _GNU_SOURCE
+#include <assert.h>
 #include <dlfcn.h>
-#include <math.h>
 #include <pthread.h>
-#include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 int foo(void);
 int bar(void);
@@ -36,8 +31,11 @@ void dispatch_init(void) {
   fprintf(stderr, "Ed dispatch_init()\n");
 
   impl_lib = dlopen("libimpl.so", RTLD_NOW);
+  assert(impl_lib);
   impl_foo = dlsym(impl_lib, "foo");
+  assert(impl_foo);
   impl_bar = dlsym(impl_lib, "bar");
+  assert(impl_bar);
 
   int ret = impl_bar();
 

test/dispatcher/libimpl.c

@@ -14,13 +14,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #define _GNU_SOURCE
-#include <math.h>
-#include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 int foo(void) {
   fprintf(stderr, "Ei foo()\n");

test/dispatcher/main.c

@@ -14,17 +14,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #define _GNU_SOURCE
-#include <math.h>
-#include <stdbool.h>
-#include <stdint.h>
+#include <gotcha/gotcha.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 int foo(void);
 int bar(void);
-#include <gotcha/gotcha.h>
 
 static gotcha_wrappee_handle_t handle_foo;
 static gotcha_wrappee_handle_t handle_bar;