diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-26 16:11:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-26 16:11:33 (GMT) |
| commit | 1d5118fd6cf705d79ec670284492d9eff6637965 (patch) | |
| tree | 3b7b3a88c8c9648f7e1a1e4e997155499fd8094e /generic/tclEncoding.c | |
| parent | acb9caa95921a281c8b7f34b030deb1c3049281c (diff) | |
| download | tcl-1d5118fd6cf705d79ec670284492d9eff6637965.zip tcl-1d5118fd6cf705d79ec670284492d9eff6637965.tar.gz tcl-1d5118fd6cf705d79ec670284492d9eff6637965.tar.bz2 | |
macros for Tcl_GetString and Tcl_GetStringFromObj
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 757f771..a5b4d74 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -3473,11 +3473,12 @@ unilen( static void InitializeEncodingSearchPath( char **valuePtr, - int *lengthPtr, + size_t *lengthPtr, Tcl_Encoding *encodingPtr) { const char *bytes; - int i, numDirs, numBytes; + int i, numDirs; + size_t numBytes; Tcl_Obj *libPathObj, *encodingObj, *searchPathObj; TclNewLiteralStringObj(encodingObj, "encoding"); @@ -3507,11 +3508,12 @@ InitializeEncodingSearchPath( if (*encodingPtr) { ((Encoding *)(*encodingPtr))->refCount++; } - bytes = Tcl_GetStringFromObj(searchPathObj, &numBytes); + bytes = Tcl_GetString(searchPathObj); + numBytes = searchPathObj->length; *lengthPtr = numBytes; *valuePtr = ckalloc(numBytes + 1); - memcpy(*valuePtr, bytes, (size_t) numBytes + 1); + memcpy(*valuePtr, bytes, numBytes + 1); Tcl_DecrRefCount(searchPathObj); } |