Fixed a few warning here and there...

11 files changed, 217 insertions, 249 deletions

diff --git a/src/dynarec/dynablock.c b/src/dynarec/dynablock.c
index c3fa4726..a1792c9c 100644
--- a/src/dynarec/dynablock.c
+++ b/src/dynarec/dynablock.c
@@ -145,15 +145,6 @@ static int IntervalIntersects(uintptr_t start1, uintptr_t end1, uintptr_t start2
     return 1;
 }
 
-static int MarkedDynablock(dynablock_t* db)
-{
-    if(db) {
-        if(getNeedTest((uintptr_t)db->x64_addr))
-            return 1; // already done
-    }
-    return 0;
-}
-
 void MarkRangeDynablock(dynablock_t* db, uintptr_t addr, uintptr_t size)
 {
     // Mark will try to find *any* blocks that intersect the range to mark
diff --git a/src/emu/x64run.c b/src/emu/x64run.c
index c5d29a1c..6d1ed141 100644
--- a/src/emu/x64run.c
+++ b/src/emu/x64run.c
@@ -956,32 +956,32 @@ x64emurun:
             tmp8s = ACCESS_FLAG(F_DF)?-1:+1;
             switch(rep) {
                 case 1:
-                    tmp64u = R_RCX;
-                    while(tmp64u) {
-                        --tmp64u;
+                    if(R_RCX) {
+                        while(R_RCX) {
+                            --R_RCX;
+                            tmp8u  = *(uint8_t*)R_RDI;
+                            tmp8u2 = *(uint8_t*)R_RSI;
+                            R_RDI += tmp8s;
+                            R_RSI += tmp8s;
+                            if(tmp8u==tmp8u2)
+                                break;
+                        }
+                        cmp8(emu, tmp8u2, tmp8u);
+                    }
+                    break;
+                case 2:
+                    if(R_RCX) {
+                        while(R_RCX) {
+                            --R_RCX;
                         tmp8u  = *(uint8_t*)R_RDI;
                         tmp8u2 = *(uint8_t*)R_RSI;
                         R_RDI += tmp8s;
                         R_RSI += tmp8s;
-                        if(tmp8u==tmp8u2)
+                        if(tmp8u!=tmp8u2)
                             break;
+                        }
+                        cmp8(emu, tmp8u2, tmp8u);
                     }
-                    if(R_RCX) cmp8(emu, tmp8u2, tmp8u);
-                    R_RCX = tmp64u;
-                    break;
-                case 2:
-                    tmp64u = R_RCX;
-                    while(tmp64u) {
-                        --tmp64u;
-                    tmp8u  = *(uint8_t*)R_RDI;
-                    tmp8u2 = *(uint8_t*)R_RSI;
-                    R_RDI += tmp8s;
-                    R_RSI += tmp8s;
-                    if(tmp8u!=tmp8u2)
-                        break;
-                    }
-                    if(R_RCX) cmp8(emu, tmp8u2, tmp8u);
-                    R_RCX = tmp64u;
                     break;
                 default:
                     tmp8u  = *(uint8_t*)R_RDI;
@@ -998,58 +998,58 @@ x64emurun:
                 tmp8s = ACCESS_FLAG(F_DF)?-4:+4;
             switch(rep) {
                 case 1:
-                    tmp64u = R_RCX;
-                    if(rex.w) {
-                        while(tmp64u) {
-                            --tmp64u;
-                            tmp64u3 = *(uint64_t*)R_RDI;
-                            tmp64u2 = *(uint64_t*)R_RSI;
-                            R_RDI += tmp8s;
-                            R_RSI += tmp8s;
-                            if(tmp64u3==tmp64u2)
-                                break;
-                        }
-                        if(R_RCX) cmp64(emu, tmp64u2, tmp64u3);
-                    } else {
-                        while(tmp64u) {
-                            --tmp64u;
-                            tmp32u  = *(uint32_t*)R_RDI;
-                            tmp32u2 = *(uint32_t*)R_RSI;
-                            R_RDI += tmp8s;
-                            R_RSI += tmp8s;
-                            if(tmp32u==tmp32u2)
-                                break;
+                    if(R_RCX) {
+                        if(rex.w) {
+                            while(R_RCX) {
+                                --R_RCX;
+                                tmp64u3 = *(uint64_t*)R_RDI;
+                                tmp64u2 = *(uint64_t*)R_RSI;
+                                R_RDI += tmp8s;
+                                R_RSI += tmp8s;
+                                if(tmp64u3==tmp64u2)
+                                    break;
+                            }
+                            cmp64(emu, tmp64u2, tmp64u3);
+                        } else {
+                            while(R_RCX) {
+                                --R_RCX;
+                                tmp32u  = *(uint32_t*)R_RDI;
+                                tmp32u2 = *(uint32_t*)R_RSI;
+                                R_RDI += tmp8s;
+                                R_RSI += tmp8s;
+                                if(tmp32u==tmp32u2)
+                                    break;
+                            }
+                            cmp32(emu, tmp32u2, tmp32u);
                         }
-                        if(R_RCX) cmp32(emu, tmp32u2, tmp32u);
                     }
-                    R_RCX = tmp64u;
                     break;
                 case 2:
-                    tmp64u = R_RCX;
-                    if(rex.w) {
-                        while(tmp64u) {
-                            --tmp64u;
-                            tmp64u3 = *(uint64_t*)R_RDI;
-                            tmp64u2 = *(uint64_t*)R_RSI;
-                            R_RDI += tmp8s;
-                            R_RSI += tmp8s;
-                            if(tmp64u3!=tmp64u2)
-                                break;
-                        }
-                        if(R_RCX) cmp64(emu, tmp64u2, tmp64u3);
-                    } else {
-                        while(tmp64u) {
-                            --tmp64u;
-                            tmp32u  = *(uint32_t*)R_RDI;
-                            tmp32u2 = *(uint32_t*)R_RSI;
-                            R_RDI += tmp8s;
-                            R_RSI += tmp8s;
-                            if(tmp32u!=tmp32u2)
-                                break;
+                    if(R_RCX) {
+                        if(rex.w) {
+                            while(R_RCX) {
+                                --R_RCX;
+                                tmp64u3 = *(uint64_t*)R_RDI;
+                                tmp64u2 = *(uint64_t*)R_RSI;
+                                R_RDI += tmp8s;
+                                R_RSI += tmp8s;
+                                if(tmp64u3!=tmp64u2)
+                                    break;
+                            }
+                            cmp64(emu, tmp64u2, tmp64u3);
+                        } else {
+                            while(R_RCX) {
+                                --R_RCX;
+                                tmp32u  = *(uint32_t*)R_RDI;
+                                tmp32u2 = *(uint32_t*)R_RSI;
+                                R_RDI += tmp8s;
+                                R_RSI += tmp8s;
+                                if(tmp32u!=tmp32u2)
+                                    break;
+                            }
+                            cmp32(emu, tmp32u2, tmp32u);
                         }
-                        if(R_RCX) cmp32(emu, tmp32u2, tmp32u);
                     }
-                    R_RCX = tmp64u;
                     break;
                 default:
                     if(rex.w) {
@@ -1149,28 +1149,28 @@ x64emurun:
             tmp8s = ACCESS_FLAG(F_DF)?-1:+1;
             switch(rep) {
                 case 1:
-                    tmp64u = R_RCX;
-                    while(tmp64u) {
-                        --tmp64u;
-                        tmp8u = *(uint8_t*)R_RDI;
-                        R_RDI += tmp8s;
-                        if(R_AL==tmp8u)
-                            break;
+                    if(R_RCX) {
+                        while(R_RCX) {
+                            --R_RCX;
+                            tmp8u = *(uint8_t*)R_RDI;
+                            R_RDI += tmp8s;
+                            if(R_AL==tmp8u)
+                                break;
+                        }
+                        cmp8(emu, R_AL, tmp8u);
                     }
-                    if(R_RCX) cmp8(emu, R_AL, tmp8u);
-                    R_RCX = tmp64u;
                     break;
                 case 2:
-                    tmp64u = R_RCX;
-                    while(tmp64u) {
-                        --tmp64u;
-                        tmp8u = *(uint8_t*)R_RDI;
-                        R_EDI += tmp8s;
-                        if(R_AL!=tmp8u)
-                            break;
+                    if(R_RCX) {
+                        while(R_RCX) {
+                            --R_RCX;
+                            tmp8u = *(uint8_t*)R_RDI;
+                            R_EDI += tmp8s;
+                            if(R_AL!=tmp8u)
+                                break;
+                        }
+                        if(R_RCX) cmp8(emu, R_AL, tmp8u);
                     }
-                    if(R_RCX) cmp8(emu, R_AL, tmp8u);
-                    R_RCX = tmp64u;
                     break;
                 default:
                     cmp8(emu, R_AL, *(uint8_t*)R_RDI);
@@ -1184,50 +1184,50 @@ x64emurun:
                 tmp8s = ACCESS_FLAG(F_DF)?-4:+4;
             switch(rep) {
                 case 1:
-                    tmp64u = R_RCX;
-                    if(rex.w) {
-                        while(tmp64u) {
-                            --tmp64u;
-                            tmp64u2 = *(uint64_t*)R_RDI;
-                            R_RDI += tmp8s;
-                            if(R_RAX==tmp64u2)
-                                break;
-                        }
-                        if(R_RCX) cmp64(emu, R_RAX, tmp64u2);
-                    } else {
-                        while(tmp64u) {
-                            --tmp64u;
-                            tmp32u = *(uint32_t*)R_RDI;
-                            R_RDI += tmp8s;
-                            if(R_EAX==tmp32u)
-                                break;
+                    if(R_RCX) {
+                        if(rex.w) {
+                            while(R_RCX) {
+                                --R_RCX;
+                                tmp64u2 = *(uint64_t*)R_RDI;
+                                R_RDI += tmp8s;
+                                if(R_RAX==tmp64u2)
+                                    break;
+                            }
+                            cmp64(emu, R_RAX, tmp64u2);
+                        } else {
+                            while(R_RCX) {
+                                --R_RCX;
+                                tmp32u = *(uint32_t*)R_RDI;
+                                R_RDI += tmp8s;
+                                if(R_EAX==tmp32u)
+                                    break;
+                            }
+                            cmp32(emu, R_EAX, tmp32u);
                         }
-                        if(R_RCX) cmp32(emu, R_EAX, tmp32u);
                     }
-                    R_RCX = tmp64u;
                     break;
                 case 2:
-                    tmp64u = R_RCX;
-                    if(rex.w) {
-                        while(tmp64u) {
-                            --tmp64u;
-                            tmp64u2 = *(uint64_t*)R_RDI;
-                            R_RDI += tmp8s;
-                            if(R_RAX!=tmp64u2)
-                                break;
-                        }
-                        if(R_RCX) cmp64(emu, R_RAX, tmp64u2);
-                    } else {
-                        while(tmp64u) {
-                            --tmp64u;
-                            tmp32u = *(uint32_t*)R_RDI;
-                            R_RDI += tmp8s;
-                            if(R_EAX!=tmp32u)
-                                break;
+                    if(R_RCX) {
+                        if(rex.w) {
+                            while(R_RCX) {
+                                --R_RCX;
+                                tmp64u2 = *(uint64_t*)R_RDI;
+                                R_RDI += tmp8s;
+                                if(R_RAX!=tmp64u2)
+                                    break;
+                            }
+                            cmp64(emu, R_RAX, tmp64u2);
+                        } else {
+                            while(R_RCX) {
+                                --R_RCX;
+                                tmp32u = *(uint32_t*)R_RDI;
+                                R_RDI += tmp8s;
+                                if(R_EAX!=tmp32u)
+                                    break;
+                            }
+                            cmp32(emu, R_EAX, tmp32u);
                         }
-                        if(R_RCX) cmp32(emu, R_EAX, tmp32u);
                     }
-                    R_RCX = tmp64u;
                     break;
                 default:
                     if(rex.w)
diff --git a/src/emu/x64run66.c b/src/emu/x64run66.c
index 1b826126..61416cff 100644
--- a/src/emu/x64run66.c
+++ b/src/emu/x64run66.c
@@ -505,58 +505,58 @@ uintptr_t Run66(x64emu_t *emu, rex_t rex, int rep, uintptr_t addr)
             tmp8s = ACCESS_FLAG(F_DF)?-2:+2;

         switch(rep) {

             case 1:

-                tmp64u = R_RCX;

-                if(rex.w) {

-                    while(tmp64u) {

-                        --tmp64u;

-                        tmp64u3 = *(uint64_t*)R_RDI;

-                        tmp64u2 = *(uint64_t*)R_RSI;

-                        R_RDI += tmp8s;

-                        R_RSI += tmp8s;

-                        if(tmp64u3==tmp64u2)

-                            break;

-                    }

-                    if(R_RCX) cmp64(emu, tmp64u2, tmp64u3);

-                } else {

-                    while(tmp64u) {

-                        --tmp64u;

-                        tmp16u  = *(uint16_t*)R_RDI;

-                        tmp16u2 = *(uint16_t*)R_RSI;

-                        R_RDI += tmp8s;

-                        R_RSI += tmp8s;

-                        if(tmp16u==tmp16u2)

-                            break;

+                if(R_RCX) {

+                    if(rex.w) {

+                        while(R_RCX) {

+                            --R_RCX;

+                            tmp64u3 = *(uint64_t*)R_RDI;

+                            tmp64u2 = *(uint64_t*)R_RSI;

+                            R_RDI += tmp8s;

+                            R_RSI += tmp8s;

+                            if(tmp64u3==tmp64u2)

+                                break;

+                        }

+                        cmp64(emu, tmp64u2, tmp64u3);

+                    } else {

+                        while(R_RCX) {

+                            --R_RCX;

+                            tmp16u  = *(uint16_t*)R_RDI;

+                            tmp16u2 = *(uint16_t*)R_RSI;

+                            R_RDI += tmp8s;

+                            R_RSI += tmp8s;

+                            if(tmp16u==tmp16u2)

+                                break;

+                        }

+                        cmp16(emu, tmp16u2, tmp16u);

                     }

-                    if(R_RCX) cmp16(emu, tmp16u2, tmp16u);

                 }

-                R_RCX = tmp64u;

                 break;

             case 2:

-                tmp64u = R_RCX;

-                if(rex.w) {

-                    while(tmp64u) {

-                        --tmp64u;

-                        tmp64u3 = *(uint64_t*)R_RDI;

-                        tmp64u2 = *(uint64_t*)R_RSI;

-                        R_RDI += tmp8s;

-                        R_RSI += tmp8s;

-                        if(tmp64u3!=tmp64u2)

-                            break;

-                    }

-                    if(R_RCX) cmp64(emu, tmp64u2, tmp64u3);

-                } else {

-                    while(tmp64u) {

-                        --tmp64u;

-                        tmp16u  = *(uint16_t*)R_RDI;

-                        tmp16u2 = *(uint16_t*)R_RSI;

-                        R_RDI += tmp8s;

-                        R_RSI += tmp8s;

-                        if(tmp16u!=tmp16u2)

-                            break;

+                if(R_RCX) {

+                    if(rex.w) {

+                        while(R_RCX) {

+                            --R_RCX;

+                            tmp64u3 = *(uint64_t*)R_RDI;

+                            tmp64u2 = *(uint64_t*)R_RSI;

+                            R_RDI += tmp8s;

+                            R_RSI += tmp8s;

+                            if(tmp64u3!=tmp64u2)

+                                break;

+                        }

+                        cmp64(emu, tmp64u2, tmp64u3);

+                    } else {

+                        while(R_RCX) {

+                            --R_RCX;

+                            tmp16u  = *(uint16_t*)R_RDI;

+                            tmp16u2 = *(uint16_t*)R_RSI;

+                            R_RDI += tmp8s;

+                            R_RSI += tmp8s;

+                            if(tmp16u!=tmp16u2)

+                                break;

+                        }

+                        cmp16(emu, tmp16u2, tmp16u);

                     }

-                    if(R_RCX) cmp16(emu, tmp16u2, tmp16u);

                 }

-                R_RCX = tmp64u;

                 break;

             default:

                 if(rex.w) {

@@ -636,50 +636,50 @@ uintptr_t Run66(x64emu_t *emu, rex_t rex, int rep, uintptr_t addr)
             tmp8s = ACCESS_FLAG(F_DF)?-2:+2;

         switch(rep) {

             case 1:

-                tmp64u = R_RCX;

-                if(rex.w) {

-                    while(tmp64u) {

-                        --tmp64u;

-                        tmp64u2 = *(uint64_t*)R_RDI;

-                        R_RDI += tmp8s;

-                        if(R_RAX==tmp64u2)

-                            break;

-                    }

-                    if(R_RCX) cmp64(emu, R_RAX, tmp64u2);

-                } else {

-                    while(tmp64u) {

-                        --tmp64u;

-                        tmp16u = *(uint16_t*)R_RDI;

-                        R_RDI += tmp8s;

-                        if(R_AX==tmp16u)

-                            break;

+                if(R_RCX) {

+                    if(rex.w) {

+                        while(R_RCX) {

+                            --R_RCX;

+                            tmp64u2 = *(uint64_t*)R_RDI;

+                            R_RDI += tmp8s;

+                            if(R_RAX==tmp64u2)

+                                break;

+                        }

+                        cmp64(emu, R_RAX, tmp64u2);

+                    } else {

+                        while(R_RCX) {

+                            --R_RCX;

+                            tmp16u = *(uint16_t*)R_RDI;

+                            R_RDI += tmp8s;

+                            if(R_AX==tmp16u)

+                                break;

+                        }

+                        cmp16(emu, R_AX, tmp16u);

                     }

-                    if(R_RCX) cmp16(emu, R_AX, tmp16u);

                 }

-                R_RCX = tmp64u;

                 break;

             case 2:

-                tmp64u = R_RCX;

-                if(rex.w) {

-                    while(tmp64u) {

-                        --tmp64u;

-                        tmp64u2 = *(uint64_t*)R_RDI;

-                        R_RDI += tmp8s;

-                        if(R_RAX!=tmp64u2)

-                            break;

-                    }

-                    if(R_RCX) cmp64(emu, R_RAX, tmp64u2);

-                } else {

-                    while(tmp64u) {

-                        --tmp64u;

-                        tmp16u = *(uint16_t*)R_RDI;

-                        R_RDI += tmp8s;

-                        if(R_AX!=tmp16u)

-                            break;

+                if(R_RCX) {

+                    if(rex.w) {

+                        while(R_RCX) {

+                            --R_RCX;

+                            tmp64u2 = *(uint64_t*)R_RDI;

+                            R_RDI += tmp8s;

+                            if(R_RAX!=tmp64u2)

+                                break;

+                        }

+                        cmp64(emu, R_RAX, tmp64u2);

+                    } else {

+                        while(R_RCX) {

+                            --R_RCX;

+                            tmp16u = *(uint16_t*)R_RDI;

+                            R_RDI += tmp8s;

+                            if(R_AX!=tmp16u)

+                                break;

+                        }

+                        cmp16(emu, R_AX, tmp16u);

                     }

-                    if(R_RCX) cmp16(emu, R_AX, tmp16u);

                 }

-                R_RCX = tmp64u;

                 break;

             default:

                 if(rex.w)

diff --git a/src/libtools/signals.c b/src/libtools/signals.c
index a15e7d66..94946b9e 100644
--- a/src/libtools/signals.c
+++ b/src/libtools/signals.c
@@ -362,9 +362,10 @@ uint64_t RunFunctionHandler(int* exit, int dynarec, x64_ucontext_t* sigcontext,
     emu->flags.quitonlongjmp = oldquitonlongjmp;
 
     #ifdef DYNAREC
-    if(box64_dynarec_test)
+    if(box64_dynarec_test) {
         emu->test.test = 0;
         emu->test.clean = 0;
+    }
     #endif
 
     if(emu->flags.longjmp) {
diff --git a/src/libtools/threads.c b/src/libtools/threads.c
index 1baf91e9..2829917d 100644
--- a/src/libtools/threads.c
+++ b/src/libtools/threads.c
@@ -139,9 +139,9 @@ static void emuthread_destroy(void* p)
 	emuthread_t *et = (emuthread_t*)p;
 	if(!et)
 		return;
-	void* ptr;
 	// check tlsdata
-	/*if (my_context && (ptr = pthread_getspecific(my_context->tlskey)) != NULL)
+	/*void* ptr;
+	if (my_context && (ptr = pthread_getspecific(my_context->tlskey)) != NULL)
         free_tlsdatasize(ptr);*/
 	// free x64emu
 	if(et) {
@@ -477,6 +477,7 @@ EXPORT int my_pthread_setattr_default_np(x64emu_t* emu, pthread_attr_t* attr)
 	PTHREAD_ATTR_ALIGN(attr);
 	int ret = pthread_setattr_default_np(PTHREAD_ATTR(attr));
 	PTHREAD_ATTR_UNALIGN(attr);
+	return ret;
 }
 #endif	//!ANDROID
 #endif
@@ -658,7 +659,6 @@ static void* findkey_dtorFct(void* fct)
 #undef SUPER
 
 // custom implementation of pthread_once...
-static __thread uintptr_t my_once_callback_fct = 0;
 int EXPORT my_pthread_once(x64emu_t* emu, int* once, void* cb)
 {
 	if(*once)	// quick test first
diff --git a/src/tools/bridge.c b/src/tools/bridge.c
index c1503fac..1c935cd1 100644
--- a/src/tools/bridge.c
+++ b/src/tools/bridge.c
@@ -223,11 +223,12 @@ uintptr_t AddVSyscall(bridge_t* bridge, int num)
 const char* getBridgeName(void* addr)
 {
     onebridge_t* one = (onebridge_t*)(((uintptr_t)addr&~(sizeof(onebridge_t)-1)));   // align to start of bridge
-    if(one->C3==0xC3 && one->S=='S' && one->C=='C')
+    if(one->C3==0xC3 && one->S=='S' && one->C=='C') {
         if(one->w==NULL)
             return "ExitEmulation";
         else
             return one->name;
+    }
     return NULL;
 }
 
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)