Added JIM_NOTUSED macro. Macro used where appropriate.

5 files changed, 61 insertions, 35 deletions

diff --git a/jim-posix.c b/jim-posix.c
index 3d62586..0310159 100644
--- a/jim-posix.c
+++ b/jim-posix.c
@@ -16,8 +16,8 @@ static void Jim_PosixSetError(Jim_Interp *interp)
 static int Jim_PosixForkCommand(Jim_Interp *interp, int argc, 
         Jim_Obj *const *argv)
 {
+    JIM_NOTUSED(argv);
     pid_t pid;
-    argv = argv; /* not used */
     
     if (argc != 1) {
         Jim_WrongNumArgs(interp, 1, argv, "");
diff --git a/jim-win32.c b/jim-win32.c
index 5049e3b..b12ee5a 100644
--- a/jim-win32.c
+++ b/jim-win32.c
@@ -143,6 +143,9 @@ Win32_CloseWindow(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
 static int
 Win32_GetActiveWindow(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
 {
+    JIM_NOTUSED(objc);
+    JIM_NOTUSED(objv);
+
     Jim_SetResult(interp, Jim_NewIntObj(interp, (DWORD)GetActiveWindow()));
     return JIM_OK;
 }
@@ -299,6 +302,9 @@ Win32_GetModuleFileName(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
 static int
 Win32_GetVersion(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
 {
+    JIM_NOTUSED(objc);
+    JIM_NOTUSED(objv);
+
     Jim_SetResult(interp, Jim_NewIntObj(interp, GetVersion()));
     return JIM_OK;
 }
@@ -306,6 +312,9 @@ Win32_GetVersion(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
 static int
 Win32_GetTickCount(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
 {
+    JIM_NOTUSED(objc);
+    JIM_NOTUSED(objv);
+
     Jim_SetResult(interp, Jim_NewIntObj(interp, GetTickCount()));
     return JIM_OK;
 }
@@ -313,6 +322,9 @@ Win32_GetTickCount(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
 static int
 Win32_GetSystemTime(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
 {
+    JIM_NOTUSED(objc);
+    JIM_NOTUSED(objv);
+
     Jim_Obj *a[16];
     size_t n = 0;
     SYSTEMTIME t;
diff --git a/jim-win32com.c b/jim-win32com.c
index 6b97aaa..34ff17a 100644
--- a/jim-win32com.c
+++ b/jim-win32com.c
@@ -147,9 +147,11 @@ OLE2A(LPCOLESTR wsz)
 void 
 UnicodeFreeInternalRep(Jim_Interp *interp, Jim_Obj *objPtr)
 {
-	JIM_TRACE("UnicodeFreeInternalRep 0x%08x\n", (DWORD)objPtr);
-	Jim_Free(objPtr->internalRep.binaryValue.data);
-	objPtr->internalRep.binaryValue.data = NULL;
+    JIM_NOTUSED(interp);
+
+    JIM_TRACE("UnicodeFreeInternalRep 0x%08x\n", (DWORD)objPtr);
+    Jim_Free(objPtr->internalRep.binaryValue.data);
+    objPtr->internalRep.binaryValue.data = NULL;
     objPtr->internalRep.binaryValue.len = 0;
 	objPtr->typePtr = NULL;
 }
@@ -247,6 +249,8 @@ Jim_ObjType ole32ObjType = {
 void 
 Ole32FreeInternalRep(Jim_Interp *interp, Jim_Obj *objPtr)
 {
+    JIM_NOTUSED(interp);
+
     IDispatch *p = Ole32_DispatchPtr(objPtr);
     ITypeInfo *t = Ole32_TypeInfoPtr(objPtr);
     JIM_TRACE("free ole32 object 0x%08x\n", (unsigned long)p);
@@ -259,6 +263,8 @@ Ole32FreeInternalRep(Jim_Interp *interp, Jim_Obj *objPtr)
 void 
 Ole32DupInternalRep(Jim_Interp *interp, Jim_Obj *srcPtr, Jim_Obj *dupPtr)
 {
+    JIM_NOTUSED(interp);
+
     IDispatch *p = Ole32_DispatchPtr(srcPtr);
     JIM_TRACE("dup ole32 object 0x%08x from 0x%08x to 0x%08x\n", p, srcPtr, dupPtr);
     Ole32_DispatchPtr(dupPtr) = p;
@@ -326,21 +332,24 @@ static int
 Jim_GetIndexFromObj(Jim_Interp *interp, Jim_Obj *objPtr, const char **tablePtr,
 					const char *msg, int flags, int *indexPtr)
 {
-	const char **entryPtr = NULL;
-	const char *p1, *p2;
-	const char *key = Jim_GetString(objPtr, NULL);
-	int i;
-	*indexPtr = -1;
-	for (entryPtr = tablePtr, i = 0; *entryPtr != NULL; entryPtr++, i++) {
-		for (p1 = key, p2 = *entryPtr; *p1 == *p2; p1++, p2++) {
-			if (*p1 == '\0') {
-				*indexPtr = i;
-				return JIM_OK;
-			}
-		}
-	}
-	Jim_SetResultString(interp, "needs a better message", -1);
-	return JIM_ERR;
+    JIM_NOTUSED(msg);
+    JIM_NOTUSED(flags);
+
+    const char **entryPtr = NULL;
+    const char *p1, *p2;
+    const char *key = Jim_GetString(objPtr, NULL);
+    int i;
+    *indexPtr = -1;
+    for (entryPtr = tablePtr, i = 0; *entryPtr != NULL; entryPtr++, i++) {
+        for (p1 = key, p2 = *entryPtr; *p1 == *p2; p1++, p2++) {
+            if (*p1 == '\0') {
+                    *indexPtr = i;
+                    return JIM_OK;
+            }
+        }
+    }
+    Jim_SetResultString(interp, "needs a better message", -1);
+    return JIM_ERR;
 }
 
 /* $object method|prop ?args...? */
diff --git a/jim.c b/jim.c
index c599b7c..23bd5d7 100644
--- a/jim.c
+++ b/jim.c
@@ -845,9 +845,9 @@ static unsigned int JimStringCopyHTHashFunction(const void *key)
 
 static const void *JimStringCopyHTKeyDup(void *privdata, const void *key)
 {
+    JIM_NOTUSED(privdata);
     int len = strlen(key);
     char *copy = Jim_Alloc(len+1);
-    privdata = privdata; /* not used */
 
     memcpy(copy, key, len);
     copy[len] = '\0';
@@ -857,14 +857,14 @@ static const void *JimStringCopyHTKeyDup(void *privdata, const void *key)
 static int JimStringCopyHTKeyCompare(void *privdata, const void *key1,
         const void *key2)
 {
-    privdata = privdata; /* not used */
+    JIM_NOTUSED(privdata);
 
     return strcmp(key1, key2) == 0;
 }
 
 static void JimStringCopyHTKeyDestructor(void *privdata, const void *key)
 {
-    privdata = privdata; /* not used */
+    JIM_NOTUSED(privdata);
 
     Jim_Free((void*)key); /* ATTENTION: const cast */
 }
@@ -1782,7 +1782,8 @@ static Jim_ObjType stringObjType = {
 
 void DupStringInternalRep(Jim_Interp *interp, Jim_Obj *srcPtr, Jim_Obj *dupPtr)
 {
-    interp = interp; /* unused */
+    JIM_NOTUSED(interp);
+
     /* This is a bit subtle: the only caller of this function
      * should be Jim_DuplicateObj(), that will copy the
      * string representaion. After the copy, the duplicated
@@ -2241,8 +2242,8 @@ void FreeScriptInternalRep(Jim_Interp *interp, Jim_Obj *objPtr)
 
 void DupScriptInternalRep(Jim_Interp *interp, Jim_Obj *srcPtr, Jim_Obj *dupPtr)
 {
-    interp = interp;
-    srcPtr = srcPtr;
+    JIM_NOTUSED(interp);
+    JIM_NOTUSED(srcPtr);
 
     /* Just returns an simple string. */
     dupPtr->typePtr = NULL;
@@ -3137,7 +3138,7 @@ void FreeDictSubstInternalRep(Jim_Interp *interp, Jim_Obj *objPtr)
 void DupDictSubstInternalRep(Jim_Interp *interp, Jim_Obj *srcPtr,
         Jim_Obj *dupPtr)
 {
-    interp = interp; /* unused */
+    JIM_NOTUSED(interp);
 
     dupPtr->internalRep.dictSubstValue.varNameObjPtr =
         srcPtr->internalRep.dictSubstValue.varNameObjPtr;
@@ -3274,8 +3275,8 @@ unsigned int JimReferencesHTDoubleHashFunction(const void *key)
 
 const void *JimReferencesHTKeyDup(void *privdata, const void *key)
 {
+    JIM_NOTUSED(privdata);
     void *copy = Jim_Alloc(sizeof(jim_wide));
-    privdata = privdata; /* not used */
 
     memcpy(copy, key, sizeof(jim_wide));
     return copy;
@@ -3284,14 +3285,14 @@ const void *JimReferencesHTKeyDup(void *privdata, const void *key)
 int JimReferencesHTKeyCompare(void *privdata, const void *key1, 
         const void *key2)
 {
-    privdata = privdata; /* not used */
+    JIM_NOTUSED(privdata);
 
     return memcmp(key1, key2, sizeof(jim_wide)) == 0;
 }
 
 void JimReferencesHTKeyDestructor(void *privdata, const void *key)
 {
-    privdata = privdata; /* not used */
+    JIM_NOTUSED(privdata);
 
     Jim_Free((void*)key);
 }
@@ -4089,8 +4090,8 @@ void FreeListInternalRep(Jim_Interp *interp, Jim_Obj *objPtr)
 
 void DupListInternalRep(Jim_Interp *interp, Jim_Obj *srcPtr, Jim_Obj *dupPtr)
 {
+    JIM_NOTUSED(interp);
     int i;
-    interp = interp; /* unused */
 
     dupPtr->internalRep.listValue.len = srcPtr->internalRep.listValue.len;
     dupPtr->internalRep.listValue.maxLen =
@@ -4590,7 +4591,7 @@ unsigned int JimObjectHTHashFunction(const void *key)
 
 int JimObjectHTKeyCompare(void *privdata, const void *key1, const void *key2)
 {
-    privdata = privdata; /* not used */
+    JIM_NOTUSED(privdata);
 
     return Jim_StringEqObj((Jim_Obj*)key1, (Jim_Obj*)key2, 0);
 }
@@ -4626,7 +4627,7 @@ static Jim_ObjType dictObjType = {
 
 void FreeDictInternalRep(Jim_Interp *interp, Jim_Obj *objPtr)
 {
-    interp = interp; /* not used */
+    JIM_NOTUSED(interp);
 
     Jim_FreeHashTable(objPtr->internalRep.ptr);
     Jim_Free(objPtr->internalRep.ptr);
@@ -5412,8 +5413,8 @@ void FreeExprInternalRep(Jim_Interp *interp, Jim_Obj *objPtr)
 
 void DupExprInternalRep(Jim_Interp *interp, Jim_Obj *srcPtr, Jim_Obj *dupPtr)
 {
-    interp = interp;
-    srcPtr = srcPtr;
+    JIM_NOTUSED(interp);
+    JIM_NOTUSED(srcPtr);
 
     /* Just returns an simple string. */
     dupPtr->typePtr = NULL;
@@ -6073,7 +6074,8 @@ int Jim_GetBoolFromExpr(Jim_Interp *interp, Jim_Obj *exprObjPtr, int *boolPtr)
 #define RTLD_LAZY 0
 void * dlopen(const char *path, int mode) 
 {
-    mode = mode; /* not used */
+    JIM_NOTUSED(mode);
+
     return (void *)LoadLibraryA(path);
 }
 int dlclose(void *handle)
diff --git a/jim.h b/jim.h
index dde4bd8..8c9aabb 100644
--- a/jim.h
+++ b/jim.h
@@ -121,6 +121,9 @@
 #define JIM_SUBST_NOCMD 2 /* don't perform command substitutions */
 #define JIM_SUBST_NOESC 4 /* don't perform escapes substitutions */
 
+/* Unused arguments generate annoying warnings... */
+#define JIM_NOTUSED(V) ((void) V)
+
 /* -----------------------------------------------------------------------------
  * Hash table
  * ---------------------------------------------------------------------------*/