Fixed a few warnings

6 files changed, 4 insertions, 14 deletions

diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c
index 6490619d..fa82f2e3 100755
--- a/src/elfs/elfloader.c
+++ b/src/elfs/elfloader.c
@@ -1163,11 +1163,12 @@ void RefreshElfTLS(elfheader_t* h)
         printf_dump(LOG_DEBUG, "Refreshing main TLS block @%p from %p:0x%lx\n", dest, (void*)h->tlsaddr, h->tlsfilesize);
         memcpy(dest, (void*)(h->tlsaddr+h->delta), h->tlsfilesize);
         tlsdatasize_t* ptr;
-        if ((ptr = (tlsdatasize_t*)pthread_getspecific(my_context->tlskey)) != NULL)
+        if ((ptr = (tlsdatasize_t*)pthread_getspecific(my_context->tlskey)) != NULL) {
             // refresh in tlsdata too
             dest = (char*)(ptr->data+h->tlsbase);
             printf_dump(LOG_DEBUG, "Refreshing active TLS block @%p from %p:0x%lx\n", dest, (void*)h->tlsaddr, h->tlssize-h->tlsfilesize);
             memcpy(dest, (void*)(h->tlsaddr+h->delta), h->tlsfilesize);
+        }
     }
 }
 
diff --git a/src/elfs/elfparser.c b/src/elfs/elfparser.c
index d5292564..af506749 100755
--- a/src/elfs/elfparser.c
+++ b/src/elfs/elfparser.c
@@ -380,8 +380,6 @@ const char* GetSymbolVersion(elfheader_t* h, int version)
             Elf64_Vernaux *aux = (Elf64_Vernaux*)((uintptr_t)ver + ver->vn_aux);
             for(int j=0; j<ver->vn_cnt; ++j) {
                 if(aux->vna_other==version) 
-            if(aux->vna_other==version)
-                if(aux->vna_other==version) 
                     return h->DynStr+aux->vna_name;
                 aux = (Elf64_Vernaux*)((uintptr_t)aux + aux->vna_next);
             }
diff --git a/src/emu/x64int3.c b/src/emu/x64int3.c
index fd0d2f3a..7413ebcc 100755
--- a/src/emu/x64int3.c
+++ b/src/emu/x64int3.c
@@ -138,7 +138,7 @@ void x64Int3(x64emu_t* emu)
                     snprintf(buff, 255, "%04d|%p: Calling %s(%d, %ld, %d)", tid, *(void**)(R_RSP), s, (int)R_EDI, (int64_t)R_RSI, (int)R_EDX);
                     perr = 1;
                 } else if (!strcmp(s, "recvmsg")) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p, 0x%x)", tid, *(void**)(R_RSP), s, R_EDI, (void*)R_RSI, R_RDX);
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p, 0x%x)", tid, *(void**)(R_RSP), s, R_EDI, (void*)R_RSI, R_EDX);
                     perr = 1;
                 } else if (strstr(s, "puts")==s) {
                     tmp = (char*)(R_RDI);
diff --git a/src/emu/x87emu_private.c b/src/emu/x87emu_private.c
index 0ab63a6e..f151ee45 100755
--- a/src/emu/x87emu_private.c
+++ b/src/emu/x87emu_private.c
@@ -201,7 +201,7 @@ void D2LD(void* d, void* ld)
 
 double FromLD(void* ld)
 {
-    double ret;
+    double ret = 0.0;
     LD2D(ld, &ret);
     return ret;
 }
diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c
index a0db17da..dbc67d71 100755
--- a/src/wrapped/wrappedgio2.c
+++ b/src/wrapped/wrappedgio2.c
@@ -22,9 +22,6 @@
 const char* gio2Name = "libgio-2.0.so.0";
 #define LIBNAME gio2
 
-static char* libname = NULL;
-
-
 #define ADDED_FUNCTIONS() \
 
 #include "wrappedgio2types.h"
diff --git a/src/wrapped/wrappedsdl1mixer.c b/src/wrapped/wrappedsdl1mixer.c
index 6f1a5ff2..fa4ea1a8 100755
--- a/src/wrapped/wrappedsdl1mixer.c
+++ b/src/wrapped/wrappedsdl1mixer.c
@@ -154,12 +154,6 @@ static void* find_MusicFinished_Fct(void* fct)
 
 #undef SUPER
 
-static void freeSDL1MixerMy(library_t* lib)
-{
-    (void)lib;
-    //sdl1mixer_my_t *my = lib->priv.w.p2;
-}
-
 EXPORT void* my_Mix_LoadMUSType_RW(x64emu_t* emu, void* a, int32_t b, int32_t c)
 {
     SDL1_RWops_t* rw = RWNativeStart(emu, (SDL1_RWops_t*)a);