summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-03-09 13:08:33 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-03-09 13:08:33 (GMT)
commit254b4fa35fd51a8b78906d5d481f4e1c3901f8b2 (patch)
tree97669e54172fba0aeb8139e4bcde7e1a8a402826
parent24cfa12d40215a41ab6507a92a20d8600e320d94 (diff)
parent42e6e9b167278c19dd2d9039fc434558bfc2c7f1 (diff)
downloadtcl-254b4fa35fd51a8b78906d5d481f4e1c3901f8b2.zip
tcl-254b4fa35fd51a8b78906d5d481f4e1c3901f8b2.tar.gz
tcl-254b4fa35fd51a8b78906d5d481f4e1c3901f8b2.tar.bz2
Merge 8.7
Diffstat
-rw-r--r--generic/tclObj.c100
-rw-r--r--generic/tclPathObj.c9
-rw-r--r--generic/tclPkg.c32
-rw-r--r--generic/tclProc.c31
-rw-r--r--generic/tclProcess.c12
-rw-r--r--generic/tclRegexp.c3
-rw-r--r--generic/tclScan.c3
-rw-r--r--generic/tclStrToD.c18
-rw-r--r--generic/tclStringObj.c13
-rw-r--r--generic/tclTest.c810
-rw-r--r--generic/tclTestObj.c49
-rw-r--r--generic/tclTestProcBodyObj.c6
-rw-r--r--generic/tclThreadAlloc.c4
-rw-r--r--generic/tclThreadTest.c10
14 files changed, 360 insertions, 740 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 3c22dc7..c552ff3 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -750,7 +750,7 @@ TclContinuationsGet(
static void
TclThreadFinalizeContLines(
- ClientData dummy)
+ TCL_UNUSED(ClientData))
{
/*
* Release the hashtable tracking invisible continuation lines.
@@ -759,7 +759,6 @@ TclThreadFinalizeContLines(
ThreadSpecificData *tsdPtr = TclGetContLineTable();
Tcl_HashEntry *hPtr;
Tcl_HashSearch hSearch;
- (void)dummy;
for (hPtr = Tcl_FirstHashEntry(tsdPtr->lineCLPtr, &hSearch);
hPtr != NULL; hPtr = Tcl_NextHashEntry(&hSearch)) {
@@ -960,11 +959,11 @@ Tcl_ConvertToType(
*--------------------------------------------------------------
*/
+#if TCL_THREADS && defined(TCL_MEM_DEBUG)
void
TclDbDumpActiveObjects(
FILE *outFile)
{
-#if TCL_THREADS && defined(TCL_MEM_DEBUG)
Tcl_HashSearch hSearch;
Tcl_HashEntry *hPtr;
Tcl_HashTable *tablePtr;
@@ -989,10 +988,14 @@ TclDbDumpActiveObjects(
}
}
}
+}
#else
- (void)outFile;
-#endif
+void
+TclDbDumpActiveObjects(
+ TCL_UNUSED(FILE *))
+{
}
+#endif
/*
*----------------------------------------------------------------------
@@ -1162,14 +1165,9 @@ Tcl_DbNewObj(
Tcl_Obj *
Tcl_DbNewObj(
- const char *file, /* The name of the source file calling this
- * function; used for debugging. */
- int line) /* Line number in the source file; used for
- * debugging. */
+ TCL_UNUSED(const char *) /*file*/,
+ TCL_UNUSED(int) /*line*/)
{
- (void)file;
- (void)line;
-
return Tcl_NewObj();
}
#endif /* TCL_MEM_DEBUG */
@@ -2236,14 +2234,9 @@ Tcl_DbNewDoubleObj(
Tcl_Obj *
Tcl_DbNewDoubleObj(
double dblValue, /* Double used to initialize the object. */
- const char *file, /* The name of the source file calling this
- * function; used for debugging. */
- int line) /* Line number in the source file; used for
- * debugging. */
+ TCL_UNUSED(const char *) /*file*/,
+ TCL_UNUSED(int) /*line*/)
{
- (void)file;
- (void)line;
-
return Tcl_NewDoubleObj(dblValue);
}
#endif /* TCL_MEM_DEBUG */
@@ -2728,14 +2721,9 @@ Tcl_DbNewWideIntObj(
Tcl_WideInt wideValue,
/* Long integer used to initialize the new
* object. */
- const char *file, /* The name of the source file calling this
- * function; used for debugging. */
- int line) /* Line number in the source file; used for
- * debugging. */
+ TCL_UNUSED(const char *) /*file*/,
+ TCL_UNUSED(int) /*line*/)
{
- (void)file;
- (void)line;
-
return Tcl_NewWideIntObj(wideValue);
}
#endif /* TCL_MEM_DEBUG */
@@ -3113,12 +3101,9 @@ Tcl_DbNewBignumObj(
Tcl_Obj *
Tcl_DbNewBignumObj(
void *bignumValue,
- const char *file,
- int line)
+ TCL_UNUSED(const char *) /*file*/,
+ TCL_UNUSED(int) /*line*/)
{
- (void)file;
- (void)line;
-
return Tcl_NewBignumObj(bignumValue);
}
#endif
@@ -3502,6 +3487,7 @@ Tcl_IsShared(
*----------------------------------------------------------------------
*/
+#ifdef TCL_MEM_DEBUG
void
Tcl_DbIncrRefCount(
Tcl_Obj *objPtr, /* The object we are registering a reference
@@ -3511,7 +3497,6 @@ Tcl_DbIncrRefCount(
int line) /* Line number in the source file; used for
* debugging. */
{
-#ifdef TCL_MEM_DEBUG
if (objPtr->refCount == 0x61616161) {
fprintf(stderr, "file = %s, line = %d\n", file, line);
fflush(stderr);
@@ -3540,12 +3525,19 @@ Tcl_DbIncrRefCount(
}
}
# endif /* TCL_THREADS */
-#else
- (void)file;
- (void)line;
-#endif /* TCL_MEM_DEBUG */
++(objPtr)->refCount;
}
+#else /* !TCL_MEM_DEBUG */
+void
+Tcl_DbIncrRefCount(
+ Tcl_Obj *objPtr, /* The object we are registering a reference
+ * to. */
+ TCL_UNUSED(const char *) /*file*/,
+ TCL_UNUSED(int) /*line*/)
+{
+ ++(objPtr)->refCount;
+}
+#endif /* TCL_MEM_DEBUG */
/*
*----------------------------------------------------------------------
@@ -3568,6 +3560,7 @@ Tcl_DbIncrRefCount(
*----------------------------------------------------------------------
*/
+#ifdef TCL_MEM_DEBUG
void
Tcl_DbDecrRefCount(
Tcl_Obj *objPtr, /* The object we are releasing a reference
@@ -3577,7 +3570,6 @@ Tcl_DbDecrRefCount(
int line) /* Line number in the source file; used for
* debugging. */
{
-#ifdef TCL_MEM_DEBUG
if (objPtr->refCount == 0x61616161) {
fprintf(stderr, "file = %s, line = %d\n", file, line);
fflush(stderr);
@@ -3606,15 +3598,24 @@ Tcl_DbDecrRefCount(
}
}
# endif /* TCL_THREADS */
-#else
- (void)file;
- (void)line;
-#endif /* TCL_MEM_DEBUG */
if (objPtr->refCount-- <= 1) {
TclFreeObj(objPtr);
}
}
+#else /* !TCL_MEM_DEBUG */
+void
+Tcl_DbDecrRefCount(
+ Tcl_Obj *objPtr, /* The object we are releasing a reference
+ * to. */
+ TCL_UNUSED(const char *) /*file*/,
+ TCL_UNUSED(int) /*line*/)
+{
+ if (objPtr->refCount-- <= 1) {
+ TclFreeObj(objPtr);
+ }
+}
+#endif /* TCL_MEM_DEBUG */
/*
*----------------------------------------------------------------------
@@ -3640,10 +3641,15 @@ Tcl_DbDecrRefCount(
int
Tcl_DbIsShared(
Tcl_Obj *objPtr, /* The object to test for being shared. */
+#ifdef TCL_MEM_DEBUG
const char *file, /* The name of the source file calling this
* function; used for debugging. */
int line) /* Line number in the source file; used for
* debugging. */
+#else
+ TCL_UNUSED(const char *) /*file*/,
+ TCL_UNUSED(int) /*line*/)
+#endif
{
#ifdef TCL_MEM_DEBUG
if (objPtr->refCount == 0x61616161) {
@@ -3674,9 +3680,6 @@ Tcl_DbIsShared(
}
}
# endif /* TCL_THREADS */
-#else
- (void)file;
- (void)line;
#endif /* TCL_MEM_DEBUG */
#ifdef TCL_COMPILE_STATS
@@ -3740,12 +3743,11 @@ Tcl_InitObjHashTable(
static Tcl_HashEntry *
AllocObjEntry(
- Tcl_HashTable *dummy, /* Hash table. */
+ TCL_UNUSED(Tcl_HashTable *),
void *keyPtr) /* Key to store in the hash table entry. */
{
Tcl_Obj *objPtr = (Tcl_Obj *)keyPtr;
Tcl_HashEntry *hPtr = (Tcl_HashEntry *)Tcl_Alloc(sizeof(Tcl_HashEntry));
- (void)dummy;
hPtr->key.objPtr = objPtr;
Tcl_IncrRefCount(objPtr);
@@ -3862,14 +3864,13 @@ TclFreeObjEntry(
TCL_HASH_TYPE
TclHashObjKey(
- Tcl_HashTable *dummy, /* Hash table. */
+ TCL_UNUSED(Tcl_HashTable *),
void *keyPtr) /* Key from which to compute hash value. */
{
Tcl_Obj *objPtr = (Tcl_Obj *)keyPtr;
const char *string = TclGetString(objPtr);
size_t length = objPtr->length;
TCL_HASH_TYPE result = 0;
- (void)dummy;
/*
* I tried a zillion different hash functions and asked many other people
@@ -4264,13 +4265,12 @@ SetCmdNameFromAny(
int
Tcl_RepresentationCmd(
- ClientData dummy,
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp,
int objc,
Tcl_Obj *const objv[])
{
Tcl_Obj *descObj;
- (void)dummy;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "value");
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 578c6ff..e475372 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -1384,14 +1384,13 @@ AppendPath(
Tcl_Obj *
TclFSMakePathRelative(
- Tcl_Interp *dummy, /* Used for error reporting if not NULL. */
+ TCL_UNUSED(Tcl_Interp *),
Tcl_Obj *pathPtr, /* The path we have. */
Tcl_Obj *cwdPtr) /* Make it relative to this. */
{
size_t cwdLen, len;
const char *tempStr;
Tcl_ObjIntRep *irPtr = TclFetchIntRep(pathPtr, &fsPathType);
- (void)dummy;
if (irPtr) {
FsPath *fsPathPtr = PATHOBJ(pathPtr);
@@ -1456,11 +1455,10 @@ TclFSMakePathRelative(
static int
MakePathFromNormalized(
- Tcl_Interp *dummy, /* Not used. */
+ TCL_UNUSED(Tcl_Interp *),
Tcl_Obj *pathPtr) /* The object to convert. */
{
FsPath *fsPathPtr;
- (void)dummy;
if (TclHasIntRep(pathPtr, &fsPathType)) {
return TCL_OK;
@@ -2514,9 +2512,8 @@ UpdateStringOfFsPath(
int
TclNativePathInFilesystem(
Tcl_Obj *pathPtr,
- ClientData *dummy)
+ TCL_UNUSED(ClientData *))
{
- (void)dummy;
/*
* A special case is required to handle the empty path "". This is a valid
* path (i.e. the user should be able to do 'file exists ""' without
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 9a72c66..25821f1 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -226,12 +226,11 @@ Tcl_PkgProvideEx(
static void
PkgFilesCleanupProc(
ClientData clientData,
- Tcl_Interp *dummy)
+ TCL_UNUSED(Tcl_Interp *))
{
PkgFiles *pkgFiles = (PkgFiles *) clientData;
Tcl_HashSearch search;
Tcl_HashEntry *entry;
- (void)dummy;
while (pkgFiles->names) {
PkgName *name = pkgFiles->names;
@@ -460,14 +459,13 @@ static int
PkgRequireCore(
ClientData data[],
Tcl_Interp *interp,
- int result)
+ TCL_UNUSED(int))
{
const char *name = (const char *)data[0];
int reqc = PTR2INT(data[1]);
Tcl_Obj **reqv = (Tcl_Obj **)data[2];
int code = CheckAllRequirements(interp, reqc, reqv);
Require *reqPtr;
- (void)result;
if (code != TCL_OK) {
return code;
@@ -492,7 +490,7 @@ static int
PkgRequireCoreStep1(
ClientData data[],
Tcl_Interp *interp,
- int result)
+ TCL_UNUSED(int))
{
Tcl_DString command;
char *script;
@@ -500,7 +498,6 @@ PkgRequireCoreStep1(
int reqc = PTR2INT(data[1]);
Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
const char *name = reqPtr->name /* Name of desired package. */;
- (void)result;
/*
* If we've got the package in the DB already, go on to actually loading
@@ -587,7 +584,7 @@ static int
PkgRequireCoreFinal(
ClientData data[],
Tcl_Interp *interp,
- int result)
+ TCL_UNUSED(int))
{
Require *reqPtr = (Require *)data[0];
int reqc = PTR2INT(data[1]), satisfies;
@@ -595,7 +592,6 @@ PkgRequireCoreFinal(
char *pkgVersionI;
void *clientDataPtr = reqPtr->clientDataPtr;
const char *name = reqPtr->name; /* Name of desired package. */
- (void)result;
if (reqPtr->pkgPtr->version == NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -639,11 +635,9 @@ PkgRequireCoreFinal(
static int
PkgRequireCoreCleanup(
ClientData data[],
- Tcl_Interp *dummy,
+ TCL_UNUSED(Tcl_Interp *),
int result)
{
- (void)dummy;
-
Tcl_Free(data[0]);
return result;
}
@@ -652,7 +646,7 @@ static int
SelectPackage(
ClientData data[],
Tcl_Interp *interp,
- int result)
+ TCL_UNUSED(int))
{
PkgAvail *availPtr, *bestPtr, *bestStablePtr;
char *availVersion, *bestVersion, *bestStableVersion;
@@ -664,7 +658,6 @@ SelectPackage(
const char *name = reqPtr->name;
Package *pkgPtr = reqPtr->pkgPtr;
Interp *iPtr = (Interp *) interp;
- (void)result;
/*
* Check whether we're already attempting to load some version of this
@@ -1059,20 +1052,18 @@ Tcl_PkgPresentEx(
*/
int
Tcl_PackageObjCmd(
- ClientData dummy, /* Not used. */
+ ClientData clientData,
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
- (void)dummy;
-
- return Tcl_NRCallObjProc(interp, TclNRPackageObjCmd, NULL, objc, objv);
+ return Tcl_NRCallObjProc(interp, TclNRPackageObjCmd, clientData, objc, objv);
}
/* ARGSUSED */
int
TclNRPackageObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -1098,7 +1089,6 @@ TclNRPackageObjCmd(
const char *argv2, *argv3, *argv4;
char *iva = NULL, *ivb = NULL;
Tcl_Obj *objvListPtr, **newObjvPtr;
- (void)dummy;
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
@@ -1548,11 +1538,9 @@ TclNRPackageObjCmd(
static int
TclNRPackageObjCmdCleanup(
ClientData data[],
- Tcl_Interp *dummy,
+ TCL_UNUSED(Tcl_Interp *),
int result)
{
- (void)dummy;
-
TclDecrRefCount((Tcl_Obj *) data[0]);
TclDecrRefCount((Tcl_Obj *) data[1]);
return result;
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 09821ae..f78027a 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -34,8 +34,7 @@ typedef struct {
static void DupLambdaInternalRep(Tcl_Obj *objPtr,
Tcl_Obj *copyPtr);
static void FreeLambdaInternalRep(Tcl_Obj *objPtr);
-static int InitArgsAndLocals(Tcl_Interp *interp,
- Tcl_Obj *procNameObj, int skip);
+static int InitArgsAndLocals(Tcl_Interp *interp, int skip);
static void InitResolvedLocals(Tcl_Interp *interp,
ByteCode *codePtr, Var *defPtr,
Namespace *nsPtr);
@@ -152,7 +151,7 @@ static const Tcl_ObjType lambdaType = {
/* ARGSUSED */
int
Tcl_ProcObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -163,7 +162,6 @@ Tcl_ProcObjCmd(
const char *simpleName, *procArgs, *procBody;
Namespace *nsPtr, *altNsPtr, *cxtNsPtr;
Tcl_Command cmd;
- (void)dummy;
if (objc != 4) {
Tcl_WrongNumArgs(interp, 1, objv, "name args body");
@@ -199,8 +197,8 @@ Tcl_ProcObjCmd(
* Create the data structure to represent the procedure.
*/
- if (TclCreateProc(interp, nsPtr, simpleName, objv[2], objv[3],
- &procPtr) != TCL_OK) {
+ if (TclCreateProc(interp, /*ignored nsPtr*/ NULL, simpleName, objv[2],
+ objv[3], &procPtr) != TCL_OK) {
Tcl_AddErrorInfo(interp, "\n (creating proc \"");
Tcl_AddErrorInfo(interp, simpleName);
Tcl_AddErrorInfo(interp, "\")");
@@ -398,7 +396,7 @@ Tcl_ProcObjCmd(
int
TclCreateProc(
Tcl_Interp *interp, /* Interpreter containing proc. */
- Namespace *nsPtr, /* Namespace containing this proc. */
+ TCL_UNUSED(Namespace *) /*nsPtr*/,
const char *procName, /* Unqualified name of this proc. */
Tcl_Obj *argsPtr, /* Description of arguments. */
Tcl_Obj *bodyPtr, /* Command body. */
@@ -411,7 +409,6 @@ TclCreateProc(
CompiledLocal *localPtr = NULL;
Tcl_Obj **argArray;
int precompiled = 0;
- (void)nsPtr;
ProcGetIntRep(bodyPtr, procPtr);
if (procPtr != NULL) {
@@ -890,17 +887,17 @@ Uplevel_Callback(
/* ARGSUSED */
int
Tcl_UplevelObjCmd(
- ClientData dummy, /* Not used. */
+ ClientData clientData,
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
- return Tcl_NRCallObjProc(interp, TclNRUplevelObjCmd, dummy, objc, objv);
+ return Tcl_NRCallObjProc(interp, TclNRUplevelObjCmd, clientData, objc, objv);
}
int
TclNRUplevelObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -912,7 +909,6 @@ TclNRUplevelObjCmd(
int result;
CallFrame *savedVarFramePtr, *framePtr;
Tcl_Obj *objPtr;
- (void)dummy;
if (objc < 2) {
uplevelSyntax:
@@ -1322,7 +1318,6 @@ static int
InitArgsAndLocals(
Tcl_Interp *interp,/* Interpreter in which procedure was
* invoked. */
- Tcl_Obj *procNameObj, /* Procedure name for error reporting. */
int skip) /* Number of initial arguments to be skipped,
* i.e., words in the "command name". */
{
@@ -1332,7 +1327,6 @@ InitArgsAndLocals(
Var *varPtr, *defPtr;
int localCt = procPtr->numCompiledLocals, numArgs, argCt, i, imax;
Tcl_Obj *const *argObjs;
- (void)procNameObj;
ByteCodeGetIntRep(procPtr->bodyPtr, &tclByteCodeType, codePtr);
@@ -1646,7 +1640,7 @@ TclNRInterpProcCore(
CallFrame *freePtr;
ByteCode *codePtr;
- result = InitArgsAndLocals(interp, procNameObj, skip);
+ result = InitArgsAndLocals(interp, skip);
if (result != TCL_OK) {
freePtr = iPtr->framePtr;
Tcl_PopCallFrame(interp); /* Pop but do not free. */
@@ -2575,17 +2569,17 @@ TclGetLambdaFromObj(
int
Tcl_ApplyObjCmd(
- ClientData dummy, /* Not used. */
+ ClientData clientData,
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
- return Tcl_NRCallObjProc(interp, TclNRApplyObjCmd, dummy, objc, objv);
+ return Tcl_NRCallObjProc(interp, TclNRApplyObjCmd, clientData, objc, objv);
}
int
TclNRApplyObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -2595,7 +2589,6 @@ TclNRApplyObjCmd(
int result;
Tcl_Namespace *nsPtr;
ApplyExtraData *extraPtr;
- (void)dummy;
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "lambdaExpr ?arg ...?");
diff --git a/generic/tclProcess.c b/generic/tclProcess.c
index 5647c65..d9b57bb 100644
--- a/generic/tclProcess.c
+++ b/generic/tclProcess.c
@@ -402,7 +402,7 @@ BuildProcessStatusObj(
static int
ProcessListObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -411,7 +411,6 @@ ProcessListObjCmd(
Tcl_HashEntry *entry;
Tcl_HashSearch search;
ProcessInfo *info;
- (void)dummy;
if (objc != 1) {
Tcl_WrongNumArgs(interp, 1, objv, NULL);
@@ -454,7 +453,7 @@ ProcessListObjCmd(
static int
ProcessStatusObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -476,7 +475,6 @@ ProcessStatusObjCmd(
enum switches {
STATUS_WAIT, STATUS_LAST
};
- (void)dummy;
while (objc > 1) {
if (TclGetString(objv[1])[0] != '-') {
@@ -603,7 +601,7 @@ ProcessStatusObjCmd(
static int
ProcessPurgeObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -616,7 +614,6 @@ ProcessPurgeObjCmd(
int result;
int i;
int pid;
- (void)dummy;
if (objc != 1 && objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "?pids?");
@@ -704,12 +701,11 @@ ProcessPurgeObjCmd(
static int
ProcessAutopurgeObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
- (void)dummy;
if (objc != 1 && objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "?flag?");
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index a21f4d7..0ddb65d 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -1052,12 +1052,11 @@ FreeRegexp(
static void
FinalizeRegexp(
- ClientData dummy) /* Not used. */
+ TCL_UNUSED(ClientData))
{
int i;
TclRegexp *regexpPtr;
ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
- (void)dummy;
for (i = 0; (i < NUM_REGEXPS) && (tsdPtr->patterns[i] != NULL); i++) {
regexpPtr = tsdPtr->regexps[i];
diff --git a/generic/tclScan.c b/generic/tclScan.c
index e30267b..4a37cf1 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -565,7 +565,7 @@ ValidateFormat(
/* ARGSUSED */
int
Tcl_ScanObjCmd(
- ClientData dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -581,7 +581,6 @@ Tcl_ScanObjCmd(
Tcl_UniChar ch = 0, sch = 0;
Tcl_Obj **objs = NULL, *objPtr = NULL;
int flags;
- (void)dummy;
if (objc < 3) {
Tcl_WrongNumArgs(interp, 1, objv,
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 68a3c4e..94d378a 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -328,7 +328,7 @@ static void CastOutPowersOf2(int *, int *, int *);
static char * ShorteningInt64Conversion(Double *, Tcl_WideUInt,
int, int, int, int, int, int, int, int, int,
int, int, int *, char **);
-static char * StrictInt64Conversion(Double *, Tcl_WideUInt,
+static char * StrictInt64Conversion(Tcl_WideUInt,
int, int, int, int, int, int,
int, int, int *, char **);
static int ShouldBankerRoundUpPowD(mp_int *, int, int);
@@ -340,7 +340,7 @@ static char * ShorteningBignumConversionPowD(Double *dPtr,
int sd, int k, int len,
int ilim, int ilim1, int *decpt,
char **endPtr);
-static char * StrictBignumConversionPowD(Double *dPtr,
+static char * StrictBignumConversionPowD(
Tcl_WideUInt bw, int b2, int b5,
int sd, int k, int len,
int ilim, int ilim1, int *decpt,
@@ -354,7 +354,7 @@ static char * ShorteningBignumConversion(Double *dPtr,
int s2, int s5, int k, int len,
int ilim, int ilim1, int *decpt,
char **endPtr);
-static char * StrictBignumConversion(Double *dPtr,
+static char * StrictBignumConversion(
Tcl_WideUInt bw, int b2,
int s2, int s5, int k, int len,
int ilim, int ilim1, int *decpt,
@@ -3117,7 +3117,6 @@ ShorteningInt64Conversion(
static inline char *
StrictInt64Conversion(
- Double *dPtr, /* Original number to convert. */
Tcl_WideUInt bw, /* Integer significand. */
int b2, int b5, /* Scale factor for the significand in the
* numerator. */
@@ -3142,7 +3141,6 @@ StrictInt64Conversion(
int digit; /* Current output digit. */
char *s = retval; /* Cursor in the output buffer. */
int i; /* Current position in the output buffer. */
- (void)dPtr;
/*
* Adjust if the logarithm was guessed wrong.
@@ -3526,7 +3524,6 @@ ShorteningBignumConversionPowD(
static inline char *
StrictBignumConversionPowD(
- Double *dPtr, /* Original number to convert. */
Tcl_WideUInt bw, /* Integer significand. */
int b2, int b5, /* Scale factor for the significand in the
* numerator. */
@@ -3548,7 +3545,6 @@ StrictBignumConversionPowD(
char *s = retval; /* Cursor in the output buffer. */
int i; /* Index in the output buffer. */
mp_err err;
- (void)dPtr;
/*
* b = bw * 2**b2 * 5**b5
@@ -3965,7 +3961,6 @@ ShorteningBignumConversion(
static inline char *
StrictBignumConversion(
- Double *dPtr, /* Original number being converted. */
Tcl_WideUInt bw, /* Integer significand and exponent. */
int b2, /* Scale factor for the significand. */
int s2, int s5, /* Scale factors for denominator. */
@@ -3986,7 +3981,6 @@ StrictBignumConversion(
int g; /* Size of the current digit ground. */
int i, j;
mp_err err;
- (void)dPtr;
/*
* b = bw * 2**b2 * 5**b5
@@ -4405,7 +4399,7 @@ TclDoubleDigits(
* operations.
*/
- return StrictInt64Conversion(&d, bw, b2, b5, s2, s5, k,
+ return StrictInt64Conversion(bw, b2, b5, s2, s5, k,
len, ilim, ilim1, decpt, endPtr);
} else if (s5 == 0) {
/*
@@ -4422,7 +4416,7 @@ TclDoubleDigits(
b2 += delta;
s2 += delta;
}
- return StrictBignumConversionPowD(&d, bw, b2, b5,
+ return StrictBignumConversionPowD(bw, b2, b5,
s2/MP_DIGIT_BIT, k, len, ilim, ilim1, decpt, endPtr);
} else {
/*
@@ -4432,7 +4426,7 @@ TclDoubleDigits(
* fewer mp_int divisions.
*/
- return StrictBignumConversion(&d, bw, b2, s2, s5, k,
+ return StrictBignumConversion(bw, b2, s2, s5, k,
len, ilim, ilim1, decpt, endPtr);
}
}
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index da391dc..f73f4f4 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -332,14 +332,9 @@ Tcl_DbNewStringObj(
size_t length, /* The number of bytes to copy from "bytes"
* when initializing the new object. If -1,
* use bytes up to the first NUL byte. */
- const char *file, /* The name of the source file calling this
- * function; used for debugging. */
- int line) /* Line number in the source file; used for
- * debugging. */
+ TCL_UNUSED(const char *) /*file*/,
+ TCL_UNUSED(int) /*line*/)
{
- (void)file;
- (void)line;
-
return Tcl_NewStringObj(bytes, length);
}
#endif /* TCL_MEM_DEBUG */
@@ -4059,11 +4054,9 @@ DupStringInternalRep(
static int
SetStringFromAny(
- Tcl_Interp *dummy, /* Not used. */
+ TCL_UNUSED(Tcl_Interp *),
Tcl_Obj *objPtr) /* The object to convert. */
{
- (void)dummy;
-
if (!TclHasIntRep(objPtr, &tclStringType)) {
String *stringPtr = stringAlloc(0);
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?");
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 98d1a15..a31f7d0 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -34,23 +34,14 @@ static int CheckIfVarUnset(Tcl_Interp *interp, Tcl_Obj **varPtr, int varIndex);
static int GetVariableIndex(Tcl_Interp *interp,
const char *string, int *indexPtr);
static void SetVarToObj(Tcl_Obj **varPtr, int varIndex, Tcl_Obj *objPtr);
-static int TestbignumobjCmd(void *dummy, Tcl_Interp *interp,
- int objc, Tcl_Obj *const objv[]);
-static int TestbooleanobjCmd(void *dummy,
- Tcl_Interp *interp, int objc,
- Tcl_Obj *const objv[]);
-static int TestdoubleobjCmd(void *dummy, Tcl_Interp *interp,
- int objc, Tcl_Obj *const objv[]);
-static int TestindexobjCmd(void *dummy, Tcl_Interp *interp,
- int objc, Tcl_Obj *const objv[]);
-static int TestintobjCmd(void *dummy, Tcl_Interp *interp,
- int objc, Tcl_Obj *const objv[]);
-static int TestlistobjCmd(void *dummy, Tcl_Interp *interp,
- int objc, Tcl_Obj *const objv[]);
-static int TestobjCmd(void *dummy, Tcl_Interp *interp,
- int objc, Tcl_Obj *const objv[]);
-static int TeststringobjCmd(void *dummy, Tcl_Interp *interp,
- int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc TestbignumobjCmd;
+static Tcl_ObjCmdProc TestbooleanobjCmd;
+static Tcl_ObjCmdProc TestdoubleobjCmd;
+static Tcl_ObjCmdProc TestindexobjCmd;
+static Tcl_ObjCmdProc TestintobjCmd;
+static Tcl_ObjCmdProc TestlistobjCmd;
+static Tcl_ObjCmdProc TestobjCmd;
+static Tcl_ObjCmdProc TeststringobjCmd;
#define VARPTR_KEY "TCLOBJTEST_VARPTR"
#define NUMBER_OF_OBJECT_VARS 20
@@ -150,7 +141,7 @@ TclObjTest_Init(
static int
TestbignumobjCmd(
- void *dummy, /* unused */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Tcl interpreter */
int objc, /* Argument count */
Tcl_Obj *const objv[]) /* Argument vector */
@@ -166,7 +157,6 @@ TestbignumobjCmd(
const char *string;
mp_int bignumValue;
Tcl_Obj **varPtr;
- (void)dummy;
if (objc < 3) {
Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
@@ -350,7 +340,7 @@ TestbignumobjCmd(
static int
TestbooleanobjCmd(
- void *dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -358,7 +348,6 @@ TestbooleanobjCmd(
int varIndex, boolValue;
const char *index, *subCmd;
Tcl_Obj **varPtr;
- (void)dummy;
if (objc < 3) {
wrongNumArgs:
@@ -451,7 +440,7 @@ TestbooleanobjCmd(
static int
TestdoubleobjCmd(
- void *dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -460,7 +449,6 @@ TestdoubleobjCmd(
double doubleValue;
const char *index, *subCmd, *string;
Tcl_Obj **varPtr;
- (void)dummy;
if (objc < 3) {
wrongNumArgs:
@@ -570,7 +558,7 @@ TestdoubleobjCmd(
static int
TestindexobjCmd(
- void *dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -588,7 +576,6 @@ TestindexobjCmd(
size_t index; /* Selected index into table. */
};
struct IndexRep *indexRep;
- (void)dummy;
if ((objc == 3) && (strcmp(Tcl_GetString(objv[1]),
"check") == 0)) {
@@ -661,7 +648,7 @@ TestindexobjCmd(
static int
TestintobjCmd(
- void *dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -670,7 +657,6 @@ TestintobjCmd(
Tcl_WideInt wideValue;
const char *index, *subCmd, *string;
Tcl_Obj **varPtr;
- (void)dummy;
if (objc < 3) {
wrongNumArgs:
@@ -866,7 +852,7 @@ TestintobjCmd(
static int
TestlistobjCmd(
- void *dummy, /* Not used */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Tcl interpreter */
int objc, /* Number of arguments */
Tcl_Obj *const objv[]) /* Argument objects */
@@ -889,7 +875,6 @@ TestlistobjCmd(
int first; /* First index in the list */
int count; /* Count of elements in a list */
Tcl_Obj **varPtr;
- (void)dummy;
if (objc < 3) {
Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg...?");
@@ -964,7 +949,7 @@ TestlistobjCmd(
static int
TestobjCmd(
- void *dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -973,7 +958,6 @@ TestobjCmd(
const char *index, *subCmd, *string;
const Tcl_ObjType *targetType;
Tcl_Obj **varPtr;
- (void)dummy;
if (objc < 2) {
wrongNumArgs:
@@ -1177,7 +1161,7 @@ TestobjCmd(
static int
TeststringobjCmd(
- void *dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -1193,7 +1177,6 @@ TeststringobjCmd(
"set", "set2", "setlength", "maxchars", "appendself",
"appendself2", NULL
};
- (void)dummy;
if (objc < 3) {
wrongNumArgs:
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index 76a4279..55e782f 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -228,7 +228,7 @@ ProcBodyTestInitInternal(
static int
ProcBodyTestProcObjCmd(
- void *dummy, /* context; not used */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* the current interpreter */
int objc, /* argument count */
Tcl_Obj *const objv[]) /* arguments */
@@ -240,7 +240,6 @@ ProcBodyTestProcObjCmd(
Tcl_Obj *bodyObjPtr;
Tcl_Obj *myobjv[5];
int result;
- (void)dummy;
if (objc != 4) {
Tcl_WrongNumArgs(interp, 1, objv, "newName argsList bodyName");
@@ -328,13 +327,12 @@ ProcBodyTestProcObjCmd(
static int
ProcBodyTestCheckObjCmd(
- void *dummy, /* context; not used */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* the current interpreter */
int objc, /* argument count */
Tcl_Obj *const objv[]) /* arguments */
{
const char *version;
- (void)dummy;
if (objc != 1) {
Tcl_WrongNumArgs(interp, 1, objv, "");
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index e151ddc..4c223ec 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -846,11 +846,9 @@ LockBucket(
static void
UnlockBucket(
- Cache *cachePtr,
+ TCL_UNUSED(Cache *),
int bucket)
{
- (void)cachePtr;
-
Tcl_MutexUnlock(bucketInfo[bucket].lockPtr);
}
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index f4687ea..f233b1e 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -206,7 +206,7 @@ TclThread_Init(
/* ARGSUSED */
static int
ThreadObjCmd(
- void *dummy, /* Not used. */
+ TCL_UNUSED(ClientData),
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
@@ -223,7 +223,6 @@ ThreadObjCmd(
THREAD_ID, THREAD_JOIN, THREAD_NAMES, THREAD_SEND,
THREAD_WAIT, THREAD_ERRORPROC
};
- (void)dummy;
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
@@ -1011,7 +1010,7 @@ ThreadCancel(
static int
ThreadEventProc(
Tcl_Event *evPtr, /* Really ThreadEvent */
- int mask)
+ TCL_UNUSED(int) /*mask*/)
{
ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
ThreadEvent *threadEventPtr = (ThreadEvent *) evPtr;
@@ -1019,7 +1018,6 @@ ThreadEventProc(
Tcl_Interp *interp = tsdPtr->interp;
int code;
const char *result, *errorCode, *errorInfo;
- (void)mask;
if (interp == NULL) {
code = TCL_ERROR;
@@ -1111,10 +1109,8 @@ ThreadFreeProc(
static int
ThreadDeleteEvent(
Tcl_Event *eventPtr, /* Really ThreadEvent */
- void *dummy) /* dummy */
+ TCL_UNUSED(ClientData))
{
- (void)dummy;
-
if (eventPtr->proc == ThreadEventProc) {
Tcl_Free(((ThreadEvent *) eventPtr)->script);
return 1;
generated by cgit v0.12 at 2025-12-09 19:55:47 (GMT)