diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-09-29 08:06:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-09-29 08:06:00 (GMT) |
| commit | 85cfbf4eb74e60060553bbf22ac1f96c29279ac5 (patch) | |
| tree | 93b3ee930c1467ef8ff7daceaf19636dda2270ff /unix/tclUnixInit.c | |
| parent | 6494c04deef9585c38b287b24f02c49c7efee95d (diff) | |
| parent | 5821708a49af0c4260a0ca87452b1eb8abd61e3e (diff) | |
| download | tcl-85cfbf4eb74e60060553bbf22ac1f96c29279ac5.zip tcl-85cfbf4eb74e60060553bbf22ac1f96c29279ac5.tar.gz tcl-85cfbf4eb74e60060553bbf22ac1f96c29279ac5.tar.bz2 | |
rebase with novem
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index bb6de90..7ae601d 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -461,7 +461,7 @@ TclpInitPlatform(void) void TclpInitLibraryPath( char **valuePtr, - int *lengthPtr, + size_t *lengthPtr, Tcl_Encoding *encodingPtr) { #define LIBRARY_SIZE 32 @@ -550,9 +550,10 @@ TclpInitLibraryPath( Tcl_DStringFree(&buffer); *encodingPtr = Tcl_GetEncoding(NULL, NULL); - str = Tcl_GetStringFromObj(pathPtr, lengthPtr); + str = Tcl_GetString(pathPtr); + *lengthPtr = pathPtr->length; *valuePtr = ckalloc((*lengthPtr) + 1); - memcpy(*valuePtr, str, (size_t)(*lengthPtr)+1); + memcpy(*valuePtr, str, (*lengthPtr)+1); Tcl_DecrRefCount(pathPtr); } |