diff options
Diffstat (limited to 'generic/tclTest.c')
| -rw-r--r-- | generic/tclTest.c | 355 |
1 files changed, 268 insertions, 87 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index 9270727..634f22b 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -37,7 +37,6 @@ /* * Declare external functions used in Windows tests. */ - DLLEXPORT int Tcltest_Init(Tcl_Interp *interp); DLLEXPORT int Tcltest_SafeInit(Tcl_Interp *interp); @@ -227,7 +226,7 @@ static int TestbumpinterpepochObjCmd(ClientData clientData, static int TestbytestringObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int TestpurebytesobjObjCmd(ClientData clientData, +static int TestpurebytesobjObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int TeststringbytesObjCmd(void *clientData, @@ -852,6 +851,7 @@ TestasyncCmd( TestAsyncHandler *asyncPtr, *prevPtr; int id, code; static int nextId = 1; + (void)dummy; if (argc < 2) { wrongNumArgs: @@ -862,8 +862,8 @@ TestasyncCmd( if (argc != 3) { goto wrongNumArgs; } - asyncPtr = ckalloc(sizeof(TestAsyncHandler)); - asyncPtr->command = ckalloc(strlen(argv[2]) + 1); + asyncPtr = (TestAsyncHandler *)ckalloc(sizeof(TestAsyncHandler)); + asyncPtr->command = (char *)ckalloc(strlen(argv[2]) + 1); strcpy(asyncPtr->command, argv[2]); Tcl_MutexLock(&asyncTestMutex); asyncPtr->id = nextId; @@ -1060,6 +1060,8 @@ TestbumpinterpepochObjCmd( Tcl_Obj *const objv[]) /* Argument objects. */ { Interp *iPtr = (Interp *)interp; + (void)dummy; + if (objc != 1) { Tcl_WrongNumArgs(interp, 1, objv, ""); return TCL_ERROR; @@ -1095,6 +1097,7 @@ TestcmdinfoCmd( const char **argv) /* Argument strings. */ { Tcl_CmdInfo info; + (void)dummy; if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -1165,6 +1168,9 @@ CmdProc1( int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { + (void)argc; + (void)argv; + Tcl_AppendResult(interp, "CmdProc1 ", (char *) clientData, NULL); return TCL_OK; } @@ -1177,6 +1183,9 @@ CmdProc2( int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { + (void)argc; + (void)argv; + Tcl_AppendResult(interp, "CmdProc2 ", (char *) clientData, NULL); return TCL_OK; } @@ -1227,6 +1236,7 @@ TestcmdtokenCmd( Tcl_Command token; int *l; char buf[30]; + (void)dummy; if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -1290,6 +1300,7 @@ TestcmdtraceCmd( { Tcl_DString buffer; int result; + (void)dummy; if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -1387,6 +1398,10 @@ CmdTraceProc( { Tcl_DString *bufPtr = (Tcl_DString *) clientData; int i; + (void)interp; + (void)level; + (void)cmdProc; + (void)cmdClientData; Tcl_DStringAppendElement(bufPtr, command); @@ -1399,7 +1414,7 @@ CmdTraceProc( static void CmdTraceDeleteProc( - void *clientData, /* Unused. */ + void *dummy, /* Unused. */ Tcl_Interp *interp, /* Current interpreter. */ int level, /* Current trace level. */ char *command, /* The command being traced (after @@ -1410,6 +1425,14 @@ CmdTraceDeleteProc( int argc, /* Number of arguments. */ const char *argv[]) /* Argument strings. */ { + (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 @@ -1421,7 +1444,7 @@ CmdTraceDeleteProc( static int ObjTraceProc( - void *clientData, /* unused */ + void *dummy, /* unused */ Tcl_Interp *interp, /* Tcl interpreter */ int level, /* Execution level */ const char *command, /* Command being executed */ @@ -1430,6 +1453,11 @@ ObjTraceProc( Tcl_Obj *const objv[]) /* Parameter list */ { 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)); @@ -1483,6 +1511,8 @@ TestcreatecommandCmd( 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); @@ -1508,13 +1538,16 @@ TestcreatecommandCmd( static int CreatedCommandProc( - void *clientData, /* String to return. */ + void *dummy, /* String to return. */ Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { Tcl_CmdInfo info; int found; + (void)dummy; + (void)argc; + (void)argv; found = Tcl_GetCommandInfo(interp, "test_ns_basic::createdcommand", &info); @@ -1530,13 +1563,16 @@ CreatedCommandProc( static int CreatedCommandProc2( - void *clientData, /* String to return. */ + void *dummy, /* String to return. */ Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { Tcl_CmdInfo info; int found; + (void)dummy; + (void)argc; + (void)argv; found = Tcl_GetCommandInfo(interp, "value:at:", &info); if (!found) { @@ -1575,6 +1611,7 @@ TestdcallCmd( const char **argv) /* Argument strings. */ { int i, id; + (void)dummy; delInterp = Tcl_CreateInterp(); Tcl_DStringInit(&delString); @@ -1641,6 +1678,7 @@ TestdelCmd( { DelCmd *dPtr; Tcl_Interp *slave; + (void)dummy; if (argc != 4) { Tcl_AppendResult(interp, "wrong # args", NULL); @@ -1652,9 +1690,9 @@ TestdelCmd( return TCL_ERROR; } - dPtr = ckalloc(sizeof(DelCmd)); + dPtr = (DelCmd*)ckalloc(sizeof(DelCmd)); dPtr->interp = interp; - dPtr->deleteCmd = ckalloc(strlen(argv[3]) + 1); + dPtr->deleteCmd = (char *)ckalloc(strlen(argv[3]) + 1); strcpy(dPtr->deleteCmd, argv[3]); Tcl_CreateCommand(slave, argv[2], DelCmdProc, dPtr, @@ -1670,6 +1708,8 @@ DelCmdProc( const char **argv) /* Argument strings. */ { DelCmd *dPtr = (DelCmd *) clientData; + (void)argc; + (void)argv; Tcl_AppendResult(interp, dPtr->deleteCmd, NULL); ckfree(dPtr->deleteCmd); @@ -1681,7 +1721,7 @@ static void DelDeleteProc( void *clientData) /* String command to evaluate. */ { - DelCmd *dPtr = clientData; + DelCmd *dPtr = (DelCmd *) clientData; Tcl_EvalEx(dPtr->interp, dPtr->deleteCmd, -1, 0); Tcl_ResetResult(dPtr->interp); @@ -1709,11 +1749,13 @@ DelDeleteProc( static int TestdelassocdataCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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); @@ -1745,7 +1787,7 @@ TestdelassocdataCmd( */ static int -TestdoubledigitsObjCmd(void *unused, +TestdoubledigitsObjCmd(void *dummy, /* NULL */ Tcl_Interp* interp, /* Tcl interpreter */ @@ -1777,6 +1819,7 @@ TestdoubledigitsObjCmd(void *unused, char* endPtr; Tcl_Obj* strObj; Tcl_Obj* retval; + (void)dummy; if (objc < 4 || objc > 5) { Tcl_WrongNumArgs(interp, 1, objv, "fpval ndigits type ?shorten?"); @@ -1843,6 +1886,7 @@ TestdstringCmd( const char **argv) /* Argument strings. */ { int count; + (void)dummy; if (argc < 2) { wrongNumArgs: @@ -1886,7 +1930,7 @@ TestdstringCmd( } else if (strcmp(argv[2], "staticlarge") == 0) { Tcl_AppendResult(interp, "first0 first1 first2 first3 first4 first5 first6 first7 first8 first9\nsecond0 second1 second2 second3 second4 second5 second6 second7 second8 second9\nthird0 third1 third2 third3 third4 third5 third6 third7 third8 third9\nfourth0 fourth1 fourth2 fourth3 fourth4 fourth5 fourth6 fourth7 fourth8 fourth9\nfifth0 fifth1 fifth2 fifth3 fifth4 fifth5 fifth6 fifth7 fifth8 fifth9\nsixth0 sixth1 sixth2 sixth3 sixth4 sixth5 sixth6 sixth7 sixth8 sixth9\nseventh0 seventh1 seventh2 seventh3 seventh4 seventh5 seventh6 seventh7 seventh8 seventh9\n", NULL); } else if (strcmp(argv[2], "free") == 0) { - char *s = ckalloc(100); + char *s = (char *)ckalloc(100); strcpy(s, "This is a malloc-ed string"); Tcl_SetResult(interp, s, TCL_DYNAMIC); } else if (strcmp(argv[2], "special") == 0) { @@ -1938,9 +1982,9 @@ TestdstringCmd( * Tcl_DStringGetResult handles freeProc's other than free. */ -static void SpecialFree(blockPtr) - char *blockPtr; /* Block to free. */ -{ +static void SpecialFree( + char *blockPtr /* Block to free. */ +) { ckfree(blockPtr - 16); } @@ -1979,6 +2023,7 @@ TestencodingObjCmd( enum options { ENC_CREATE, ENC_DELETE }; + (void)dummy; if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { @@ -1992,15 +2037,15 @@ TestencodingObjCmd( if (objc != 5) { return TCL_ERROR; } - encodingPtr = ckalloc(sizeof(TclEncoding)); + encodingPtr = (TclEncoding*)ckalloc(sizeof(TclEncoding)); encodingPtr->interp = interp; string = Tcl_GetStringFromObj(objv[3], &length); - encodingPtr->toUtfCmd = ckalloc(length + 1); + encodingPtr->toUtfCmd = (char *)ckalloc(length + 1); memcpy(encodingPtr->toUtfCmd, string, length + 1); string = Tcl_GetStringFromObj(objv[4], &length); - encodingPtr->fromUtfCmd = ckalloc(length + 1); + encodingPtr->fromUtfCmd = (char *)ckalloc(length + 1); memcpy(encodingPtr->fromUtfCmd, string, length + 1); string = Tcl_GetStringFromObj(objv[2], &length); @@ -2045,6 +2090,9 @@ EncodingToUtfProc( { int len; TclEncoding *encodingPtr; + (void)src; + (void)flags; + (void)statePtr; encodingPtr = (TclEncoding *) clientData; Tcl_EvalEx(encodingPtr->interp, encodingPtr->toUtfCmd, -1, TCL_EVAL_GLOBAL); @@ -2077,6 +2125,9 @@ EncodingFromUtfProc( { int len; TclEncoding *encodingPtr; + (void)src; + (void)flags; + (void)statePtr; encodingPtr = (TclEncoding *) clientData; Tcl_EvalEx(encodingPtr->interp, encodingPtr->fromUtfCmd, -1, TCL_EVAL_GLOBAL); @@ -2098,7 +2149,7 @@ static void EncodingFreeProc( void *clientData) /* ClientData associated with type. */ { - TclEncoding *encodingPtr = clientData; + TclEncoding *encodingPtr = (TclEncoding *)clientData; ckfree(encodingPtr->toUtfCmd); ckfree(encodingPtr->fromUtfCmd); @@ -2131,6 +2182,7 @@ TestevalexObjCmd( { int length, flags; const char *script; + (void)dummy; flags = 0; if (objc == 3) { @@ -2175,6 +2227,7 @@ TestevalobjvObjCmd( Tcl_Obj *const objv[]) /* Argument objects. */ { int evalGlobal; + (void)dummy; if (objc < 3) { Tcl_WrongNumArgs(interp, 1, objv, "global word ?word ...?"); @@ -2218,7 +2271,7 @@ TestevalobjvObjCmd( static int TesteventObjCmd( - void *unused, /* Not used */ + void *dummy, /* Not used */ Tcl_Interp *interp, /* Tcl interpreter */ int objc, /* Parameter count */ Tcl_Obj *const objv[]) /* Parameter vector */ @@ -2238,6 +2291,7 @@ TesteventObjCmd( TCL_QUEUE_MARK }; TestEvent *ev; /* Event to be queued */ + (void)dummy; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?arg ...?"); @@ -2257,7 +2311,7 @@ TesteventObjCmd( "position specifier", TCL_EXACT, &posIndex) != TCL_OK) { return TCL_ERROR; } - ev = ckalloc(sizeof(TestEvent)); + ev = (TestEvent *)ckalloc(sizeof(TestEvent)); ev->header.proc = TesteventProc; ev->header.nextPtr = NULL; ev->interp = interp; @@ -2311,6 +2365,7 @@ TesteventProc( int result = Tcl_EvalObjEx(interp, command, TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT); int retval; + (void)flags; if (result != TCL_OK) { Tcl_AddErrorInfo(interp, @@ -2397,12 +2452,13 @@ TesteventDeleteProc( static int TestexithandlerCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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], @@ -2473,7 +2529,7 @@ ExitProcEven( static int TestexprlongCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -2481,6 +2537,7 @@ 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], @@ -2516,7 +2573,7 @@ TestexprlongCmd( static int TestexprlongobjCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Argument objects. */ @@ -2524,6 +2581,7 @@ TestexprlongobjCmd( long exprResult; char buf[4 + TCL_INTEGER_SPACE]; int result; + (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "expression"); @@ -2558,7 +2616,7 @@ TestexprlongobjCmd( static int TestexprdoubleCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -2566,6 +2624,7 @@ 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], @@ -2602,7 +2661,7 @@ TestexprdoubleCmd( static int TestexprdoubleobjCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Argument objects. */ @@ -2610,6 +2669,7 @@ TestexprdoubleobjCmd( double exprResult; char buf[4 + TCL_DOUBLE_SPACE]; int result; + (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "expression"); @@ -2644,11 +2704,13 @@ TestexprdoubleobjCmd( static int TestexprstringCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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); @@ -2676,12 +2738,13 @@ TestexprstringCmd( static int TestfilelinkCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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?"); @@ -2743,12 +2806,13 @@ TestfilelinkCmd( static int TestgetassocdataCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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], @@ -2781,13 +2845,14 @@ TestgetassocdataCmd( static int TestgetplatformCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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(); @@ -2828,6 +2893,7 @@ TestinterpdeleteCmd( const char **argv) /* Argument strings. */ { Tcl_Interp *slaveToDelete; + (void)dummy; if (argc != 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], @@ -2886,6 +2952,7 @@ 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], @@ -3115,7 +3182,7 @@ TestlinkCmd( if (strcmp(argv[5], "-") == 0) { stringVar = NULL; } else { - stringVar = ckalloc(strlen(argv[5]) + 1); + stringVar = (char *)ckalloc(strlen(argv[5]) + 1); strcpy(stringVar, argv[5]); } } @@ -3222,7 +3289,7 @@ TestlinkCmd( if (strcmp(argv[5], "-") == 0) { stringVar = NULL; } else { - stringVar = ckalloc(strlen(argv[5]) + 1); + stringVar = (char *)ckalloc(strlen(argv[5]) + 1); strcpy(stringVar, argv[5]); } Tcl_UpdateLinkedVar(interp, "string"); @@ -3331,7 +3398,7 @@ TestlinkCmd( static int TestlinkarrayCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -3355,6 +3422,7 @@ 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"); @@ -3449,14 +3517,13 @@ TestlinkarrayCmd( static int TestlocaleCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { int index; const char *locale; - static const char *const optionStrings[] = { "ctype", "numeric", "time", "collate", "monetary", "all", NULL @@ -3465,6 +3532,7 @@ 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. @@ -3512,8 +3580,10 @@ TestlocaleCmd( static void CleanupTestSetassocdataTests( void *clientData, /* Data to be released. */ - Tcl_Interp *interp) /* Interpreter being deleted. */ + Tcl_Interp *dummy) /* Interpreter being deleted. */ { + (void)dummy; + ckfree(clientData); } @@ -3536,7 +3606,7 @@ CleanupTestSetassocdataTests( static int TestparserObjCmd( - void *clientData, /* Not used. */ + void *dummy1, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -3544,6 +3614,7 @@ TestparserObjCmd( const char *script; int length, dummy; Tcl_Parse parse; + (void)dummy1; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "script length"); @@ -3592,7 +3663,7 @@ TestparserObjCmd( static int TestexprparserObjCmd( - void *clientData, /* Not used. */ + void *dummy1, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -3600,6 +3671,7 @@ TestexprparserObjCmd( const char *script; int length, dummy; Tcl_Parse parse; + (void)dummy1; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "expr length"); @@ -3739,12 +3811,13 @@ PrintParse( static int TestparsevarObjCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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"); @@ -3780,7 +3853,7 @@ TestparsevarObjCmd( static int TestparsevarnameObjCmd( - void *clientData, /* Not used. */ + void *dummy1, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ @@ -3788,6 +3861,7 @@ TestparsevarnameObjCmd( const char *script; int append, length, dummy; Tcl_Parse parse; + (void)dummy1; if (objc != 4) { Tcl_WrongNumArgs(interp, 1, objv, "script length append"); @@ -3843,12 +3917,16 @@ TestparsevarnameObjCmd( static int TestpreferstableObjCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { Interp *iPtr = (Interp *) interp; + (void)dummy; + (void)objc; + (void)objv; + iPtr->packagePrefer = PKG_PREFER_STABLE; return TCL_OK; } @@ -3872,13 +3950,14 @@ TestpreferstableObjCmd( static int TestprintObjCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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"); @@ -3937,6 +4016,7 @@ TestregexpObjCmd( REGEXP_XFLAGS, REGEXP_LAST }; + (void)dummy; indices = 0; about = 0; @@ -4243,6 +4323,11 @@ TestreturnObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { + (void)dummy; + (void)interp; + (void)objc; + (void)objv; + return TCL_RETURN; } @@ -4266,13 +4351,14 @@ TestreturnObjCmd( static int TestsetassocdataCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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], @@ -4280,7 +4366,7 @@ TestsetassocdataCmd( return TCL_ERROR; } - buf = ckalloc(strlen(argv[2]) + 1); + buf = (char *)ckalloc(strlen(argv[2]) + 1); strcpy(buf, argv[2]); /* @@ -4317,13 +4403,14 @@ TestsetassocdataCmd( static int TestsetplatformCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { size_t length; TclPlatformType *platform; + (void)dummy; platform = TclGetPlatform(); @@ -4372,6 +4459,7 @@ TeststaticpkgCmd( const char **argv) /* Argument strings. */ { int safe, loaded; + (void)dummy; if (argc != 4) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", @@ -4424,6 +4512,7 @@ TesttranslatefilenameCmd( { Tcl_DString buffer; const char *result; + (void)dummy; if (argc != 2) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", @@ -4465,6 +4554,7 @@ TestupvarCmd( const char **argv) /* Argument strings. */ { int flags = 0; + (void)dummy; if ((argc != 5) && (argc != 6)) { Tcl_AppendResult(interp, "wrong # arguments: should be \"", @@ -4517,6 +4607,8 @@ TestseterrorcodeCmd( 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; @@ -4570,6 +4662,8 @@ TestsetobjerrorcodeCmd( 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; } @@ -4594,7 +4688,7 @@ TestsetobjerrorcodeCmd( /* ARGSUSED */ static int TestfeventCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ @@ -4602,6 +4696,7 @@ 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], @@ -4672,6 +4767,8 @@ TestpanicCmd( const char **argv) /* Argument strings. */ { char *argString; + (void)dummy; + (void)interp; /* * Put the arguments into a var args structure @@ -4695,6 +4792,7 @@ TestfileCmd( int force, i, j, result; Tcl_Obj *error = NULL; const char *subcmd; + (void)dummy; if (argc < 3) { return TCL_ERROR; @@ -4779,6 +4877,7 @@ TestgetvarfullnameCmd( Tcl_Namespace *namespacePtr; Tcl_CallFrame *framePtr; Tcl_Var variable; + (void)dummy; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "name scope"); @@ -4843,10 +4942,10 @@ TestgetvarfullnameCmd( static int GetTimesObjCmd( - void *unused, /* Unused. */ + void *dummy, /* Unused. */ Tcl_Interp *interp, /* The current interpreter. */ - int notused1, /* Number of arguments. */ - Tcl_Obj *const notused2[]) /* The argument objects. */ + int cobjc, /* Number of arguments. */ + Tcl_Obj *const cobjv[]) /* The argument objects. */ { Interp *iPtr = (Interp *) interp; int i, n; @@ -4855,12 +4954,15 @@ 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"); Tcl_GetTime(&start); for (i = 0; i < 100000; i++) { - objPtr = ckalloc(sizeof(Tcl_Obj)); + objPtr = (Tcl_Obj *)ckalloc(sizeof(Tcl_Obj)); ckfree(objPtr); } Tcl_GetTime(&stop); @@ -4869,10 +4971,10 @@ GetTimesObjCmd( /* alloc 5000 times */ fprintf(stderr, "alloc 5000 6 word items\n"); - objv = ckalloc(5000 * sizeof(Tcl_Obj *)); + objv = (Tcl_Obj **)ckalloc(5000 * sizeof(Tcl_Obj *)); Tcl_GetTime(&start); for (i = 0; i < 5000; i++) { - objv[i] = ckalloc(sizeof(Tcl_Obj)); + objv[i] = (Tcl_Obj *)ckalloc(sizeof(Tcl_Obj)); } Tcl_GetTime(&stop); timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec); @@ -5022,11 +5124,16 @@ GetTimesObjCmd( static int NoopCmd( - void *unused, /* Unused. */ + void *dummy, /* Unused. */ Tcl_Interp *interp, /* The current interpreter. */ int argc, /* The number of arguments. */ const char **argv) /* The argument strings. */ { + (void)dummy; + (void)interp; + (void)argc; + (void)argv; + return TCL_OK; } @@ -5049,11 +5156,16 @@ NoopCmd( static int NoopObjCmd( - void *unused, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { + (void)dummy; + (void)interp; + (void)objc; + (void)objv; + return TCL_OK; } @@ -5074,13 +5186,14 @@ NoopObjCmd( static int TeststringbytesObjCmd( - void *unused, /* Not used. */ + void *dummy, /* Not used. */ 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"); @@ -5114,12 +5227,13 @@ TeststringbytesObjCmd( static int TestpurebytesobjObjCmd( - ClientData unused, /* Not used. */ + void *dummy, /* Not used. */ 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?"); @@ -5134,7 +5248,7 @@ TestpurebytesobjObjCmd( if (objc == 2) { const char *s = Tcl_GetString(objv[1]); objPtr->length = objv[1]->length; - objPtr->bytes = ckalloc(objPtr->length + 1); + objPtr->bytes = (char *)ckalloc(objPtr->length + 1); memcpy(objPtr->bytes, s, objPtr->length); objPtr->bytes[objPtr->length] = 0; } @@ -5161,13 +5275,14 @@ TestpurebytesobjObjCmd( static int TestbytestringObjCmd( - void *unused, /* Not used. */ + void *dummy, /* Not used. */ 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"); @@ -5300,6 +5415,7 @@ TestsaveresultCmd( enum options { RESULT_APPEND, RESULT_DYNAMIC, RESULT_FREE, RESULT_OBJECT, RESULT_SMALL }; + (void)dummy; /* * Parse arguments @@ -5327,7 +5443,7 @@ TestsaveresultCmd( Tcl_AppendResult(interp, "append result", NULL); break; case RESULT_FREE: { - char *buf = ckalloc(200); + char *buf = (char *)ckalloc(200); strcpy(buf, "free result"); Tcl_SetResult(interp, buf, TCL_DYNAMIC); @@ -5394,6 +5510,7 @@ static void TestsaveresultFree( char *blockPtr) { + (void)blockPtr; freeCount++; } @@ -5421,6 +5538,9 @@ TestmainthreadCmd( int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { + (void)dummy; + (void)argv; + if (argc == 1) { Tcl_Obj *idObj = Tcl_NewWideIntObj((Tcl_WideInt)(size_t)Tcl_GetCurrentThread()); @@ -5482,9 +5602,14 @@ TestsetmainloopCmd( int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { - exitMainLoop = 0; - Tcl_SetMainLoop(MainLoop); - return TCL_OK; + (void)dummy; + (void)interp; + (void)argc; + (void)argv; + + exitMainLoop = 0; + Tcl_SetMainLoop(MainLoop); + return TCL_OK; } /* @@ -5511,8 +5636,13 @@ TestexitmainloopCmd( int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { - exitMainLoop = 1; - return TCL_OK; + (void)dummy; + (void)interp; + (void)argc; + (void)argv; + + exitMainLoop = 1; + return TCL_OK; } /* @@ -5535,7 +5665,7 @@ TestexitmainloopCmd( /* ARGSUSED */ static int TestChannelCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Interpreter for result. */ int argc, /* Count of additional args. */ const char **argv) /* Additional arg strings. */ @@ -5551,6 +5681,7 @@ 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], @@ -5649,7 +5780,7 @@ TestChannelCmd( /* Remember the channel in the pool of detached channels */ - det = ckalloc(sizeof(TestChannel)); + det = (TestChannel *)ckalloc(sizeof(TestChannel)); det->chan = chan; det->nextPtr = firstDetached; firstDetached = det; @@ -5841,7 +5972,7 @@ TestChannelCmd( for (hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch); hPtr != NULL; hPtr = Tcl_NextHashEntry(&hSearch)) { - Tcl_AppendElement(interp, Tcl_GetHashKey(hTblPtr, hPtr)); + Tcl_AppendElement(interp, (char *)Tcl_GetHashKey(hTblPtr, hPtr)); } return TCL_OK; } @@ -5882,7 +6013,7 @@ TestChannelCmd( chanPtr = (Channel *) Tcl_GetHashValue(hPtr); statePtr = chanPtr->state; if (statePtr->flags & TCL_READABLE) { - Tcl_AppendElement(interp, Tcl_GetHashKey(hTblPtr, hPtr)); + Tcl_AppendElement(interp, (char *)Tcl_GetHashKey(hTblPtr, hPtr)); } } return TCL_OK; @@ -5939,7 +6070,7 @@ TestChannelCmd( chanPtr = (Channel *) Tcl_GetHashValue(hPtr); statePtr = chanPtr->state; if (statePtr->flags & TCL_WRITABLE) { - Tcl_AppendElement(interp, Tcl_GetHashKey(hTblPtr, hPtr)); + Tcl_AppendElement(interp, (char *)Tcl_GetHashKey(hTblPtr, hPtr)); } } return TCL_OK; @@ -6015,6 +6146,7 @@ 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], @@ -6047,7 +6179,7 @@ TestChannelEventCmd( return TCL_ERROR; } - esPtr = ckalloc(sizeof(EventScriptRecord)); + esPtr = (EventScriptRecord *)ckalloc(sizeof(EventScriptRecord)); esPtr->nextPtr = statePtr->scriptRecordPtr; statePtr->scriptRecordPtr = esPtr; @@ -6217,13 +6349,14 @@ TestChannelEventCmd( /* ARGSUSED */ static int TestSocketCmd( - void *clientData, /* Not used. */ + void *dummy, /* Not used. */ 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], @@ -6291,6 +6424,7 @@ TestWrongNumArgsObjCmd( { int i, length; const char *msg; + (void)dummy; if (objc < 3) { /* @@ -6349,6 +6483,7 @@ TestGetIndexFromObjStructObjCmd( "a", "b", "c", "d", "e", "f", NULL, NULL }; int idx,target; + (void)dummy; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "argument targetvalue"); @@ -6401,6 +6536,7 @@ TestFilesystemObjCmd( { int res, boolVal; const char *msg; + (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "boolean"); @@ -6473,7 +6609,7 @@ TestReportFreeInternalRep( } } -static ClientData +static void * TestReportDupInternalRep( void *clientData) { @@ -6730,10 +6866,12 @@ TestReportUtime( static int TestReportNormalizePath( - Tcl_Interp *interp, + Tcl_Interp *dummy, Tcl_Obj *pathPtr, int nextCheckpoint) { + (void)dummy; + TestReport("normalizepath", pathPtr, NULL); return nextCheckpoint; } @@ -6741,9 +6879,10 @@ TestReportNormalizePath( static int SimplePathInFilesystem( Tcl_Obj *pathPtr, - void **clientDataPtr) + void **dummy) { const char *str = Tcl_GetString(pathPtr); + (void)dummy; if (strncmp(str, "simplefs:/", 10)) { return -1; @@ -6777,6 +6916,7 @@ TestSimpleFilesystemObjCmd( { int res, boolVal; const char *msg; + (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "boolean"); @@ -6930,11 +7070,13 @@ SimpleListVolumes(void) static int TestNumUtfCharsCmd( - void *clientData, + void *dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { + (void)dummy; + if (objc > 1) { int len = -1; @@ -6953,11 +7095,13 @@ TestNumUtfCharsCmd( static int TestFindFirstCmd( - void *clientData, + void *dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { + (void)dummy; + if (objc > 1) { int len = -1; @@ -6975,11 +7119,13 @@ TestFindFirstCmd( static int TestFindLastCmd( - void *clientData, + void *dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { + (void)dummy; + if (objc > 1) { int len = -1; @@ -7025,6 +7171,7 @@ TestcpuidCmd( int status, index, i; int regs[4]; Tcl_Obj *regsObjs[4]; + (void)dummy; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "eax"); @@ -7053,7 +7200,7 @@ TestcpuidCmd( static int TestHashSystemHashCmd( - void *clientData, + void *dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) @@ -7065,6 +7212,7 @@ 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; @@ -7134,6 +7282,8 @@ TestgetintCmd( int argc, const char **argv) { + (void)dummy; + if (argc < 2) { Tcl_AppendResult(interp, "wrong # args", NULL); return TCL_ERROR; @@ -7161,6 +7311,9 @@ TestlongsizeCmd( int argc, const char **argv) { + (void)dummy; + (void)argv; + if (argc != 1) { Tcl_AppendResult(interp, "wrong # args", NULL); return TCL_ERROR; @@ -7176,6 +7329,7 @@ NREUnwind_callback( int result) { int none; + (void)result; if (data[0] == INT2PTR(-1)) { Tcl_NRAddCallback(interp, NREUnwind_callback, &none, INT2PTR(-1), @@ -7198,11 +7352,14 @@ NREUnwind_callback( static int TestNREUnwind( - void *clientData, + void *dummy, Tcl_Interp *interp, int objc, 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. @@ -7216,7 +7373,7 @@ TestNREUnwind( static int TestNRELevels( - void *clientData, + void *dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) @@ -7227,6 +7384,9 @@ 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; @@ -7280,6 +7440,9 @@ TestconcatobjCmd( 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 @@ -7568,11 +7731,13 @@ TestconcatobjCmd( static int TestgetencpathObjCmd( - ClientData clientData, /* Not used. */ + ClientData dummy, /* Not used. */ 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; @@ -7601,11 +7766,13 @@ TestgetencpathObjCmd( static int TestsetencpathObjCmd( - ClientData clientData, /* Not used. */ + ClientData dummy, /* Not used. */ 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; @@ -7647,6 +7814,7 @@ 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) { @@ -7678,6 +7846,8 @@ 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: @@ -7765,6 +7935,12 @@ InterpVarResolver( int flags, Tcl_Var *rPtr) { + (void)interp; + (void)name; + (void)context; + (void)flags; + (void)rPtr; + /* * Don't resolve the variable; use standard rules. */ @@ -7852,14 +8028,18 @@ MyCompiledVarFetch( static int InterpCompiledVarResolver( - Tcl_Interp *interp, + Tcl_Interp *dummy, const char *name, int length, Tcl_Namespace *context, Tcl_ResolvedVarInfo **rPtr) { + (void)dummy; + (void)length; + (void)context; + if (*name == 'T') { - MyResolvedVarInfo *resVarInfo = ckalloc(sizeof(MyResolvedVarInfo)); + MyResolvedVarInfo *resVarInfo = (MyResolvedVarInfo *)ckalloc(sizeof(MyResolvedVarInfo)); resVarInfo->vInfo.fetchProc = MyCompiledVarFetch; resVarInfo->vInfo.deleteProc = MyCompiledVarFree; @@ -7874,7 +8054,7 @@ InterpCompiledVarResolver( static int TestInterpResolverCmd( - void *clientData, + void *dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) @@ -7884,6 +8064,7 @@ TestInterpResolverCmd( }; int idx; #define RESOLVER_KEY "testInterpResolver" + (void)dummy; if ((objc < 2) || (objc > 3)) { Tcl_WrongNumArgs(interp, 1, objv, "up|down ?interp?"); |