diff options
Diffstat (limited to 'generic/tclResolve.c')
| -rw-r--r-- | generic/tclResolve.c | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/generic/tclResolve.c b/generic/tclResolve.c index 8455793..974737e 100644 --- a/generic/tclResolve.c +++ b/generic/tclResolve.c @@ -10,8 +10,6 @@   *   * See the file "license.terms" for information on usage and redistribution of   * this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * RCS: @(#) $Id: tclResolve.c,v 1.11 2009/07/15 13:17:19 dkf Exp $   */  #include "tclInt.h" @@ -67,6 +65,7 @@ Tcl_AddInterpResolvers(  {      Interp *iPtr = (Interp *) interp;      ResolverScheme *resPtr; +    unsigned len;      /*       * Since we're adding a new name resolution scheme, we must force all code @@ -102,9 +101,10 @@ Tcl_AddInterpResolvers(       * list, so that it overrides existing schemes.       */ -    resPtr = (ResolverScheme *) ckalloc(sizeof(ResolverScheme)); -    resPtr->name = (char *) ckalloc((unsigned)(strlen(name) + 1)); -    strcpy(resPtr->name, name); +    resPtr = ckalloc(sizeof(ResolverScheme)); +    len = strlen(name) + 1; +    resPtr->name = ckalloc(len); +    memcpy(resPtr->name, name, len);      resPtr->cmdResProc = cmdProc;      resPtr->varResProc = varProc;      resPtr->compiledVarResProc = compiledVarProc; @@ -226,7 +226,7 @@ Tcl_RemoveInterpResolvers(  	*prevPtrPtr = resPtr->nextPtr;  	ckfree(resPtr->name); -	ckfree((char *) resPtr); +	ckfree(resPtr);  	return 1;      } @@ -294,7 +294,7 @@ BumpCmdRefEpochs(   *   *	Command resolution is handled by a function of the following type:   * - *	  typedef int (*Tcl_ResolveCmdProc)(Tcl_Interp *interp, + *	  typedef int (Tcl_ResolveCmdProc)(Tcl_Interp *interp,   *		  const char *name, Tcl_Namespace *context,   *		  int flags, Tcl_Command *rPtr);   * @@ -309,7 +309,7 @@ BumpCmdRefEpochs(   *	Variable resolution is handled by two functions. The first is called   *	whenever a variable needs to be resolved at compile time:   * - *	  typedef int (*Tcl_ResolveCompiledVarProc)(Tcl_Interp *interp, + *	  typedef int (Tcl_ResolveCompiledVarProc)(Tcl_Interp *interp,   *		  const char *name, Tcl_Namespace *context,   *		  Tcl_ResolvedVarInfo *rPtr);   * @@ -325,7 +325,7 @@ BumpCmdRefEpochs(   *	the variable may be requested via Tcl_FindNamespaceVar.) This function   *	has the following type:   * - *	  typedef int (*Tcl_ResolveVarProc)(Tcl_Interp *interp, + *	  typedef int (Tcl_ResolveVarProc)(Tcl_Interp *interp,   *		  const char *name, Tcl_Namespace *context,   *		  int flags, Tcl_Var *rPtr);   * | 
