diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-07 16:03:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-07 16:03:16 (GMT) |
| commit | 2c34ced219c028ad38fe079b9000f31049a0a42c (patch) | |
| tree | 4b5502463d16f3b5094ef9c11eea1deb97ec35dd /generic/tclOO.c | |
| parent | c4a1ea568ee92b0d890bb012f44b345c80f25fa8 (diff) | |
| parent | 467d03dbc94f1e8b6ec74da6ac0f54ce4975bf10 (diff) | |
| download | tcl-2c34ced219c028ad38fe079b9000f31049a0a42c.zip tcl-2c34ced219c028ad38fe079b9000f31049a0a42c.tar.gz tcl-2c34ced219c028ad38fe079b9000f31049a0a42c.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclOO.c')
| -rw-r--r-- | generic/tclOO.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/generic/tclOO.c b/generic/tclOO.c index 14a3343..7c7b93c 100644 --- a/generic/tclOO.c +++ b/generic/tclOO.c @@ -77,13 +77,10 @@ static inline void InitClassPath(Tcl_Interp * interp, Class *clsPtr); static void InitClassSystemRoots(Tcl_Interp *interp, Foundation *fPtr); static int InitFoundation(Tcl_Interp *interp); -static void KillFoundation(ClientData clientData, - Tcl_Interp *interp); +static Tcl_InterpDeleteProc KillFoundation; static void MyDeleted(ClientData clientData); static void ObjectNamespaceDeleted(ClientData clientData); -static void ObjectRenamedTrace(ClientData clientData, - Tcl_Interp *interp, const char *oldName, - const char *newName, int flags); +static Tcl_CommandTraceProc ObjectRenamedTrace; static inline void RemoveClass(Class **list, int num, int idx); static inline void RemoveObject(Object **list, int num, int idx); static inline void SquelchCachedName(Object *oPtr); @@ -569,13 +566,11 @@ DeletedHelpersNamespace( static void KillFoundation( - ClientData dummy, /* Pointer to the OO system foundation - * structure. */ - Tcl_Interp *interp) /* The interpreter containing the OO system - * foundation. */ + TCL_UNUSED(ClientData), + Tcl_Interp *interp) /* The interpreter containing the OO system + * foundation. */ { Foundation *fPtr = GetFoundation(interp); - (void)dummy; TclDecrRefCount(fPtr->unknownMethodNameObj); TclDecrRefCount(fPtr->constructorName); @@ -819,15 +814,12 @@ MyClassDeleted( static void ObjectRenamedTrace( ClientData clientData, /* The object being deleted. */ - Tcl_Interp *interp, /* The interpreter containing the object. */ - const char *oldName, /* What the object was (last) called. */ - const char *newName, /* What it's getting renamed to. (unused) */ + TCL_UNUSED(Tcl_Interp *), + TCL_UNUSED(const char *) /*oldName*/, + TCL_UNUSED(const char *) /*newName*/, int flags) /* Why was the object deleted? */ { Object *oPtr = (Object *)clientData; - (void)interp; - (void)oldName; - (void)newName; /* * If this is a rename and not a delete of the object, we just flush the @@ -2765,10 +2757,9 @@ TclOOObjectCmdCore( static int FinalizeObjectCall( ClientData data[], - Tcl_Interp *dummy, + TCL_UNUSED(Tcl_Interp *), int result) { - (void)dummy; /* * Dispose of the call chain, which drops the lock on the object's * structure. @@ -2927,11 +2918,10 @@ TclNRObjectContextInvokeNext( static int FinalizeNext( ClientData data[], - Tcl_Interp *dummy, + TCL_UNUSED(Tcl_Interp *), int result) { CallContext *contextPtr = (CallContext *)data[0]; - (void)dummy; /* * Restore the call chain context index as we've finished the inner invoke |