diff options
Diffstat (limited to 'generic/tclTest.c')
| -rw-r--r-- | generic/tclTest.c | 810 |
1 files changed, 248 insertions, 562 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index ba0b220..91557dc 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -164,10 +164,8 @@ static void CleanupTestSetassocdataTests( void *clientData, Tcl_Interp *interp); static void CmdDelProc1(void *clientData); static void CmdDelProc2(void *clientData); -static int CmdProc1(void *clientData, - Tcl_Interp *interp, int argc, const char **argv); -static int CmdProc2(void *clientData, - Tcl_Interp *interp, int argc, const char **argv); +static Tcl_CmdProc CmdProc1; +static Tcl_CmdProc CmdProc2; static void CmdTraceDeleteProc( void *clientData, Tcl_Interp *interp, int level, char *command, Tcl_CmdProc *cmdProc, @@ -177,16 +175,11 @@ static void CmdTraceProc(void *clientData, Tcl_Interp *interp, int level, char *command, Tcl_CmdProc *cmdProc, void *cmdClientData, int argc, const char *argv[]); -static int CreatedCommandProc( - void *clientData, Tcl_Interp *interp, - int argc, const char **argv); -static int CreatedCommandProc2( - void *clientData, Tcl_Interp *interp, - int argc, const char **argv); +static Tcl_CmdProc CreatedCommandProc; +static Tcl_CmdProc CreatedCommandProc2; static void DelCallbackProc(void *clientData, Tcl_Interp *interp); -static int DelCmdProc(void *clientData, - Tcl_Interp *interp, int argc, const char **argv); +static Tcl_CmdProc DelCmdProc; static void DelDeleteProc(void *clientData); static void EncodingFreeProc(void *clientData); static int EncodingToUtfProc(void *clientData, @@ -201,15 +194,11 @@ static int EncodingFromUtfProc(void *clientData, int *dstCharsPtr); static void ExitProcEven(void *clientData); static void ExitProcOdd(void *clientData); -static int GetTimesObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_ObjCmdProc GetTimesObjCmd; +static Tcl_ResolveCompiledVarProc InterpCompiledVarResolver; static void MainLoop(void); -static int NoopCmd(void *clientData, - Tcl_Interp *interp, int argc, const char **argv); -static int NoopObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_CmdProc NoopCmd; +static Tcl_ObjCmdProc NoopObjCmd; static int ObjTraceProc(void *clientData, Tcl_Interp *interp, int level, const char *command, Tcl_Command commandToken, int objc, @@ -218,181 +207,83 @@ static void ObjTraceDeleteProc(void *clientData); static void PrintParse(Tcl_Interp *interp, Tcl_Parse *parsePtr); static void SpecialFree(void *blockPtr); static int StaticInitProc(Tcl_Interp *interp); -static int TestasyncCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestbumpinterpepochObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestbytestringObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestpurebytesobjObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TeststringbytesObjCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestcmdinfoCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestcmdtokenCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestcmdtraceCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestconcatobjCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestcreatecommandCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestdcallCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestdelCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestdelassocdataCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestdoubledigitsObjCmd(void *dummy, - Tcl_Interp* interp, int objc, - Tcl_Obj* const objv[]); -static int TestdstringCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestencodingObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestevalexObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestevalobjvObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TesteventObjCmd(void *unused, - Tcl_Interp *interp, int argc, - Tcl_Obj *const objv[]); +static Tcl_CmdProc TestasyncCmd; +static Tcl_ObjCmdProc TestbumpinterpepochObjCmd; +static Tcl_ObjCmdProc TestbytestringObjCmd; +static Tcl_ObjCmdProc TestpurebytesobjObjCmd; +static Tcl_ObjCmdProc TeststringbytesObjCmd; +static Tcl_CmdProc TestcmdinfoCmd; +static Tcl_CmdProc TestcmdtokenCmd; +static Tcl_CmdProc TestcmdtraceCmd; +static Tcl_CmdProc TestconcatobjCmd; +static Tcl_CmdProc TestcreatecommandCmd; +static Tcl_CmdProc TestdcallCmd; +static Tcl_CmdProc TestdelCmd; +static Tcl_CmdProc TestdelassocdataCmd; +static Tcl_ObjCmdProc TestdoubledigitsObjCmd; +static Tcl_CmdProc TestdstringCmd; +static Tcl_ObjCmdProc TestencodingObjCmd; +static Tcl_ObjCmdProc TestevalexObjCmd; +static Tcl_ObjCmdProc TestevalobjvObjCmd; +static Tcl_ObjCmdProc TesteventObjCmd; static int TesteventProc(Tcl_Event *event, int flags); static int TesteventDeleteProc(Tcl_Event *event, void *clientData); -static int TestexithandlerCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestexprlongCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestexprlongobjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestexprdoubleCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestexprdoubleobjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestexprparserObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestexprstringCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestfileCmd(void *dummy, - Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int TestfilelinkCmd(void *dummy, - Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int TestfeventCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestgetassocdataCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestgetintCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestlongsizeCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestgetplatformCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestgetvarfullnameCmd( - void *dummy, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); -static int TestinterpdeleteCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestlinkCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestlinkarrayCmd(void *dummy, Tcl_Interp *interp, - int objc, Tcl_Obj *const *objv); -static int TestlocaleCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestmainthreadCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestsetmainloopCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestexitmainloopCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestpanicCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestparseargsCmd(void *dummy, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); -static int TestparserObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestparsevarObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestparsevarnameObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestpreferstableObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestprintObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestregexpObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestreturnObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_CmdProc TestexithandlerCmd; +static Tcl_CmdProc TestexprlongCmd; +static Tcl_ObjCmdProc TestexprlongobjCmd; +static Tcl_CmdProc TestexprdoubleCmd; +static Tcl_ObjCmdProc TestexprdoubleobjCmd; +static Tcl_ObjCmdProc TestexprparserObjCmd; +static Tcl_CmdProc TestexprstringCmd; +static Tcl_ObjCmdProc TestfileCmd; +static Tcl_ObjCmdProc TestfilelinkCmd; +static Tcl_CmdProc TestfeventCmd; +static Tcl_CmdProc TestgetassocdataCmd; +static Tcl_CmdProc TestgetintCmd; +static Tcl_CmdProc TestlongsizeCmd; +static Tcl_CmdProc TestgetplatformCmd; +static Tcl_ObjCmdProc TestgetvarfullnameCmd; +static Tcl_CmdProc TestinterpdeleteCmd; +static Tcl_CmdProc TestlinkCmd; +static Tcl_ObjCmdProc TestlinkarrayCmd; +static Tcl_ObjCmdProc TestlocaleCmd; +static Tcl_CmdProc TestmainthreadCmd; +static Tcl_CmdProc TestsetmainloopCmd; +static Tcl_CmdProc TestexitmainloopCmd; +static Tcl_CmdProc TestpanicCmd; +static Tcl_ObjCmdProc TestparseargsCmd; +static Tcl_ObjCmdProc TestparserObjCmd; +static Tcl_ObjCmdProc TestparsevarObjCmd; +static Tcl_ObjCmdProc TestparsevarnameObjCmd; +static Tcl_ObjCmdProc TestpreferstableObjCmd; +static Tcl_ObjCmdProc TestprintObjCmd; +static Tcl_ObjCmdProc TestregexpObjCmd; +static Tcl_ObjCmdProc TestreturnObjCmd; static void TestregexpXflags(const char *string, size_t length, int *cflagsPtr, int *eflagsPtr); -static int TestsaveresultCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_ObjCmdProc TestsaveresultCmd; static void TestsaveresultFree(void *blockPtr); -static int TestsetassocdataCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestsetCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int Testset2Cmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestseterrorcodeCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestsetobjerrorcodeCmd( - void *dummy, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); -static int TestsetplatformCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TeststaticpkgCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TesttranslatefilenameCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestupvarCmd(void *dummy, - Tcl_Interp *interp, int argc, const char **argv); -static int TestWrongNumArgsObjCmd( - void *clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); -static int TestGetIndexFromObjStructObjCmd( - void *clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); -static int TestChannelCmd(void *clientData, - Tcl_Interp *interp, int argc, const char **argv); -static int TestChannelEventCmd(void *clientData, - Tcl_Interp *interp, int argc, const char **argv); -static int TestSocketCmd(void *clientData, - Tcl_Interp *interp, int argc, const char **argv); -static int TestFilesystemObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestSimpleFilesystemObjCmd( - void *dummy, Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_CmdProc TestsetassocdataCmd; +static Tcl_CmdProc TestsetCmd; +static Tcl_CmdProc Testset2Cmd; +static Tcl_CmdProc TestseterrorcodeCmd; +static Tcl_ObjCmdProc TestsetobjerrorcodeCmd; +static Tcl_CmdProc TestsetplatformCmd; +static Tcl_CmdProc TeststaticpkgCmd; +static Tcl_CmdProc TesttranslatefilenameCmd; +static Tcl_CmdProc TestupvarCmd; +static Tcl_ObjCmdProc TestWrongNumArgsObjCmd; +static Tcl_ObjCmdProc TestGetIndexFromObjStructObjCmd; +static Tcl_CmdProc TestChannelCmd; +static Tcl_CmdProc TestChannelEventCmd; +static Tcl_CmdProc TestSocketCmd; +static Tcl_ObjCmdProc TestFilesystemObjCmd; +static Tcl_ObjCmdProc TestSimpleFilesystemObjCmd; static void TestReport(const char *cmd, Tcl_Obj *arg1, Tcl_Obj *arg2); -static int TestgetencpathObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestsetencpathObjCmd(void *dummy, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_ObjCmdProc TestgetencpathObjCmd; +static Tcl_ObjCmdProc TestsetencpathObjCmd; static Tcl_Obj * TestReportGetNativePath(Tcl_Obj *pathPtr); static Tcl_FSStatProc TestReportStat; static Tcl_FSAccessProc TestReportAccess; @@ -425,33 +316,17 @@ static Tcl_FSListVolumesProc SimpleListVolumes; static Tcl_FSPathInFilesystemProc SimplePathInFilesystem; static Tcl_Obj * SimpleRedirect(Tcl_Obj *pathPtr); static Tcl_FSMatchInDirectoryProc SimpleMatchInDirectory; -static int TestNumUtfCharsCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestFindFirstCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestFindLastCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestHashSystemHashCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_ObjCmdProc TestNumUtfCharsCmd; +static Tcl_ObjCmdProc TestFindFirstCmd; +static Tcl_ObjCmdProc TestFindLastCmd; +static Tcl_ObjCmdProc TestHashSystemHashCmd; static Tcl_NRPostProc NREUnwind_callback; -static int TestNREUnwind(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestNRELevels(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); -static int TestInterpResolverCmd(void *clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_ObjCmdProc TestNREUnwind; +static Tcl_ObjCmdProc TestNRELevels; +static Tcl_ObjCmdProc TestInterpResolverCmd; #if defined(HAVE_CPUID) || defined(_WIN32) -static int TestcpuidCmd(void *dummy, - Tcl_Interp* interp, int objc, - Tcl_Obj *const objv[]); +static Tcl_ObjCmdProc TestcpuidCmd; #endif static const Tcl_Filesystem testReportingFilesystem = { @@ -843,7 +718,7 @@ Tcltest_SafeInit( /* ARGSUSED */ static int TestasyncCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -851,7 +726,6 @@ TestasyncCmd( TestAsyncHandler *asyncPtr, *prevPtr; int id, code; static int nextId = 1; - (void)dummy; if (argc < 2) { wrongNumArgs: @@ -1055,13 +929,12 @@ AsyncThreadProc( static int TestbumpinterpepochObjCmd( - ClientData dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Interp *iPtr = (Interp *)interp; - (void)dummy; if (objc != 1) { Tcl_WrongNumArgs(interp, 1, objv, ""); @@ -1092,13 +965,12 @@ TestbumpinterpepochObjCmd( /* ARGSUSED */ static int TestcmdinfoCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { Tcl_CmdInfo info; - (void)dummy; if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -1166,12 +1038,9 @@ static int CmdProc1( void *clientData, /* String to return. */ Tcl_Interp *interp, /* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { - (void)argc; - (void)argv; - Tcl_AppendResult(interp, "CmdProc1 ", (char *) clientData, NULL); return TCL_OK; } @@ -1181,12 +1050,9 @@ static int CmdProc2( void *clientData, /* String to return. */ Tcl_Interp *interp, /* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { - (void)argc; - (void)argv; - Tcl_AppendResult(interp, "CmdProc2 ", (char *) clientData, NULL); return TCL_OK; } @@ -1229,7 +1095,7 @@ CmdDelProc2( /* ARGSUSED */ static int TestcmdtokenCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -1237,7 +1103,6 @@ TestcmdtokenCmd( Tcl_Command token; int *l; char buf[30]; - (void)dummy; if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -1294,14 +1159,13 @@ TestcmdtokenCmd( /* ARGSUSED */ static int TestcmdtraceCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { Tcl_DString buffer; int result; - (void)dummy; if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -1387,22 +1251,17 @@ CmdTraceProc( void *clientData, /* Pointer to buffer in which the * command and arguments are appended. * Accumulates test result. */ - Tcl_Interp *interp, /* Current interpreter. */ - int level, /* Current trace level. */ + TCL_UNUSED(Tcl_Interp *), + TCL_UNUSED(int) /*level*/, char *command, /* The command being traced (after * substitutions). */ - Tcl_CmdProc *cmdProc, /* Points to command's command procedure. */ - void *cmdClientData, /* Client data associated with command - * procedure. */ + TCL_UNUSED(Tcl_CmdProc *) /*cmdProc*/, + TCL_UNUSED(ClientData), int argc, /* Number of arguments. */ const char *argv[]) /* Argument strings. */ { Tcl_DString *bufPtr = (Tcl_DString *) clientData; int i; - (void)interp; - (void)level; - (void)cmdProc; - (void)cmdClientData; Tcl_DStringAppendElement(bufPtr, command); @@ -1415,25 +1274,15 @@ CmdTraceProc( static void CmdTraceDeleteProc( - void *dummy, /* Unused. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ - int level, /* Current trace level. */ - char *command, /* The command being traced (after - * substitutions). */ - Tcl_CmdProc *cmdProc, /* Points to command's command procedure. */ - void *cmdClientData, /* Client data associated with command - * procedure. */ - int argc, /* Number of arguments. */ - const char *argv[]) /* Argument strings. */ + TCL_UNUSED(int) /*level*/, + TCL_UNUSED(char *) /*command*/, + TCL_UNUSED(Tcl_CmdProc *), + TCL_UNUSED(ClientData), + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { - (void)dummy; - (void)level; - (void)command; - (void)cmdProc; - (void)cmdClientData; - (void)argc; - (void)argv; - /* * Remove ourselves to test whether calling Tcl_DeleteTrace within a trace * callback causes the for loop in TclNRExecuteByteCode that calls traces to @@ -1445,20 +1294,15 @@ CmdTraceDeleteProc( static int ObjTraceProc( - void *dummy, /* unused */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Tcl interpreter */ - int level, /* Execution level */ - const char *command, /* Command being executed */ - Tcl_Command token, /* Command information */ - int objc, /* Parameter count */ - Tcl_Obj *const objv[]) /* Parameter list */ + TCL_UNUSED(int) /*level*/, + const char *command, + TCL_UNUSED(Tcl_Command), + TCL_UNUSED(int) /*objc*/, + Tcl_Obj *const objv[]) /* Argument objects. */ { const char *word = Tcl_GetString(objv[0]); - (void)dummy; - (void)level; - (void)token; - (void)objc; - (void)objv; if (!strcmp(word, "Error")) { Tcl_SetObjResult(interp, Tcl_NewStringObj(command, -1)); @@ -1507,13 +1351,11 @@ ObjTraceDeleteProc( static int TestcreatecommandCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { - (void)dummy; - if (argc != 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], " option\"", NULL); @@ -1539,16 +1381,13 @@ TestcreatecommandCmd( static int CreatedCommandProc( - void *dummy, /* String to return. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { Tcl_CmdInfo info; int found; - (void)dummy; - (void)argc; - (void)argv; found = Tcl_GetCommandInfo(interp, "test_ns_basic::createdcommand", &info); @@ -1564,16 +1403,13 @@ CreatedCommandProc( static int CreatedCommandProc2( - void *dummy, /* String to return. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { Tcl_CmdInfo info; int found; - (void)dummy; - (void)argc; - (void)argv; found = Tcl_GetCommandInfo(interp, "value:at:", &info); if (!found) { @@ -1606,13 +1442,12 @@ CreatedCommandProc2( /* ARGSUSED */ static int TestdcallCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { int i, id; - (void)dummy; delInterp = Tcl_CreateInterp(); Tcl_DStringInit(&delString); @@ -1672,14 +1507,13 @@ DelCallbackProc( /* ARGSUSED */ static int TestdelCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { DelCmd *dPtr; Tcl_Interp *slave; - (void)dummy; if (argc != 4) { Tcl_AppendResult(interp, "wrong # args", NULL); @@ -1705,12 +1539,10 @@ static int DelCmdProc( void *clientData, /* String result to return. */ Tcl_Interp *interp, /* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { DelCmd *dPtr = (DelCmd *) clientData; - (void)argc; - (void)argv; Tcl_AppendResult(interp, dPtr->deleteCmd, NULL); Tcl_Free(dPtr->deleteCmd); @@ -1750,13 +1582,11 @@ DelDeleteProc( static int TestdelassocdataCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { - (void)dummy; - if (argc != 2) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0], " data_key\"", NULL); @@ -1788,14 +1618,11 @@ TestdelassocdataCmd( */ static int -TestdoubledigitsObjCmd(void *dummy, - /* NULL */ - Tcl_Interp* interp, - /* Tcl interpreter */ - int objc, - /* Parameter count */ - Tcl_Obj* const objv[]) - /* Parameter vector */ +TestdoubledigitsObjCmd( + TCL_UNUSED(ClientData), + Tcl_Interp* interp, /* Tcl interpreter */ + int objc, /* Parameter count */ + Tcl_Obj* const objv[]) /* Parameter vector */ { static const char* options[] = { "shortest", @@ -1820,7 +1647,6 @@ TestdoubledigitsObjCmd(void *dummy, char* endPtr; Tcl_Obj* strObj; Tcl_Obj* retval; - (void)dummy; if (objc < 4 || objc > 5) { Tcl_WrongNumArgs(interp, 1, objv, "fpval ndigits type ?shorten?"); @@ -1881,13 +1707,12 @@ TestdoubledigitsObjCmd(void *dummy, /* ARGSUSED */ static int TestdstringCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { int count; - (void)dummy; if (argc < 2) { wrongNumArgs: @@ -2009,7 +1834,7 @@ static void SpecialFree( /* ARGSUSED */ static int TestencodingObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -2024,7 +1849,6 @@ TestencodingObjCmd( enum options { ENC_CREATE, ENC_DELETE }; - (void)dummy; if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { @@ -2079,10 +1903,10 @@ TestencodingObjCmd( static int EncodingToUtfProc( void *clientData, /* TclEncoding structure. */ - const char *src, /* Source string in specified encoding. */ + TCL_UNUSED(const char *) /*src*/, int srcLen, /* Source string length in bytes. */ - int flags, /* Conversion control flags. */ - Tcl_EncodingState *statePtr,/* Current state. */ + TCL_UNUSED(int) /*flags*/, + TCL_UNUSED(Tcl_EncodingState *), char *dst, /* Output buffer. */ int dstLen, /* The maximum length of output buffer. */ int *srcReadPtr, /* Filled with number of bytes read. */ @@ -2091,9 +1915,6 @@ EncodingToUtfProc( { int len; TclEncoding *encodingPtr; - (void)src; - (void)flags; - (void)statePtr; encodingPtr = (TclEncoding *) clientData; Tcl_EvalEx(encodingPtr->interp, encodingPtr->toUtfCmd, -1, TCL_EVAL_GLOBAL); @@ -2114,10 +1935,10 @@ EncodingToUtfProc( static int EncodingFromUtfProc( void *clientData, /* TclEncoding structure. */ - const char *src, /* Source string in specified encoding. */ + TCL_UNUSED(const char *) /*src*/, int srcLen, /* Source string length in bytes. */ - int flags, /* Conversion control flags. */ - Tcl_EncodingState *statePtr,/* Current state. */ + TCL_UNUSED(int) /*flags*/, + TCL_UNUSED(Tcl_EncodingState *), char *dst, /* Output buffer. */ int dstLen, /* The maximum length of output buffer. */ int *srcReadPtr, /* Filled with number of bytes read. */ @@ -2126,9 +1947,6 @@ EncodingFromUtfProc( { int len; TclEncoding *encodingPtr; - (void)src; - (void)flags; - (void)statePtr; encodingPtr = (TclEncoding *) clientData; Tcl_EvalEx(encodingPtr->interp, encodingPtr->fromUtfCmd, -1, TCL_EVAL_GLOBAL); @@ -2176,14 +1994,13 @@ EncodingFreeProc( static int TestevalexObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { int length, flags; const char *script; - (void)dummy; flags = 0; if (objc == 3) { @@ -2222,13 +2039,12 @@ TestevalexObjCmd( static int TestevalobjvObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { int evalGlobal; - (void)dummy; if (objc < 3) { Tcl_WrongNumArgs(interp, 1, objv, "global word ?word ...?"); @@ -2272,7 +2088,7 @@ TestevalobjvObjCmd( static int TesteventObjCmd( - void *dummy, /* Not used */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Tcl interpreter */ int objc, /* Parameter count */ Tcl_Obj *const objv[]) /* Parameter vector */ @@ -2292,7 +2108,6 @@ TesteventObjCmd( TCL_QUEUE_MARK }; TestEvent *ev; /* Event to be queued */ - (void)dummy; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?arg ...?"); @@ -2358,7 +2173,7 @@ TesteventObjCmd( static int TesteventProc( Tcl_Event *event, /* Event to deliver */ - int flags) /* Current flags for Tcl_ServiceEvent */ + TCL_UNUSED(int) /*flags*/) { TestEvent *ev = (TestEvent *) event; Tcl_Interp *interp = ev->interp; @@ -2366,7 +2181,6 @@ TesteventProc( int result = Tcl_EvalObjEx(interp, command, TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT); int retval; - (void)flags; if (result != TCL_OK) { Tcl_AddErrorInfo(interp, @@ -2453,13 +2267,12 @@ TesteventDeleteProc( static int TestexithandlerCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { int value; - (void)dummy; if (argc != 3) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0], @@ -2530,7 +2343,7 @@ ExitProcEven( static int TestexprlongCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -2538,7 +2351,6 @@ TestexprlongCmd( long exprResult; char buf[4 + TCL_INTEGER_SPACE]; int result; - (void)dummy; if (argc != 2) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0], @@ -2574,7 +2386,7 @@ TestexprlongCmd( static int TestexprlongobjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Argument objects. */ @@ -2582,7 +2394,6 @@ TestexprlongobjCmd( long exprResult; char buf[4 + TCL_INTEGER_SPACE]; int result; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "expression"); @@ -2617,7 +2428,7 @@ TestexprlongobjCmd( static int TestexprdoubleCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -2625,7 +2436,6 @@ TestexprdoubleCmd( double exprResult; char buf[4 + TCL_DOUBLE_SPACE]; int result; - (void)dummy; if (argc != 2) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0], @@ -2662,7 +2472,7 @@ TestexprdoubleCmd( static int TestexprdoubleobjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Argument objects. */ @@ -2670,7 +2480,6 @@ TestexprdoubleobjCmd( double exprResult; char buf[4 + TCL_DOUBLE_SPACE]; int result; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "expression"); @@ -2705,13 +2514,11 @@ TestexprdoubleobjCmd( static int TestexprstringCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { - (void)dummy; - if (argc != 2) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0], " expression\"", NULL); @@ -2739,13 +2546,12 @@ TestexprstringCmd( static int TestfilelinkCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { Tcl_Obj *contents; - (void)dummy; if (objc < 2 || objc > 3) { Tcl_WrongNumArgs(interp, 1, objv, "source ?target?"); @@ -2807,13 +2613,12 @@ TestfilelinkCmd( static int TestgetassocdataCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { char *res; - (void)dummy; if (argc != 2) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0], @@ -2846,14 +2651,13 @@ TestgetassocdataCmd( static int TestgetplatformCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { static const char *const platformStrings[] = { "unix", "mac", "windows" }; TclPlatformType *platform; - (void)dummy; platform = TclGetPlatform(); @@ -2888,13 +2692,12 @@ TestgetplatformCmd( /* ARGSUSED */ static int TestinterpdeleteCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { Tcl_Interp *slaveToDelete; - (void)dummy; if (argc != 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -2930,7 +2733,7 @@ TestinterpdeleteCmd( /* ARGSUSED */ static int TestlinkCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -2953,7 +2756,6 @@ TestlinkCmd( char buffer[2*TCL_DOUBLE_SPACE]; int writable, flag; Tcl_Obj *tmp; - (void)dummy; if (argc < 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -3399,7 +3201,7 @@ TestlinkCmd( static int TestlinkarrayCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -3423,7 +3225,6 @@ TestlinkarrayCmd( int optionIndex, typeIndex, readonly, i, size, length; char *name, *arg; Tcl_WideInt addr; - (void)dummy; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option args"); @@ -3518,7 +3319,7 @@ TestlinkarrayCmd( static int TestlocaleCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -3533,7 +3334,6 @@ TestlocaleCmd( LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_ALL }; - (void)dummy; /* * LC_CTYPE, etc. correspond to the indices for the strings. @@ -3581,10 +3381,8 @@ TestlocaleCmd( static void CleanupTestSetassocdataTests( void *clientData, /* Data to be released. */ - Tcl_Interp *dummy) /* Interpreter being deleted. */ + TCL_UNUSED(Tcl_Interp *)) { - (void)dummy; - Tcl_Free(clientData); } @@ -3607,7 +3405,7 @@ CleanupTestSetassocdataTests( static int TestparserObjCmd( - void *dummy1, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -3615,7 +3413,6 @@ TestparserObjCmd( const char *script; int length, dummy; Tcl_Parse parse; - (void)dummy1; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "script length"); @@ -3664,7 +3461,7 @@ TestparserObjCmd( static int TestexprparserObjCmd( - void *dummy1, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -3672,7 +3469,6 @@ TestexprparserObjCmd( const char *script; int length, dummy; Tcl_Parse parse; - (void)dummy1; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "expr length"); @@ -3812,13 +3608,12 @@ PrintParse( static int TestparsevarObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { const char *value, *name, *termPtr; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "varName"); @@ -3854,7 +3649,7 @@ TestparsevarObjCmd( static int TestparsevarnameObjCmd( - void *dummy1, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -3862,7 +3657,6 @@ TestparsevarnameObjCmd( const char *script; int append, length, dummy; Tcl_Parse parse; - (void)dummy1; if (objc != 4) { Tcl_WrongNumArgs(interp, 1, objv, "script length append"); @@ -3918,15 +3712,12 @@ TestparsevarnameObjCmd( static int TestpreferstableObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ - Tcl_Obj *const objv[]) /* The argument objects. */ + TCL_UNUSED(int) /*objc*/, + TCL_UNUSED(Tcl_Obj *const *) /*objv*/) { Interp *iPtr = (Interp *) interp; - (void)dummy; - (void)objc; - (void)objv; iPtr->packagePrefer = PKG_PREFER_STABLE; return TCL_OK; @@ -3951,14 +3742,13 @@ TestpreferstableObjCmd( static int TestprintObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { Tcl_WideInt argv1 = 0; size_t argv2; - (void)dummy; if (objc < 2 || objc > 3) { Tcl_WrongNumArgs(interp, 1, objv, "format wideint"); @@ -3994,7 +3784,7 @@ TestprintObjCmd( /* ARGSUSED */ static int TestregexpObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -4018,7 +3808,6 @@ TestregexpObjCmd( REGEXP_XFLAGS, REGEXP_LAST }; - (void)dummy; indices = 0; about = 0; @@ -4321,16 +4110,11 @@ TestregexpXflags( /* ARGSUSED */ static int TestreturnObjCmd( - void *dummy, /* Not used. */ - Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ - Tcl_Obj *const objv[]) /* Argument objects. */ + TCL_UNUSED(ClientData), + TCL_UNUSED(Tcl_Interp *), + TCL_UNUSED(int) /*objc*/, + TCL_UNUSED(Tcl_Obj *const *) /*objv*/) { - (void)dummy; - (void)interp; - (void)objc; - (void)objv; - return TCL_RETURN; } @@ -4354,14 +4138,13 @@ TestreturnObjCmd( static int TestsetassocdataCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { char *buf, *oldData; Tcl_InterpDeleteProc *procPtr; - (void)dummy; if (argc != 3) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0], @@ -4406,14 +4189,13 @@ TestsetassocdataCmd( static int TestsetplatformCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { size_t length; TclPlatformType *platform; - (void)dummy; platform = TclGetPlatform(); @@ -4456,13 +4238,12 @@ TestsetplatformCmd( static int TeststaticpkgCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { int safe, loaded; - (void)dummy; if (argc != 4) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", @@ -4508,14 +4289,13 @@ StaticInitProc( static int TesttranslatefilenameCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { Tcl_DString buffer; const char *result; - (void)dummy; if (argc != 2) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", @@ -4551,13 +4331,12 @@ TesttranslatefilenameCmd( /* ARGSUSED */ static int TestupvarCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { int flags = 0; - (void)dummy; if ((argc != 5) && (argc != 6)) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", @@ -4605,13 +4384,11 @@ TestupvarCmd( /* ARGSUSED */ static int TestseterrorcodeCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { - (void)dummy; - if (argc > 6) { Tcl_AppendResult(interp, "too many args", NULL); return TCL_ERROR; @@ -4660,13 +4437,11 @@ TestseterrorcodeCmd( /* ARGSUSED */ static int TestsetobjerrorcodeCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { - (void)dummy; - Tcl_SetObjErrorCode(interp, Tcl_ConcatObj(objc - 1, objv + 1)); return TCL_ERROR; } @@ -4691,7 +4466,7 @@ TestsetobjerrorcodeCmd( /* ARGSUSED */ static int TestfeventCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -4699,7 +4474,6 @@ TestfeventCmd( static Tcl_Interp *interp2 = NULL; int code; Tcl_Channel chan; - (void)dummy; if (argc < 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -4764,21 +4538,17 @@ TestfeventCmd( static int TestpanicCmd( - void *dummy, /* Not used. */ - Tcl_Interp *interp, /* Current interpreter. */ + TCL_UNUSED(ClientData), + TCL_UNUSED(Tcl_Interp *), int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { - char *argString; - (void)dummy; - (void)interp; - /* * Put the arguments into a var args structure * Append all of the arguments together separated by spaces */ - argString = Tcl_Merge(argc-1, argv+1); + char *argString = Tcl_Merge(argc-1, argv+1); Tcl_Panic("%s", argString); Tcl_Free(argString); @@ -4787,7 +4557,7 @@ TestpanicCmd( static int TestfileCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ Tcl_Obj *const argv[]) /* The argument objects. */ @@ -4795,7 +4565,6 @@ TestfileCmd( int force, i, j, result; Tcl_Obj *error = NULL; const char *subcmd; - (void)dummy; if (argc < 3) { return TCL_ERROR; @@ -4870,7 +4639,7 @@ TestfileCmd( static int TestgetvarfullnameCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -4880,7 +4649,6 @@ TestgetvarfullnameCmd( Tcl_Namespace *namespacePtr; Tcl_CallFrame *framePtr; Tcl_Var variable; - (void)dummy; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "name scope"); @@ -4945,10 +4713,10 @@ TestgetvarfullnameCmd( static int GetTimesObjCmd( - void *dummy, /* Unused. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* The current interpreter. */ - int cobjc, /* Number of arguments. */ - Tcl_Obj *const cobjv[]) /* The argument objects. */ + TCL_UNUSED(int) /*cobjc*/, + TCL_UNUSED(Tcl_Obj *const *) /*cobjv*/) { Interp *iPtr = (Interp *) interp; int i, n; @@ -4957,9 +4725,6 @@ GetTimesObjCmd( Tcl_Obj *objPtr, **objv; const char *s; char newString[TCL_INTEGER_SPACE]; - (void)dummy; - (void)cobjc; - (void)cobjv; /* alloc & free 100000 times */ fprintf(stderr, "alloc & free 100000 6 word items\n"); @@ -5127,16 +4892,11 @@ GetTimesObjCmd( static int NoopCmd( - void *dummy, /* Unused. */ - Tcl_Interp *interp, /* The current interpreter. */ - int argc, /* The number of arguments. */ - const char **argv) /* The argument strings. */ + TCL_UNUSED(ClientData), + TCL_UNUSED(Tcl_Interp *), + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { - (void)dummy; - (void)interp; - (void)argc; - (void)argv; - return TCL_OK; } @@ -5159,16 +4919,11 @@ NoopCmd( static int NoopObjCmd( - void *dummy, /* Not used. */ - Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ - Tcl_Obj *const objv[]) /* The argument objects. */ + TCL_UNUSED(ClientData), + TCL_UNUSED(Tcl_Interp *), + TCL_UNUSED(int) /*objc*/, + TCL_UNUSED(Tcl_Obj *const *) /*objv*/) { - (void)dummy; - (void)interp; - (void)objc; - (void)objv; - return TCL_OK; } @@ -5189,14 +4944,13 @@ NoopObjCmd( static int TeststringbytesObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { int n; const unsigned char *p; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "value"); @@ -5230,13 +4984,12 @@ TeststringbytesObjCmd( static int TestpurebytesobjObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { Tcl_Obj *objPtr; - (void)dummy; if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "?string?"); @@ -5278,14 +5031,13 @@ TestpurebytesobjObjCmd( static int TestbytestringObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { int n = 0; const char *p; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "bytearray"); @@ -5403,7 +5155,7 @@ Testset2Cmd( /* ARGSUSED */ static int TestsaveresultCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp,/* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -5417,7 +5169,6 @@ TestsaveresultCmd( enum options { RESULT_APPEND, RESULT_DYNAMIC, RESULT_FREE, RESULT_OBJECT, RESULT_SMALL }; - (void)dummy; /* * Parse arguments @@ -5507,9 +5258,8 @@ TestsaveresultCmd( static void TestsaveresultFree( - void *blockPtr) + TCL_UNUSED(void *)) { - (void)blockPtr; freeCount++; } @@ -5532,14 +5282,11 @@ TestsaveresultFree( static int TestmainthreadCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp,/* Current interpreter. */ int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(const char **) /*argv*/) { - (void)dummy; - (void)argv; - if (argc == 1) { Tcl_Obj *idObj = Tcl_NewWideIntObj((Tcl_WideInt)(size_t)Tcl_GetCurrentThread()); @@ -5596,16 +5343,11 @@ MainLoop(void) static int TestsetmainloopCmd( - void *dummy, /* Not used. */ - Tcl_Interp *interp,/* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(ClientData), + TCL_UNUSED(Tcl_Interp *), + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { - (void)dummy; - (void)interp; - (void)argc; - (void)argv; - exitMainLoop = 0; Tcl_SetMainLoop(MainLoop); return TCL_OK; @@ -5630,16 +5372,11 @@ TestsetmainloopCmd( static int TestexitmainloopCmd( - void *dummy, /* Not used. */ - Tcl_Interp *interp,/* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(ClientData), + TCL_UNUSED(Tcl_Interp *), + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { - (void)dummy; - (void)interp; - (void)argc; - (void)argv; - exitMainLoop = 1; return TCL_OK; } @@ -5664,7 +5401,7 @@ TestexitmainloopCmd( /* ARGSUSED */ static int TestChannelCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Interpreter for result. */ int argc, /* Count of additional args. */ const char **argv) /* Additional arg strings. */ @@ -5680,7 +5417,6 @@ TestChannelCmd( int IOQueued; /* How much IO is queued inside channel? */ char buf[TCL_INTEGER_SPACE];/* For sprintf. */ int mode; /* rw mode of the channel */ - (void)dummy; if (argc < 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -6134,7 +5870,7 @@ TestChannelCmd( /* ARGSUSED */ static int TestChannelEventCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -6145,7 +5881,6 @@ TestChannelEventCmd( EventScriptRecord *esPtr, *prevEsPtr, *nextEsPtr; const char *cmd; int index, i, mask, len; - (void)dummy; if ((argc < 3) || (argc > 5)) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -6348,14 +6083,13 @@ TestChannelEventCmd( /* ARGSUSED */ static int TestSocketCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Interpreter for result. */ int argc, /* Count of additional args. */ const char **argv) /* Additional arg strings. */ { const char *cmdName; /* Sub command. */ size_t len; /* Length of subcommand string. */ - (void)dummy; if (argc < 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -6416,14 +6150,13 @@ TestSocketCmd( static int TestWrongNumArgsObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { int i, length; const char *msg; - (void)dummy; if (objc < 3) { /* @@ -6473,7 +6206,7 @@ TestWrongNumArgsObjCmd( static int TestGetIndexFromObjStructObjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -6482,7 +6215,6 @@ TestGetIndexFromObjStructObjCmd( "a", "b", "c", "d", "e", "f", NULL, NULL }; int idx,target; - (void)dummy; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "argument targetvalue"); @@ -6528,14 +6260,13 @@ TestGetIndexFromObjStructObjCmd( static int TestFilesystemObjCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { int res, boolVal; const char *msg; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "boolean"); @@ -6865,12 +6596,10 @@ TestReportUtime( static int TestReportNormalizePath( - Tcl_Interp *dummy, + TCL_UNUSED(Tcl_Interp *), Tcl_Obj *pathPtr, int nextCheckpoint) { - (void)dummy; - TestReport("normalizepath", pathPtr, NULL); return nextCheckpoint; } @@ -6878,10 +6607,9 @@ TestReportNormalizePath( static int SimplePathInFilesystem( Tcl_Obj *pathPtr, - void **dummy) + TCL_UNUSED(ClientData *)) { const char *str = Tcl_GetString(pathPtr); - (void)dummy; if (strncmp(str, "simplefs:/", 10)) { return -1; @@ -6908,14 +6636,13 @@ SimplePathInFilesystem( static int TestSimpleFilesystemObjCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { int res, boolVal; const char *msg; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "boolean"); @@ -7069,13 +6796,11 @@ SimpleListVolumes(void) static int TestNumUtfCharsCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { - (void)dummy; - if (objc > 1) { int len = -1; @@ -7094,13 +6819,11 @@ TestNumUtfCharsCmd( static int TestFindFirstCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { - (void)dummy; - if (objc > 1) { int len = -1; @@ -7118,13 +6841,11 @@ TestFindFirstCmd( static int TestFindLastCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { - (void)dummy; - if (objc > 1) { int len = -1; @@ -7162,7 +6883,7 @@ TestFindLastCmd( static int TestcpuidCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp* interp, /* Tcl interpreter */ int objc, /* Parameter count */ Tcl_Obj *const * objv) /* Parameter vector */ @@ -7170,7 +6891,6 @@ TestcpuidCmd( int status, index, i; int regs[4]; Tcl_Obj *regsObjs[4]; - (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "eax"); @@ -7199,7 +6919,7 @@ TestcpuidCmd( static int TestHashSystemHashCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) @@ -7211,7 +6931,6 @@ TestHashSystemHashCmd( Tcl_HashTable hash; Tcl_HashEntry *hPtr; int i, isNew, limit = 100; - (void)dummy; if (objc>1 && Tcl_GetIntFromObj(interp, objv[1], &limit)!=TCL_OK) { return TCL_ERROR; @@ -7276,13 +6995,11 @@ TestHashSystemHashCmd( */ static int TestgetintCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int argc, const char **argv) { - (void)dummy; - if (argc < 2) { Tcl_AppendResult(interp, "wrong # args", NULL); return TCL_ERROR; @@ -7305,14 +7022,11 @@ TestgetintCmd( */ static int TestlongsizeCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int argc, - const char **argv) + TCL_UNUSED(const char **) /*argv*/) { - (void)dummy; - (void)argv; - if (argc != 1) { Tcl_AppendResult(interp, "wrong # args", NULL); return TCL_ERROR; @@ -7325,10 +7039,9 @@ static int NREUnwind_callback( void *data[], Tcl_Interp *interp, - int result) + TCL_UNUSED(int) /*result*/) { int none; - (void)result; if (data[0] == INT2PTR(-1)) { Tcl_NRAddCallback(interp, NREUnwind_callback, &none, INT2PTR(-1), @@ -7351,14 +7064,11 @@ NREUnwind_callback( static int TestNREUnwind( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, - int objc, - Tcl_Obj *const objv[]) + TCL_UNUSED(int) /*objc*/, + TCL_UNUSED(Tcl_Obj *const *) /*objv*/) { - (void)dummy; - (void)objc; - (void)objv; /* * Insure that callbacks effectively run at the proper level during the * unwinding of the NRE stack. @@ -7372,10 +7082,10 @@ TestNREUnwind( static int TestNRELevels( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, - int objc, - Tcl_Obj *const objv[]) + TCL_UNUSED(int) /*objc*/, + TCL_UNUSED(Tcl_Obj *const *) /*objv*/) { Interp *iPtr = (Interp *) interp; static ptrdiff_t *refDepth = NULL; @@ -7383,9 +7093,6 @@ TestNRELevels( Tcl_Obj *levels[6]; int i = 0; NRE_callback *cbPtr = iPtr->execEnvPtr->callbackPtr; - (void)dummy; - (void)objc; - (void)objv; if (refDepth == NULL) { refDepth = &depth; @@ -7431,17 +7138,14 @@ TestNRELevels( static int TestconcatobjCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + TCL_UNUSED(int) /*argc*/, + TCL_UNUSED(const char **) /*argv*/) { Tcl_Obj *list1Ptr, *list2Ptr, *emptyPtr, *concatPtr, *tmpPtr; int result = TCL_OK, len; Tcl_Obj *objv[3]; - (void)dummy; - (void)argc; - (void)argv; /* * Set the start of the error message as obj result; it will be cleared at @@ -7730,13 +7434,11 @@ TestconcatobjCmd( static int TestgetencpathObjCmd( - ClientData dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Argument strings. */ { - (void)dummy; - if (objc != 1) { Tcl_WrongNumArgs(interp, 1, objv, ""); return TCL_ERROR; @@ -7765,13 +7467,11 @@ TestgetencpathObjCmd( static int TestsetencpathObjCmd( - ClientData dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Argument strings. */ { - (void)dummy; - if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "defaultDir"); return TCL_ERROR; @@ -7801,7 +7501,7 @@ TestsetencpathObjCmd( static int TestparseargsCmd( - void *dummy, /* Not used. */ + TCL_UNUSED(ClientData), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Arguments. */ @@ -7813,7 +7513,6 @@ TestparseargsCmd( {TCL_ARGV_CONSTANT, "-bool", INT2PTR(1), &foo, "booltest", NULL}, TCL_ARGV_AUTO_REST, TCL_ARGV_AUTO_HELP, TCL_ARGV_TABLE_END }; - (void)dummy; foo = 0; if (Tcl_ParseArgsObjv(interp, argTable, &count, objv, &remObjv)!=TCL_OK) { @@ -7835,8 +7534,8 @@ static int InterpCmdResolver( Tcl_Interp *interp, const char *name, - Tcl_Namespace *context, - int flags, + TCL_UNUSED(Tcl_Namespace *), + TCL_UNUSED(int) /*flags*/, Tcl_Command *rPtr) { Interp *iPtr = (Interp *) interp; @@ -7845,8 +7544,6 @@ InterpCmdResolver( varFramePtr->procPtr : NULL; Namespace *callerNsPtr = varFramePtr->nsPtr; Tcl_Command resolvedCmdPtr = NULL; - (void)context; - (void)flags; /* * Just do something special on a cmd literal "z" in two cases: @@ -7928,18 +7625,12 @@ InterpCmdResolver( static int InterpVarResolver( - Tcl_Interp *interp, - const char *name, - Tcl_Namespace *context, - int flags, - Tcl_Var *rPtr) + TCL_UNUSED(Tcl_Interp *), + TCL_UNUSED(const char *), + TCL_UNUSED(Tcl_Namespace *), + TCL_UNUSED(int), + TCL_UNUSED(Tcl_Var *)) { - (void)interp; - (void)name; - (void)context; - (void)flags; - (void)rPtr; - /* * Don't resolve the variable; use standard rules. */ @@ -8027,16 +7718,12 @@ MyCompiledVarFetch( static int InterpCompiledVarResolver( - Tcl_Interp *dummy, + TCL_UNUSED(Tcl_Interp *), const char *name, - int length, - Tcl_Namespace *context, + TCL_UNUSED(int) /*length*/, + TCL_UNUSED(Tcl_Namespace *), Tcl_ResolvedVarInfo **rPtr) { - (void)dummy; - (void)length; - (void)context; - if (*name == 'T') { MyResolvedVarInfo *resVarInfo = (MyResolvedVarInfo *)Tcl_Alloc(sizeof(MyResolvedVarInfo)); @@ -8053,7 +7740,7 @@ InterpCompiledVarResolver( static int TestInterpResolverCmd( - void *dummy, + TCL_UNUSED(ClientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) @@ -8063,7 +7750,6 @@ TestInterpResolverCmd( }; int idx; #define RESOLVER_KEY "testInterpResolver" - (void)dummy; if ((objc < 2) || (objc > 3)) { Tcl_WrongNumArgs(interp, 1, objv, "up|down ?interp?"); |