diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-08 10:34:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-08 10:34:55 (GMT) |
| commit | 8234d8449ea1e7fc611e1cb8dc3f96f75ff21a1c (patch) | |
| tree | b4d529834d9a0918a35da3c1b8b599102b22193a /win/tclWinFile.c | |
| parent | d77e68b2f827f6a60267a519aa23a851feabaab7 (diff) | |
| parent | 7332635af1609ad38fa7021022dd79996b75144c (diff) | |
| download | tcl-8234d8449ea1e7fc611e1cb8dc3f96f75ff21a1c.zip tcl-8234d8449ea1e7fc611e1cb8dc3f96f75ff21a1c.tar.gz tcl-8234d8449ea1e7fc611e1cb8dc3f96f75ff21a1c.tar.bz2 | |
merge trunk
Diffstat (limited to 'win/tclWinFile.c')
| -rw-r--r-- | win/tclWinFile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 4b0b884..c840a46 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -935,7 +935,7 @@ TclpMatchInDirectory( int len; DWORD attr; WIN32_FILE_ATTRIBUTE_DATA data; - const char *str = Tcl_GetStringFromObj(norm,&len); + const char *str = TclGetStringFromObj(norm,&len); native = Tcl_FSGetNativePath(pathPtr); @@ -995,7 +995,7 @@ TclpMatchInDirectory( */ Tcl_DStringInit(&dsOrig); - dirName = Tcl_GetStringFromObj(fileNamePtr, &dirLength); + dirName = TclGetStringFromObj(fileNamePtr, &dirLength); Tcl_DStringAppend(&dsOrig, dirName, dirLength); lastChar = dirName[dirLength -1]; @@ -2689,7 +2689,7 @@ TclpObjNormalizePath( tmpPathPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), nextCheckpoint); Tcl_AppendToObj(tmpPathPtr, lastValidPathEnd, -1); - path = Tcl_GetStringFromObj(tmpPathPtr, &len); + path = TclGetStringFromObj(tmpPathPtr, &len); Tcl_SetStringObj(pathPtr, path, len); Tcl_DecrRefCount(tmpPathPtr); } else { @@ -2775,7 +2775,7 @@ TclWinVolumeRelativeNormalize( int cwdLen; const char *drive = - Tcl_GetStringFromObj(useThisCwd, &cwdLen); + TclGetStringFromObj(useThisCwd, &cwdLen); char drive_cur = path[0]; if (drive_cur >= 'a') { |