Index: generic/nsfError.c =================================================================== diff -u -rcf0a4f3cb9de0734244a53d1d3cbd11531353214 -r3ffcbc1b5cf21f850b3dd486f9aa48c93f08e7a8 --- generic/nsfError.c (.../nsfError.c) (revision cf0a4f3cb9de0734244a53d1d3cbd11531353214) +++ generic/nsfError.c (.../nsfError.c) (revision 3ffcbc1b5cf21f850b3dd486f9aa48c93f08e7a8) @@ -314,21 +314,22 @@ */ int NsfUnexpectedArgumentError(Tcl_Interp *interp, CONST char *argumentString, - Nsf_Object *object, Nsf_Param CONST *paramPtr, Tcl_Obj *procNameObj) { + Nsf_Object *object, Nsf_Param CONST *paramPtr, + Tcl_Obj *methodNamePathObj) { Tcl_DString ds, *dsPtr = &ds; assert(interp); assert(argumentString); assert(paramPtr); - assert(procNameObj); + assert(methodNamePathObj); DSTRING_INIT(dsPtr); Tcl_DStringAppend(dsPtr, "invalid argument '", -1); Tcl_DStringAppend(dsPtr, argumentString, -1); Tcl_DStringAppend(dsPtr, "', maybe too many arguments;", -1); NsfArgumentError(interp, Tcl_DStringValue(dsPtr), paramPtr, object ? object->cmdName : NULL, - NsfMethodNamePath(interp, NULL /* use topmost frame */, NsfMethodName(procNameObj))); + methodNamePathObj); DSTRING_FREE(dsPtr); return TCL_ERROR; } @@ -354,15 +355,15 @@ Nsf_Object *object, Nsf_Param CONST *currentParamPtr, Nsf_Param CONST *paramPtr, - Tcl_Obj *procNameObj) { + Tcl_Obj *methodNamePathObj) { Tcl_DString ds, *dsPtr = &ds; Nsf_Param CONST *pPtr; assert(interp); assert(argumentString); assert(currentParamPtr); assert(paramPtr); - assert(procNameObj); + assert(methodNamePathObj); DSTRING_INIT(dsPtr); Tcl_DStringAppend(dsPtr, "invalid non-positional argument '", -1); @@ -380,7 +381,7 @@ NsfArgumentError(interp, Tcl_DStringValue(dsPtr), paramPtr, object ? object->cmdName : NULL, - NsfMethodNamePath(interp, NULL /* use topmost frame */, NsfMethodName(procNameObj))); + methodNamePathObj); DSTRING_FREE(dsPtr); return TCL_ERROR; }