diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-16 11:17:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-16 11:17:54 (GMT) |
| commit | 5534478fa10a116663a3b05f32a119bb07aa9ed2 (patch) | |
| tree | b647149ae02bb75b31d2ac1b36cbd503bf42855c /generic/tclTest.c | |
| parent | de0ff2272ed178a1fba979435ced086cecb968fa (diff) | |
| parent | 7dec4a7fc516a50bac5f55f6752b646254ba1082 (diff) | |
| download | tcl-5534478fa10a116663a3b05f32a119bb07aa9ed2.zip tcl-5534478fa10a116663a3b05f32a119bb07aa9ed2.tar.gz tcl-5534478fa10a116663a3b05f32a119bb07aa9ed2.tar.bz2 | |
re-base "novem-more-memory-API" to trunk. TIP not submitted yet, but upcoming.
Diffstat (limited to 'generic/tclTest.c')
| -rw-r--r-- | generic/tclTest.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index 46e07fa..d8a64b9 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -220,7 +220,7 @@ static int ObjTraceProc(ClientData clientData, Tcl_Obj *const objv[]); static void ObjTraceDeleteProc(ClientData clientData); static void PrintParse(Tcl_Interp *interp, Tcl_Parse *parsePtr); -static void SpecialFree(char *blockPtr); +static void SpecialFree(void *blockPtr); static int StaticInitProc(Tcl_Interp *interp); static int TestasyncCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); @@ -349,7 +349,7 @@ static void TestregexpXflags(const char *string, static int TestsaveresultCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static void TestsaveresultFree(char *blockPtr); +static void TestsaveresultFree(void *blockPtr); static int TestsetassocdataCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestsetCmd(ClientData dummy, @@ -963,7 +963,8 @@ AsyncHandlerProc( { TestAsyncHandler *asyncPtr; int id = PTR2INT(clientData); - const char *listArgv[4], *cmd; + const char *listArgv[4]; + char *cmd; char string[TCL_INTEGER_SPACE]; Tcl_MutexLock(&asyncTestMutex); @@ -1909,9 +1910,9 @@ TestdstringCmd( */ static void SpecialFree(blockPtr) - char *blockPtr; /* Block to free. */ + void *blockPtr; /* Block to free. */ { - ckfree(blockPtr - 16); + ckfree(((char *)blockPtr) - 16); } /* @@ -5326,7 +5327,7 @@ TestsaveresultCmd( static void TestsaveresultFree( - char *blockPtr) + void *blockPtr) { freeCount++; } @@ -6979,7 +6980,7 @@ TestHashSystemHashCmd( Tcl_SetHashValue(hPtr, INT2PTR(i+42)); } - if (hash.numEntries != limit) { + if (hash.numEntries != (size_t)limit) { Tcl_AppendResult(interp, "unexpected maximal size", NULL); Tcl_DeleteHashTable(&hash); return TCL_ERROR; |