summaryrefslogtreecommitdiffstats
path: root/generic/tclLiteral.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-02 12:27:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-02 12:27:10 (GMT)
commitb5f118d8753139dcc5bd599f67373eca836500f8 (patch)
tree7d2cc02f9736aec246af11d9e8d474a92c308b10 /generic/tclLiteral.c
parent876a5d67826981d371dae6608868539e99b3c916 (diff)
parent2552ed664c5cb66c0a094adecd92db0cadb0d004 (diff)
downloadtcl-b5f118d8753139dcc5bd599f67373eca836500f8.zip
tcl-b5f118d8753139dcc5bd599f67373eca836500f8.tar.gz
tcl-b5f118d8753139dcc5bd599f67373eca836500f8.tar.bz2
Merge tip-548. A few more fixes, trying to make the Travis build work (finally)
Diffstat (limited to 'generic/tclLiteral.c')
-rw-r--r--generic/tclLiteral.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 0b2c585..eb76884 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -98,14 +98,13 @@ TclInitLiteralTable(
void
TclDeleteLiteralTable(
- Tcl_Interp *dummy, /* Interpreter containing shared literals
+ Tcl_Interp *interp, /* Interpreter containing shared literals
* referenced by the table to delete. */
LiteralTable *tablePtr) /* Points to the literal table to delete. */
{
LiteralEntry *entryPtr, *nextPtr;
Tcl_Obj *objPtr;
size_t i;
- (void)dummy;
/*
* Release remaining literals in the table. Note that releasing a literal
@@ -115,6 +114,8 @@ TclDeleteLiteralTable(
#ifdef TCL_COMPILE_DEBUG
TclVerifyGlobalLiteralTable((Interp *) interp);
+#else
+ (void)interp;
#endif /*TCL_COMPILE_DEBUG*/
/*
@@ -1131,7 +1132,7 @@ TclLiteralStats(
* Print out the histogram and a few other pieces of information.
*/
- result = ckalloc(NUM_COUNTERS*60 + 300);
+ result = (char *)ckalloc(NUM_COUNTERS*60 + 300);
sprintf(result, "%d entries in table, %d buckets\n",
tablePtr->numEntries, tablePtr->numBuckets);
p = result + strlen(result);