diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-11 08:25:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-11 08:25:14 (GMT) |
| commit | a17bf04dbaed1c0e4f72473b0032b735549a51d1 (patch) | |
| tree | 27b96c7f8d81950e5f01b2cff742b2064a67ffa6 /generic/tclObj.c | |
| parent | 259f659ad6c91b21b8d204dcb2582de218f9742c (diff) | |
| parent | 2120b2e775e349a97d6dff9aabb69ca9fff5444b (diff) | |
| download | tcl-a17bf04dbaed1c0e4f72473b0032b735549a51d1.zip tcl-a17bf04dbaed1c0e4f72473b0032b735549a51d1.tar.gz tcl-a17bf04dbaed1c0e4f72473b0032b735549a51d1.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclObj.c')
| -rw-r--r-- | generic/tclObj.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c index 1fc360d..382954f 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.c @@ -4,11 +4,11 @@ * This file contains Tcl object-related functions that are used by many * Tcl commands. * - * Copyright (c) 1995-1997 Sun Microsystems, Inc. - * Copyright (c) 1999 by Scriptics Corporation. - * Copyright (c) 2001 by ActiveState Corporation. - * Copyright (c) 2005 by Kevin B. Kenny. All rights reserved. - * Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net> + * Copyright © 1995-1997 Sun Microsystems, Inc. + * Copyright © 1999 Scriptics Corporation. + * Copyright © 2001 ActiveState Corporation. + * Copyright © 2005 Kevin B. Kenny. All rights reserved. + * Copyright © 2007 Daniel A. Steffen <das@users.sourceforge.net> * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. @@ -1653,7 +1653,7 @@ Tcl_GetString( /* *---------------------------------------------------------------------- * - * Tcl_GetStringFromObj/Tcl_GetStringFromObj2 -- + * Tcl_GetStringFromObj/TclGetStringFromObj -- * * Returns the string representation's byte array pointer and length for * an object. @@ -1713,8 +1713,9 @@ Tcl_GetStringFromObj( return objPtr->bytes; } +#undef TclGetStringFromObj char * -Tcl_GetStringFromObj2( +TclGetStringFromObj( Tcl_Obj *objPtr, /* Object whose string rep byte pointer should * be returned. */ size_t *lengthPtr) /* If non-NULL, the location where the string @@ -2238,7 +2239,7 @@ TclSetBooleanFromAny( badBoolean: if (interp != NULL) { int length; - const char *str = TclGetStringFromObj(objPtr, &length); + const char *str = Tcl_GetStringFromObj(objPtr, &length); Tcl_Obj *msg; TclNewLiteralStringObj(msg, "expected boolean value but got \""); @@ -4359,7 +4360,7 @@ TclHashObjKey( { Tcl_Obj *objPtr = (Tcl_Obj *)keyPtr; int length; - const char *string = TclGetStringFromObj(objPtr, &length); + const char *string = Tcl_GetStringFromObj(objPtr, &length); TCL_HASH_TYPE result = 0; /* |