Merge pull request #10 from rajdakin/warnFixRefactor

Warnings and fixes

4 files changed, 8 insertions, 4 deletions

diff --git a/src/tools/box64stack.c b/src/tools/box64stack.c
index 7c330128..cfc778ae 100755
--- a/src/tools/box64stack.c
+++ b/src/tools/box64stack.c
@@ -20,14 +20,14 @@ int CalcStackSize(box64context_t *context)
     for (int i=0; i<context->elfsize; ++i)
         CalcStack(context->elfs[i], &context->stacksz, &context->stackalign);
 
-//    if (posix_memalign((void**)&context->stack, context->stackalign, context->stacksz)) {
+    //if (posix_memalign((void**)&context->stack, context->stackalign, context->stacksz)) {
     context->stack = mmap(NULL, context->stacksz, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_GROWSDOWN, -1, 0);
     if (context->stack==(void*)-1) {
-        printf_log(LOG_NONE, "Cannot allocate aligned memory (0x%x/0x%x) for stack\n", context->stacksz, context->stackalign);
+        printf_log(LOG_NONE, "Cannot allocate aligned memory (0x%lx/0x%zx) for stack\n", context->stacksz, context->stackalign);
         return 1;
     }
     //memset(context->stack, 0, context->stacksz);
-    printf_log(LOG_DEBUG, "Stack is @%p size=0x%x align=0x%x\n", context->stack, context->stacksz, context->stackalign);
+    printf_log(LOG_DEBUG, "Stack is @%p size=0x%lx align=0x%zx\n", context->stack, context->stacksz, context->stackalign);
 
     return 0;
 }
diff --git a/src/tools/bridge.c b/src/tools/bridge.c
index 3a3e6768..fb349ccf 100755
--- a/src/tools/bridge.c
+++ b/src/tools/bridge.c
@@ -149,6 +149,8 @@ uintptr_t AddCheckBridge(bridge_t* bridge, wrapper_t w, void* fnc, int N, const
 
 uintptr_t AddAutomaticBridge(x64emu_t* emu, bridge_t* bridge, wrapper_t w, void* fnc, int N)
 {
+    (void)emu;
+
     if(!fnc)
         return 0;
     uintptr_t ret = CheckBridged(bridge, fnc);
diff --git a/src/tools/callback.c b/src/tools/callback.c
index 8c46139e..1f7250a6 100755
--- a/src/tools/callback.c
+++ b/src/tools/callback.c
@@ -16,6 +16,8 @@
 EXPORTDYN
 uint64_t RunFunction(box64context_t *context, uintptr_t fnc, int nargs, ...)
 {
+    (void)context;
+
     x64emu_t *emu = thread_get_emu();
 
     if(nargs>6)
diff --git a/src/tools/fileutils.c b/src/tools/fileutils.c
index 870bbd1b..18b8dc4d 100755
--- a/src/tools/fileutils.c
+++ b/src/tools/fileutils.c
@@ -46,7 +46,7 @@ char* ResolveFile(const char* filename, path_collection_t* paths)
     for (int i=0; i<paths->size; ++i) {
         if(paths->paths[i][0]!='/') {
             // not an absolute path...
-            getcwd(p, sizeof(p));
+            if(!getcwd(p, sizeof(p))) return NULL;
             if(p[strlen(p)-1]!='/')
                 strcat(p, "/");
             strcat(p, paths->paths[i]);