Fixed a few warning here and there...

5 files changed, 4 insertions, 29 deletions

diff --git a/src/wrapped/wrappedexpat.c b/src/wrapped/wrappedexpat.c
index a848d436..be880b8b 100644
--- a/src/wrapped/wrappedexpat.c
+++ b/src/wrapped/wrappedexpat.c
@@ -186,28 +186,6 @@ static void* find_EndElement_Fct(void* fct)
     printf_log(LOG_NONE, "Warning, no more slot for expat EndElement callback\n");
     return NULL;
 }
-// CharacterData ...
-#define GO(A)   \
-static uintptr_t my_CharacterData_fct_##A = 0;                                    \
-static void my_CharacterData_##A(void* data, void* name, int len)                 \
-{                                                                                 \
-    RunFunctionFmt(my_CharacterData_fct_##A, "ppi", data, name, len);         \
-}
-SUPER()
-#undef GO
-static void* find_CharacterData_Fct(void* fct)
-{
-    if(!fct) return fct;
-    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
-    #define GO(A) if(my_CharacterData_fct_##A == (uintptr_t)fct) return my_CharacterData_##A;
-    SUPER()
-    #undef GO
-    #define GO(A) if(my_CharacterData_fct_##A == 0) {my_CharacterData_fct_##A = (uintptr_t)fct; return my_CharacterData_##A; }
-    SUPER()
-    #undef GO
-    printf_log(LOG_NONE, "Warning, no more slot for expat CharacterData callback\n");
-    return NULL;
-}
 // ProcessingInstruction ...
 #define GO(A)   \
 static uintptr_t my_ProcessingInstruction_fct_##A = 0;                            \
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index 0d2a5d56..1ac2fb98 100644
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -1601,7 +1601,6 @@ void CreateCPUInfoFile(int fd)
     }
     int n = getNCpu();
     // generate fake CPUINFO
-    int gigahertz=(freq>=1000.);
     #define P \
     dummy = write(fd, buff, strlen(buff))
     for (int i=0; i<n; ++i) {
@@ -3449,7 +3448,7 @@ void startTimedExit()
 {
     static int started = 0;
     if(started)
-        exit;
+        return;
     started = 1;
     pthread_t exit_thread;
     pthread_create(&exit_thread, NULL, timed_exit_thread, NULL);
diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c
index c0f653b6..27252850 100644
--- a/src/wrapped/wrappedlibdl.c
+++ b/src/wrapped/wrappedlibdl.c
@@ -356,7 +356,6 @@ void* my_dlsym(x64emu_t* emu, void *handle, void *symbol)
         return NULL;
     }
     if(dl->dllibs[nlib].lib) {
-        int deepbind = GetDeepBind(dl->dllibs[nlib].lib);
         if(my_dlsym_lib(dl->dllibs[nlib].lib, rsymbol, &start, &end, -1, NULL)==0) {
             // not found
             printf_dlsym(LOG_NEVER, "%p\nCall to dlsym(%s, \"%s\") Symbol not found\n", NULL, GetNameLib(dl->dllibs[nlib].lib), rsymbol);
@@ -502,7 +501,6 @@ void* my_dlvsym(x64emu_t* emu, void *handle, void *symbol, const char *vername)
         return NULL;
     }
     if(dl->dllibs[nlib].lib) {
-        int deepbind = GetDeepBind(dl->dllibs[nlib].lib);
         if(my_dlsym_lib(dl->dllibs[nlib].lib, rsymbol, &start, &end, version, vername)==0) {
             // not found
                 printf_dlsym(LOG_NEVER, "%p\nCall to dlvsym(%s, \"%s\", %s) Symbol not found\n", NULL, GetNameLib(dl->dllibs[nlib].lib), rsymbol, vername?vername:"(nil)");
@@ -586,7 +584,7 @@ EXPORT int my__dl_find_object(x64emu_t* emu, void* addr, my_dl_find_object_t* re
     elfheader_t* h = FindElfAddress(my_context, (uintptr_t)addr);
     if(h) {
         // find an actual elf
-        const char* name = FindNearestSymbolName(h, addr, &start, &sz);
+        /*const char* name =*/ FindNearestSymbolName(h, addr, &start, &sz);
         result->dlfo_map_start = (void*)start;
         result->dlfo_map_end = (void*)(start+sz-1);
         result->dlfo_eh_frame = (void*)(h->ehframehdr+h->delta);
diff --git a/src/wrapped/wrappedlibegl.c b/src/wrapped/wrappedlibegl.c
index 256ea1b3..4fc254e2 100644
--- a/src/wrapped/wrappedlibegl.c
+++ b/src/wrapped/wrappedlibegl.c
@@ -28,7 +28,7 @@ EXPORT void* my_eglGetProcAddress(x64emu_t* emu, void* name)
 {
     khint_t k;
     const char* rname = (const char*)name;
-    return getGLProcAddress(emu, (glprocaddress_t)my->eglGetProcAddress, name);
+    return getGLProcAddress(emu, (glprocaddress_t)my->eglGetProcAddress, rname);
 }
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibssl.c b/src/wrapped/wrappedlibssl.c
index 6860531f..fc219166 100644
--- a/src/wrapped/wrappedlibssl.c
+++ b/src/wrapped/wrappedlibssl.c
@@ -457,7 +457,7 @@ EXPORT void my_SSL_set_psk_client_callback(x64emu_t* emu, void* ctx, void* cb)
 EXPORT void my_SSL_set_psk_server_callback(x64emu_t* emu, void* ctx, void* cb)
 {
     (void)emu;
-    my->SSL_set_psk_server_callback(ctx, find_client_cb_Fct(cb));
+    my->SSL_set_psk_server_callback(ctx, find_server_cb_Fct(cb));
 }
 
 EXPORT void my_SSL_set_psk_use_session_callback(x64emu_t* emu, void* ctx, void* cb)