summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-10-05 04:27:38 (GMT)
committerhobbs <hobbs>2005-10-05 04:27:38 (GMT)
commitac08c2624bd5c89d68f61d6899b692051cf75fb1 (patch)
tree0ccf9071be7a2cf36c58d4661444b2b897a6d193
parent25bf089e2d2828dbd9700ac450feed10b2848e56 (diff)
downloadtcl-ac08c2624bd5c89d68f61d6899b692051cf75fb1.zip
tcl-ac08c2624bd5c89d68f61d6899b692051cf75fb1.tar.gz
tcl-ac08c2624bd5c89d68f61d6899b692051cf75fb1.tar.bz2
* generic/tclIOUtil.c (TclFSNormalizeAbsolutePath): make static
* generic/tclEncoding.c (TclFindEncodings): make static
-rw-r--r--ChangeLog3
-rw-r--r--generic/tclEncoding.c8
-rw-r--r--generic/tclIOUtil.c4
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e4cd96..817996d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-10-04 Jeff Hobbs <jeffh@ActiveState.com>
+ * generic/tclIOUtil.c (TclFSNormalizeAbsolutePath): make static
+ * generic/tclEncoding.c (TclFindEncodings): make static
+
* unix/tclLoadShl.c (TclpDlopen): use DYNAMIC_PATH on second
shl_load only. [Bug 1204237]
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index efe5905..6a8ae6e 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEncoding.c,v 1.16.2.7 2005/07/05 21:18:23 dgp Exp $
+ * RCS: @(#) $Id: tclEncoding.c,v 1.16.2.8 2005/10/05 04:27:38 hobbs Exp $
*/
#include "tclInt.h"
@@ -3058,7 +3058,7 @@ unilen(src)
*-------------------------------------------------------------------------
*/
-int
+static int
TclFindEncodings(argv0)
CONST char *argv0; /* Name of executable from argv[0] to main()
* in native multi-byte encoding. */
@@ -3093,7 +3093,7 @@ TclFindEncodings(argv0)
* convert the UTF string back to native before setting the new
* default encoding.
*/
-
+
pathPtr = TclGetLibraryPath();
if ((pathPtr != NULL) && mustCleanUtf) {
Tcl_UtfToExternalDString(NULL, Tcl_GetString(pathPtr), -1,
@@ -3105,7 +3105,7 @@ TclFindEncodings(argv0)
/*
* Now convert the native string back to UTF.
*/
-
+
if ((pathPtr != NULL) && mustCleanUtf) {
Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&libPath), -1,
&buffer);
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 2647a8b..50882ec 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,7 +17,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.21 2005/05/24 04:19:32 das Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.22 2005/10/05 04:27:38 hobbs Exp $
*/
#include "tclInt.h"
@@ -1319,7 +1319,7 @@ Tcl_FSData(fsPtr)
*
*---------------------------------------------------------------------------
*/
-Tcl_Obj*
+static Tcl_Obj *
TclFSNormalizeAbsolutePath(interp, pathPtr, clientDataPtr)
Tcl_Interp* interp; /* Interpreter to use */
Tcl_Obj *pathPtr; /* Absolute path to normalize */