Fix a bunch more silly compilation warnings

Author: jduck

hijack/hijack.c

@@ -661,7 +661,7 @@ int main(int argc, char *argv[])
 			exit(1);
 		}
 		if (debug)
-			printf("mprotect: 0x%x\n", mprotectaddr);
+			printf("mprotect: 0x%lx\n", mprotectaddr);
 	}
 
 	void *ldl = dlopen("libdl.so", RTLD_LAZY);
@@ -679,7 +679,7 @@ int main(int argc, char *argv[])
 	//printf("tgt dlopen : %x\n", lkaddr2 + (dlopenaddr - lkaddr));
 	dlopenaddr = lkaddr2 + (dlopenaddr - lkaddr);
 	if (debug)
-		printf("dlopen: 0x%x\n", dlopenaddr);
+		printf("dlopen: 0x%lx\n", dlopenaddr);
 
 	// Attach 
 	if (0 > ptrace(PTRACE_ATTACH, pid, 0, 0)) {
@@ -812,9 +812,9 @@ int main(int argc, char *argv[])
 	sc[19] = dlopenaddr;
 
 	if (debug) {
-		printf("pc=%x lr=%x sp=%x fp=%x\n", regs.ARM_pc, regs.ARM_lr, regs.ARM_sp, regs.ARM_fp);
-		printf("r0=%x r1=%x\n", regs.ARM_r0, regs.ARM_r1);
-		printf("r2=%x r3=%x\n", regs.ARM_r2, regs.ARM_r3);
+		printf("pc=%lx lr=%lx sp=%lx fp=%lx\n", regs.ARM_pc, regs.ARM_lr, regs.ARM_sp, regs.ARM_fp);
+		printf("r0=%lx r1=%lx\n", regs.ARM_r0, regs.ARM_r1);
+		printf("r2=%lx r3=%lx\n", regs.ARM_r2, regs.ARM_r3);
 	}
 
 	// push library name to stack
@@ -845,7 +845,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (debug)
-		printf("executing injection code at 0x%x\n", codeaddr);
+		printf("executing injection code at 0x%lx\n", codeaddr);
 
 	// calc stack pointer
 	regs.ARM_sp = regs.ARM_sp - n*4 - sizeof(sc);

instruments/base/hook.c

@@ -49,10 +49,10 @@ int hook_direct(struct hook_t *h, unsigned int addr, void *hookf)
 	int i;
 
 	log("addr  = %x\n", addr)
-	log("hookf = %x\n", hookf)
+	log("hookf = %lx\n", (unsigned long)hookf)
 
 	if ((addr % 4 == 0 && (unsigned int)hookf % 4 != 0) || (addr % 4 != 0 && (unsigned int)hookf % 4 == 0))
-		log("addr 0x%x and hook 0x%x\n don't match!\n", addr, hookf)
+		log("addr 0x%x and hook 0x%lx\n don't match!\n", addr, (unsigned long)hookf)
 
 	//log("ARM\n")
 	h->thumb = 0;
@@ -81,11 +81,11 @@ int hook(struct hook_t *h, int pid, char *libname, char *funcname, void *hook_ar
 		return 0;
 	}
 
-	log("hooking:   %s = 0x%x ", funcname, addr)
+	log("hooking:   %s = 0x%lx ", funcname, addr)
 	strncpy(h->name, funcname, sizeof(h->name)-1);
 
 	if (addr % 4 == 0) {
-		log("ARM using 0x%x\n", hook_arm)
+		log("ARM using 0x%lx\n", (unsigned long)hook_arm)
 		h->thumb = 0;
 		h->patch = (unsigned int)hook_arm;
 		h->orig = addr;
@@ -99,9 +99,9 @@ int hook(struct hook_t *h, int pid, char *libname, char *funcname, void *hook_ar
 	}
 	else {
 		if ((unsigned long int)hook_thumb % 4 == 0)
-			log("warning hook is not thumb 0x%x\n", hook_thumb)
+			log("warning hook is not thumb 0x%lx\n", (unsigned long)hook_thumb)
 		h->thumb = 1;
-		log("THUMB using 0x%x\n", hook_thumb)
+		log("THUMB using 0x%lx\n", (unsigned long)hook_thumb)
 		h->patch = (unsigned int)hook_thumb;
 		h->orig = addr;	
 		h->jumpt[1] = 0xb4;