summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-02-17 18:31:47 (GMT)
committerhobbs <hobbs>2005-02-17 18:31:47 (GMT)
commitd2ba200f0e2abc2b7002b7ace3f3bd9c45ee82ad (patch)
tree151e9345cf5e1928f66f36a9649fa2c9fea16b98
parentbd3023c7ce11cf502e195ab5ac43989eea35be78 (diff)
downloadtcl-d2ba200f0e2abc2b7002b7ace3f3bd9c45ee82ad.zip
tcl-d2ba200f0e2abc2b7002b7ace3f3bd9c45ee82ad.tar.gz
tcl-d2ba200f0e2abc2b7002b7ace3f3bd9c45ee82ad.tar.bz2
* win/tclWinFCmd.c (TraverseWinTree): use wcslen on wchar, not
Tcl_UniCharLen.
-rw-r--r--ChangeLog11
-rw-r--r--win/tclWinFCmd.c6
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 34f0e52..8977657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2005-02-17 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/tclWinFCmd.c (TraverseWinTree): use wcslen on wchar, not
+ Tcl_UniCharLen.
+
2005-02-16 Miguel Sofer <msofer@users.sf.net>
- * /doc/variable.n: fix for [Bug 1124160], variables are detected
+ * doc/variable.n: fix for [Bug 1124160], variables are detected
by [info vars] but not by [info locals].
2005-02-10 Jeff Hobbs <jeffh@ActiveState.com>
@@ -62,8 +67,8 @@
2005-01-25 Don Porter <dgp@users.sourceforge.net>
- * library/auto.tcl: Updated [auto_reset] to clear auto-loaded
- procs in namespaces other than :: [Bug 1101670].
+ * library/auto.tcl: Updated [auto_reset] to clear auto-loaded
+ procs in namespaces other than :: [Bug 1101670].
2005-01-25 Daniel Steffen <das@users.sourceforge.net>
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index e8033f9..29094c4 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinFCmd.c,v 1.35.2.2 2004/06/21 22:07:32 mdejong Exp $
+ * RCS: @(#) $Id: tclWinFCmd.c,v 1.35.2.3 2005/02/17 18:31:54 hobbs Exp $
*/
#include "tclWinInt.h"
@@ -1291,7 +1291,7 @@ TraverseWinTree(
}
}
nativeName = (TCHAR *) data.w.cFileName;
- len = Tcl_UniCharLen(data.w.cFileName) * sizeof(WCHAR);
+ len = wcslen(data.w.cFileName) * sizeof(WCHAR);
} else {
if ((strcmp(data.a.cFileName, ".") == 0)
|| (strcmp(data.a.cFileName, "..") == 0)) {
@@ -1356,7 +1356,7 @@ TraverseWinTree(
}
result = TCL_ERROR;
}
-
+
return result;
}