diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-11-16 15:04:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-11-16 15:04:10 (GMT) |
| commit | 16483765baae1e041496f1abdd615844ca08dba8 (patch) | |
| tree | da7bc7e3d61ec8cbde015a28bdc6d92fded02a1b /unix/tclUnixInit.c | |
| parent | 9b461748a00c4ac031b5c01d99daa9e1b9171f05 (diff) | |
| parent | 0dd529776d4895043aa957a1e7f21d4015733c4e (diff) | |
| download | tcl-16483765baae1e041496f1abdd615844ca08dba8.zip tcl-16483765baae1e041496f1abdd615844ca08dba8.tar.gz tcl-16483765baae1e041496f1abdd615844ca08dba8.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 31177a3..1e35b92 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -453,7 +453,7 @@ TclpInitPlatform(void) void TclpInitLibraryPath( char **valuePtr, - int *lengthPtr, + size_t *lengthPtr, Tcl_Encoding *encodingPtr) { #define LIBRARY_SIZE 32 @@ -542,9 +542,10 @@ TclpInitLibraryPath( Tcl_DStringFree(&buffer); *encodingPtr = Tcl_GetEncoding(NULL, NULL); - str = TclGetStringFromObj(pathPtr, lengthPtr); - *valuePtr = ckalloc((*lengthPtr) + 1); - memcpy(*valuePtr, str, (size_t)(*lengthPtr)+1); + str = TclGetString(pathPtr); + *lengthPtr = pathPtr->length; + *valuePtr = ckalloc(*lengthPtr + 1); + memcpy(*valuePtr, str, *lengthPtr + 1); Tcl_DecrRefCount(pathPtr); } |