Attachment "dstring.patch" to
ticket [513947ffff]
added by
dgp
2002-02-07 03:22:40.
? solaris
? 403531.patch
? arrayTrace.patch
? tip22.patch
? getsobj.patch
? crtinterp.patch
? threads.patch
? alloc.patch
? filename.patch
? tip-22-33-45.patch3
? patch
? thread.patch
? tip68.patch
? tip-22-33-45.patch4
? global.patch
? tip73.patch
? GetTime.3
? preserve.patch
? vartrace.patch
? ctbug.patch
? stubcrash.patch
? liststring.patch
? source.file
? obj.patch
? pair.c
? pfsi.patch
? main.patch
? dstring.patch
? strtod.patch
? strtoul-2.patch
? dltest.patch
? build_tclsh.patch
? trace.patch
? tcltest-real.patch
? tcltest.patch
? errno.patch
? oldtip27.patch
? final.patch
? namesp.patch
? parse.patch
? load.patch
? unbalanced.patch
? interp.patch
? euro.patch
? index.patch
? io.patch
? tmp.patch
? ioutil.patch
? history.patch
? var.patch
? cmd.patch
? basic.patch
? big.patch
? delta.patch
? objtype.patch
? hash.patch
? exec.patch
? alias.patch
? socket.patch
? foo
? win32.patch
? mac.patch
? tilde.patch
? 506147.diff
? conf.patch
? last.patch
? pkg.patch
? fix.patch
? nonconst.patch
? 59-3.diff
? changes.ip
? compat/strtoul.c.try
? generic/assoc.patch
? generic/tclConfig.c
? generic/exh
? generic/tclPkgConfig.c
? generic/appiniterr.patch
? unix/tclMtherr.c.ip
Index: doc/DString.3
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/DString.3,v
retrieving revision 1.8
diff -u -r1.8 DString.3
--- doc/DString.3 2002/01/17 15:24:43 1.8
+++ doc/DString.3 2002/02/06 20:19:26
@@ -18,10 +18,10 @@
.sp
\fBTcl_DStringInit\fR(\fIdsPtr\fR)
.sp
-CONST char *
+char *
\fBTcl_DStringAppend\fR(\fIdsPtr, string, length\fR)
.sp
-CONST char *
+char *
\fBTcl_DStringAppendElement\fR(\fIdsPtr, string\fR)
.sp
\fBTcl_DStringStartSublist\fR(\fIdsPtr\fR)
Index: doc/Encoding.3
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/Encoding.3,v
retrieving revision 1.9
diff -u -r1.9 Encoding.3
--- doc/Encoding.3 2002/01/25 21:36:09 1.9
+++ doc/Encoding.3 2002/02/06 20:19:26
@@ -21,24 +21,24 @@
void
\fBTcl_FreeEncoding\fR(\fIencoding\fR)
.sp
-CONST char *
+char *
\fBTcl_ExternalToUtfDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
.sp
int
\fBTcl_ExternalToUtf\fR(\fIinterp, encoding, src, srcLen, flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr,
dstCharsPtr\fR)
.sp
-CONST char *
+char *
\fBTcl_UtfToExternalDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
.sp
int
\fBTcl_UtfToExternal\fR(\fIinterp, encoding, src, srcLen, flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr,
dstCharsPtr\fR)
.sp
-CONST char *
+char *
\fBTcl_WinTCharToUtf\fR(\fItsrc, srcLen, dstPtr\fR)
.sp
-CONST TCHAR *
+TCHAR *
\fBTcl_WinUtfToTChar\fR(\fIsrc, srcLen, dstPtr\fR)
.sp
CONST char *
Index: doc/GetCwd.3
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/GetCwd.3,v
retrieving revision 1.4
diff -u -r1.4 GetCwd.3
--- doc/GetCwd.3 2002/01/29 02:28:20 1.4
+++ doc/GetCwd.3 2002/02/06 20:19:26
@@ -15,7 +15,7 @@
.nf
\fB#include <tcl.h>\fR
.sp
-CONST char *
+char *
\fBTcl_GetCwd\fR(\fIinterp\fR, \fIbufferPtr\fR)
.sp
int
Index: doc/SplitPath.3
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/SplitPath.3,v
retrieving revision 1.5
diff -u -r1.5 SplitPath.3
--- doc/SplitPath.3 2002/01/25 20:40:55 1.5
+++ doc/SplitPath.3 2002/02/06 20:19:26
@@ -17,7 +17,7 @@
.sp
\fBTcl_SplitPath\fR(\fIpath, argcPtr, argvPtr\fR)
.sp
-CONST char *
+char *
\fBTcl_JoinPath\fR(\fIargc, argv, resultPtr\fR)
.sp
Tcl_PathType
Index: doc/Translate.3
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/Translate.3,v
retrieving revision 1.5
diff -u -r1.5 Translate.3
--- doc/Translate.3 2002/01/25 20:40:55 1.5
+++ doc/Translate.3 2002/02/06 20:19:26
@@ -16,7 +16,7 @@
.nf
\fB#include <tcl.h>\fR
.sp
-CONST char *
+char *
\fBTcl_TranslateFileName\fR(\fIinterp\fR, \fIname\fR, \fIbufferPtr\fR)
.SH ARGUMENTS
.AS Tcl_DString *bufferPtr
Index: doc/Utf.3
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/Utf.3,v
retrieving revision 1.11
diff -u -r1.11 Utf.3
--- doc/Utf.3 2002/01/17 03:03:10 1.11
+++ doc/Utf.3 2002/02/06 20:19:26
@@ -24,10 +24,10 @@
\fBTcl_UtfToUniChar\fR(\fIsrc, chPtr\fR)
.VS 8.4
.sp
-CONST char *
+char *
\fBTcl_UniCharToUtfDString\fR(\fIuniStr, numChars, dstPtr\fR)
.sp
-CONST Tcl_UniChar *
+Tcl_UniChar *
\fBTcl_UtfToUniCharDString\fR(\fIsrc, len, dstPtr\fR)
.VE 8.4
.sp
Index: generic/tcl.decls
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tcl.decls,v
retrieving revision 1.80
diff -u -r1.80 tcl.decls
--- generic/tcl.decls 2002/01/31 04:39:43 1.80
+++ generic/tcl.decls 2002/02/06 20:19:26
@@ -431,11 +431,11 @@
void Tcl_DoWhenIdle(Tcl_IdleProc *proc, ClientData clientData)
}
declare 117 generic {
- CONST char * Tcl_DStringAppend(Tcl_DString *dsPtr, CONST char *str, \
+ char * Tcl_DStringAppend(Tcl_DString *dsPtr, CONST char *str, \
int length)
}
declare 118 generic {
- CONST char * Tcl_DStringAppendElement(Tcl_DString *dsPtr, \
+ char * Tcl_DStringAppendElement(Tcl_DString *dsPtr, \
CONST char *string)
}
declare 119 generic {
@@ -663,7 +663,7 @@
}
# Obsolete, use Tcl_FSJoinPath
declare 186 generic {
- CONST char * Tcl_JoinPath(int argc, CONST84 char * CONST *argv,
+ char * Tcl_JoinPath(int argc, CONST84 char * CONST *argv,
Tcl_DString *resultPtr)
}
declare 187 generic {
@@ -878,7 +878,7 @@
int flags, Tcl_VarTraceProc *proc, ClientData clientData)
}
declare 249 generic {
- CONST char * Tcl_TranslateFileName(Tcl_Interp *interp, CONST char *name, \
+ char * Tcl_TranslateFileName(Tcl_Interp *interp, CONST char *name, \
Tcl_DString *bufferPtr)
}
declare 250 generic {
@@ -1062,7 +1062,7 @@
int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
}
declare 296 generic {
- CONST char * Tcl_ExternalToUtfDString(Tcl_Encoding encoding, \
+ char * Tcl_ExternalToUtfDString(Tcl_Encoding encoding, \
CONST char *src, int srcLen, Tcl_DString *dsPtr)
}
declare 297 generic {
@@ -1184,7 +1184,7 @@
int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
}
declare 333 generic {
- CONST char * Tcl_UtfToExternalDString(Tcl_Encoding encoding, \
+ char * Tcl_UtfToExternalDString(Tcl_Encoding encoding, \
CONST char *src, int srcLen, Tcl_DString *dsPtr)
}
declare 334 generic {
@@ -1249,7 +1249,7 @@
unsigned long n)
}
declare 354 generic {
- CONST char * Tcl_UniCharToUtfDString(CONST Tcl_UniChar *string, \
+ char * Tcl_UniCharToUtfDString(CONST Tcl_UniChar *string, \
int numChars, Tcl_DString *dsPtr)
}
declare 355 generic {
@@ -1294,7 +1294,7 @@
# These 4 functions are obsolete, use Tcl_FSGetCwd, Tcl_FSChdir,
# Tcl_FSAccess and Tcl_FSStat
declare 365 generic {
- CONST char *Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
+ char *Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
}
declare 366 generic {
int Tcl_Chdir(CONST char *dirName)
@@ -1713,11 +1713,11 @@
# Added in Tcl 8.1
declare 0 win {
- CONST TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, \
+ TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, \
Tcl_DString *dsPtr)
}
declare 1 win {
- CONST char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, \
+ char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, \
Tcl_DString *dsPtr)
}
Index: generic/tclDecls.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclDecls.h,v
retrieving revision 1.80
diff -u -r1.80 tclDecls.h
--- generic/tclDecls.h 2002/01/31 04:39:43 1.80
+++ generic/tclDecls.h 2002/02/06 20:19:28
@@ -403,10 +403,10 @@
EXTERN void Tcl_DoWhenIdle _ANSI_ARGS_((Tcl_IdleProc * proc,
ClientData clientData));
/* 117 */
-EXTERN CONST char * Tcl_DStringAppend _ANSI_ARGS_((Tcl_DString * dsPtr,
+EXTERN char * Tcl_DStringAppend _ANSI_ARGS_((Tcl_DString * dsPtr,
CONST char * str, int length));
/* 118 */
-EXTERN CONST char * Tcl_DStringAppendElement _ANSI_ARGS_((
+EXTERN char * Tcl_DStringAppendElement _ANSI_ARGS_((
Tcl_DString * dsPtr, CONST char * string));
/* 119 */
EXTERN void Tcl_DStringEndSublist _ANSI_ARGS_((
@@ -599,7 +599,7 @@
/* 185 */
EXTERN int Tcl_IsSafe _ANSI_ARGS_((Tcl_Interp * interp));
/* 186 */
-EXTERN CONST char * Tcl_JoinPath _ANSI_ARGS_((int argc,
+EXTERN char * Tcl_JoinPath _ANSI_ARGS_((int argc,
CONST84 char * CONST * argv,
Tcl_DString * resultPtr));
/* 187 */
@@ -807,7 +807,7 @@
Tcl_VarTraceProc * proc,
ClientData clientData));
/* 249 */
-EXTERN CONST char * Tcl_TranslateFileName _ANSI_ARGS_((
+EXTERN char * Tcl_TranslateFileName _ANSI_ARGS_((
Tcl_Interp * interp, CONST char * name,
Tcl_DString * bufferPtr));
/* 250 */
@@ -962,7 +962,7 @@
int dstLen, int * srcReadPtr,
int * dstWrotePtr, int * dstCharsPtr));
/* 296 */
-EXTERN CONST char * Tcl_ExternalToUtfDString _ANSI_ARGS_((
+EXTERN char * Tcl_ExternalToUtfDString _ANSI_ARGS_((
Tcl_Encoding encoding, CONST char * src,
int srcLen, Tcl_DString * dsPtr));
/* 297 */
@@ -1072,7 +1072,7 @@
int dstLen, int * srcReadPtr,
int * dstWrotePtr, int * dstCharsPtr));
/* 333 */
-EXTERN CONST char * Tcl_UtfToExternalDString _ANSI_ARGS_((
+EXTERN char * Tcl_UtfToExternalDString _ANSI_ARGS_((
Tcl_Encoding encoding, CONST char * src,
int srcLen, Tcl_DString * dsPtr));
/* 334 */
@@ -1121,7 +1121,7 @@
EXTERN int Tcl_UniCharNcmp _ANSI_ARGS_((CONST Tcl_UniChar * cs,
CONST Tcl_UniChar * ct, unsigned long n));
/* 354 */
-EXTERN CONST char * Tcl_UniCharToUtfDString _ANSI_ARGS_((
+EXTERN char * Tcl_UniCharToUtfDString _ANSI_ARGS_((
CONST Tcl_UniChar * string, int numChars,
Tcl_DString * dsPtr));
/* 355 */
@@ -1164,7 +1164,7 @@
char * string, int numBytes,
Tcl_Parse * parsePtr, int append));
/* 365 */
-EXTERN CONST char * Tcl_GetCwd _ANSI_ARGS_((Tcl_Interp * interp,
+EXTERN char * Tcl_GetCwd _ANSI_ARGS_((Tcl_Interp * interp,
Tcl_DString * cwdPtr));
/* 366 */
EXTERN int Tcl_Chdir _ANSI_ARGS_((CONST char * dirName));
@@ -1671,8 +1671,8 @@
void (*tcl_DontCallWhenDeleted) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData)); /* 114 */
int (*tcl_DoOneEvent) _ANSI_ARGS_((int flags)); /* 115 */
void (*tcl_DoWhenIdle) _ANSI_ARGS_((Tcl_IdleProc * proc, ClientData clientData)); /* 116 */
- CONST char * (*tcl_DStringAppend) _ANSI_ARGS_((Tcl_DString * dsPtr, CONST char * str, int length)); /* 117 */
- CONST char * (*tcl_DStringAppendElement) _ANSI_ARGS_((Tcl_DString * dsPtr, CONST char * string)); /* 118 */
+ char * (*tcl_DStringAppend) _ANSI_ARGS_((Tcl_DString * dsPtr, CONST char * str, int length)); /* 117 */
+ char * (*tcl_DStringAppendElement) _ANSI_ARGS_((Tcl_DString * dsPtr, CONST char * string)); /* 118 */
void (*tcl_DStringEndSublist) _ANSI_ARGS_((Tcl_DString * dsPtr)); /* 119 */
void (*tcl_DStringFree) _ANSI_ARGS_((Tcl_DString * dsPtr)); /* 120 */
void (*tcl_DStringGetResult) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * dsPtr)); /* 121 */
@@ -1748,7 +1748,7 @@
int (*tcl_InputBuffered) _ANSI_ARGS_((Tcl_Channel chan)); /* 183 */
int (*tcl_InterpDeleted) _ANSI_ARGS_((Tcl_Interp * interp)); /* 184 */
int (*tcl_IsSafe) _ANSI_ARGS_((Tcl_Interp * interp)); /* 185 */
- CONST char * (*tcl_JoinPath) _ANSI_ARGS_((int argc, CONST84 char * CONST * argv, Tcl_DString * resultPtr)); /* 186 */
+ char * (*tcl_JoinPath) _ANSI_ARGS_((int argc, CONST84 char * CONST * argv, Tcl_DString * resultPtr)); /* 186 */
int (*tcl_LinkVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, char * addr, int type)); /* 187 */
void *reserved188;
Tcl_Channel (*tcl_MakeFileChannel) _ANSI_ARGS_((ClientData handle, int mode)); /* 189 */
@@ -1827,7 +1827,7 @@
int (*tcl_Tell) _ANSI_ARGS_((Tcl_Channel chan)); /* 246 */
int (*tcl_TraceVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData)); /* 247 */
int (*tcl_TraceVar2) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData)); /* 248 */
- CONST char * (*tcl_TranslateFileName) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tcl_DString * bufferPtr)); /* 249 */
+ char * (*tcl_TranslateFileName) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tcl_DString * bufferPtr)); /* 249 */
int (*tcl_Ungets) _ANSI_ARGS_((Tcl_Channel chan, CONST char * str, int len, int atHead)); /* 250 */
void (*tcl_UnlinkVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName)); /* 251 */
int (*tcl_UnregisterChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 252 */
@@ -1874,7 +1874,7 @@
int (*tcl_EvalObjEx) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, int flags)); /* 293 */
void (*tcl_ExitThread) _ANSI_ARGS_((int status)); /* 294 */
int (*tcl_ExternalToUtf) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Encoding encoding, CONST char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr)); /* 295 */
- CONST char * (*tcl_ExternalToUtfDString) _ANSI_ARGS_((Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr)); /* 296 */
+ char * (*tcl_ExternalToUtfDString) _ANSI_ARGS_((Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr)); /* 296 */
void (*tcl_FinalizeThread) _ANSI_ARGS_((void)); /* 297 */
void (*tcl_FinalizeNotifier) _ANSI_ARGS_((ClientData clientData)); /* 298 */
void (*tcl_FreeEncoding) _ANSI_ARGS_((Tcl_Encoding encoding)); /* 299 */
@@ -1911,7 +1911,7 @@
CONST char * (*tcl_UtfNext) _ANSI_ARGS_((CONST char * src)); /* 330 */
CONST char * (*tcl_UtfPrev) _ANSI_ARGS_((CONST char * src, CONST char * start)); /* 331 */
int (*tcl_UtfToExternal) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Encoding encoding, CONST char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr)); /* 332 */
- CONST char * (*tcl_UtfToExternalDString) _ANSI_ARGS_((Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr)); /* 333 */
+ char * (*tcl_UtfToExternalDString) _ANSI_ARGS_((Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr)); /* 333 */
int (*tcl_UtfToLower) _ANSI_ARGS_((char * src)); /* 334 */
int (*tcl_UtfToTitle) _ANSI_ARGS_((char * src)); /* 335 */
int (*tcl_UtfToUniChar) _ANSI_ARGS_((CONST char * src, Tcl_UniChar * chPtr)); /* 336 */
@@ -1932,7 +1932,7 @@
int (*tcl_UniCharIsWordChar) _ANSI_ARGS_((int ch)); /* 351 */
int (*tcl_UniCharLen) _ANSI_ARGS_((CONST Tcl_UniChar * str)); /* 352 */
int (*tcl_UniCharNcmp) _ANSI_ARGS_((CONST Tcl_UniChar * cs, CONST Tcl_UniChar * ct, unsigned long n)); /* 353 */
- CONST char * (*tcl_UniCharToUtfDString) _ANSI_ARGS_((CONST Tcl_UniChar * string, int numChars, Tcl_DString * dsPtr)); /* 354 */
+ char * (*tcl_UniCharToUtfDString) _ANSI_ARGS_((CONST Tcl_UniChar * string, int numChars, Tcl_DString * dsPtr)); /* 354 */
CONST Tcl_UniChar * (*tcl_UtfToUniCharDString) _ANSI_ARGS_((CONST char * string, int length, Tcl_DString * dsPtr)); /* 355 */
Tcl_RegExp (*tcl_GetRegExpFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * patObj, int flags)); /* 356 */
Tcl_Obj * (*tcl_EvalTokens) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Token * tokenPtr, int count)); /* 357 */
@@ -1943,7 +1943,7 @@
int (*tcl_ParseExpr) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int numBytes, Tcl_Parse * parsePtr)); /* 362 */
int (*tcl_ParseQuotedString) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int numBytes, Tcl_Parse * parsePtr, int append, char ** termPtr)); /* 363 */
int (*tcl_ParseVarName) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int numBytes, Tcl_Parse * parsePtr, int append)); /* 364 */
- CONST char * (*tcl_GetCwd) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * cwdPtr)); /* 365 */
+ char * (*tcl_GetCwd) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * cwdPtr)); /* 365 */
int (*tcl_Chdir) _ANSI_ARGS_((CONST char * dirName)); /* 366 */
int (*tcl_Access) _ANSI_ARGS_((CONST char * path, int mode)); /* 367 */
int (*tcl_Stat) _ANSI_ARGS_((CONST char * path, struct stat * bufPtr)); /* 368 */
Index: generic/tclEncoding.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclEncoding.c,v
retrieving revision 1.9
diff -u -r1.9 tclEncoding.c
--- generic/tclEncoding.c 2002/01/25 20:40:55 1.9
+++ generic/tclEncoding.c 2002/02/06 20:19:29
@@ -781,7 +781,7 @@
*-------------------------------------------------------------------------
*/
-CONST char *
+char *
Tcl_ExternalToUtfDString(encoding, src, srcLen, dstPtr)
Tcl_Encoding encoding; /* The encoding for the source string, or
* NULL for the default system encoding. */
@@ -944,7 +944,7 @@
*-------------------------------------------------------------------------
*/
-CONST char *
+char *
Tcl_UtfToExternalDString(encoding, src, srcLen, dstPtr)
Tcl_Encoding encoding; /* The encoding for the converted string,
* or NULL for the default system encoding. */
Index: generic/tclEnv.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclEnv.c,v
retrieving revision 1.11
diff -u -r1.11 tclEnv.c
--- generic/tclEnv.c 2002/01/26 01:10:08 1.11
+++ generic/tclEnv.c 2002/02/06 20:19:29
@@ -84,8 +84,7 @@
* managed. */
{
Tcl_DString envString;
- CONST char *p1;
- char *p2;
+ char *p1, *p2;
int i;
/*
@@ -134,8 +133,7 @@
}
p2++;
p2[-1] = '\0';
- Tcl_SetVar2(interp, "env", Tcl_DStringValue(&envString), p2,
- TCL_GLOBAL_ONLY);
+ Tcl_SetVar2(interp, "env", p1, p2, TCL_GLOBAL_ONLY);
Tcl_DStringFree(&envString);
}
Tcl_MutexUnlock(&envMutex);
Index: generic/tclFileName.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclFileName.c,v
retrieving revision 1.29
diff -u -r1.29 tclFileName.c
--- generic/tclFileName.c 2002/01/26 01:10:08 1.29
+++ generic/tclFileName.c 2002/02/06 20:19:29
@@ -1268,7 +1268,7 @@
*----------------------------------------------------------------------
*/
-CONST char *
+char *
Tcl_JoinPath(argc, argv, resultPtr)
int argc;
CONST char * CONST *argv;
@@ -1326,7 +1326,7 @@
*----------------------------------------------------------------------
*/
-CONST char *
+char *
Tcl_TranslateFileName(interp, name, bufferPtr)
Tcl_Interp *interp; /* Interpreter in which to store error
* message (if necessary). */
Index: generic/tclIOUtil.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclIOUtil.c,v
retrieving revision 1.33
diff -u -r1.33 tclIOUtil.c
--- generic/tclIOUtil.c 2002/01/25 21:36:09 1.33
+++ generic/tclIOUtil.c 2002/02/06 20:19:31
@@ -141,7 +141,7 @@
}
/* Obsolete */
-CONST char *
+char *
Tcl_GetCwd(interp, cwdPtr)
Tcl_Interp *interp;
Tcl_DString *cwdPtr;
Index: generic/tclPlatDecls.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclPlatDecls.h,v
retrieving revision 1.15
diff -u -r1.15 tclPlatDecls.h
--- generic/tclPlatDecls.h 2002/01/28 12:23:06 1.15
+++ generic/tclPlatDecls.h 2002/02/06 20:19:31
@@ -36,10 +36,10 @@
#ifdef __WIN32__
/* 0 */
-EXTERN CONST TCHAR * Tcl_WinUtfToTChar _ANSI_ARGS_((CONST char * str,
+EXTERN TCHAR * Tcl_WinUtfToTChar _ANSI_ARGS_((CONST char * str,
int len, Tcl_DString * dsPtr));
/* 1 */
-EXTERN CONST char * Tcl_WinTCharToUtf _ANSI_ARGS_((CONST TCHAR * str,
+EXTERN char * Tcl_WinTCharToUtf _ANSI_ARGS_((CONST TCHAR * str,
int len, Tcl_DString * dsPtr));
#endif /* __WIN32__ */
#ifdef MAC_TCL
@@ -80,8 +80,8 @@
struct TclPlatStubHooks *hooks;
#ifdef __WIN32__
- CONST TCHAR * (*tcl_WinUtfToTChar) _ANSI_ARGS_((CONST char * str, int len, Tcl_DString * dsPtr)); /* 0 */
- CONST char * (*tcl_WinTCharToUtf) _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); /* 1 */
+ TCHAR * (*tcl_WinUtfToTChar) _ANSI_ARGS_((CONST char * str, int len, Tcl_DString * dsPtr)); /* 0 */
+ char * (*tcl_WinTCharToUtf) _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); /* 1 */
#endif /* __WIN32__ */
#ifdef MAC_TCL
void (*tcl_MacSetEventProc) _ANSI_ARGS_((Tcl_MacConvertEventPtr procPtr)); /* 0 */
Index: generic/tclUtf.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclUtf.c,v
retrieving revision 1.22
diff -u -r1.22 tclUtf.c
--- generic/tclUtf.c 2002/01/26 01:10:08 1.22
+++ generic/tclUtf.c 2002/02/06 20:19:31
@@ -231,7 +231,7 @@
*---------------------------------------------------------------------------
*/
-CONST char *
+char *
Tcl_UniCharToUtfDString(wString, numChars, dsPtr)
CONST Tcl_UniChar *wString; /* Unicode string to convert to UTF-8. */
int numChars; /* Length of Unicode string in Tcl_UniChars
Index: generic/tclUtil.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclUtil.c,v
retrieving revision 1.28
diff -u -r1.28 tclUtil.c
--- generic/tclUtil.c 2002/01/25 20:40:56 1.28
+++ generic/tclUtil.c 2002/02/06 20:19:32
@@ -1411,7 +1411,7 @@
*----------------------------------------------------------------------
*/
-CONST char *
+char *
Tcl_DStringAppend(dsPtr, string, length)
Tcl_DString *dsPtr; /* Structure describing dynamic string. */
CONST char *string; /* String to append. If length is -1 then
@@ -1482,7 +1482,7 @@
*----------------------------------------------------------------------
*/
-CONST char *
+char *
Tcl_DStringAppendElement(dsPtr, string)
Tcl_DString *dsPtr; /* Structure describing dynamic string. */
CONST char *string; /* String to append. Must be
Index: mac/tclMacInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/tclMacInit.c,v
retrieving revision 1.8
diff -u -r1.8 tclMacInit.c
--- mac/tclMacInit.c 2002/01/27 11:09:54 1.8
+++ mac/tclMacInit.c 2002/02/06 20:19:32
@@ -401,8 +401,7 @@
argv[1] = "Tool Command Language";
Tcl_DStringInit(&libPath);
Tcl_DStringAppend(&libPath, "tcl", -1);
- Tcl_DStringAppend(&libPath, TCL_VERSION, -1);
- argv[2] = Tcl_DStringValue(&libPath);
+ argv[2] = Tcl_DStringAppend(&libPath, TCL_VERSION, -1);
Tcl_DStringInit(&path);
str = Tcl_JoinPath(3, argv, &path);
objPtr = Tcl_NewStringObj(str, Tcl_DStringLength(&path));
Index: unix/tclUnixFile.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixFile.c,v
retrieving revision 1.15
diff -u -r1.15 tclUnixFile.c
--- unix/tclUnixFile.c 2002/01/25 20:40:56 1.15
+++ unix/tclUnixFile.c 2002/02/06 20:19:33
@@ -234,8 +234,7 @@
dirName = Tcl_DStringValue(&dsOrig);
/* Make sure we have a trailing directory delimiter */
if (dirName[baseLength-1] != '/') {
- Tcl_DStringAppend(&dsOrig, "/", 1);
- dirName = Tcl_DStringValue(&dsOrig);
+ dirName = Tcl_DStringAppend(&dsOrig, "/", 1);
baseLength++;
}
}
@@ -333,8 +332,7 @@
struct stat buf;
char *nativeEntry;
Tcl_DStringSetLength(&ds, nativeDirLen);
- Tcl_DStringAppend(&ds, entryPtr->d_name, -1);
- nativeEntry = Tcl_DStringValue(&ds);
+ nativeEntry = Tcl_DStringAppend(&ds, entryPtr->d_name, -1);
/*
* The native name of the file is in entryPtr->d_name.
* We can use this below.
Index: unix/tclUnixInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixInit.c,v
retrieving revision 1.29
diff -u -r1.29 tclUnixInit.c
--- unix/tclUnixInit.c 2002/01/25 20:40:56 1.29
+++ unix/tclUnixInit.c 2002/02/06 20:19:33
@@ -451,8 +451,7 @@
*/
Tcl_DStringInit(&ds);
- Tcl_DStringAppend(&ds, nl_langinfo(CODESET), -1);
- encoding = Tcl_DStringValue(&ds);
+ encoding = Tcl_DStringAppend(&ds, nl_langinfo(CODESET), -1);
Tcl_UtfToLower(Tcl_DStringValue(&ds));
#ifdef HAVE_LANGINFO_DEBUG
@@ -550,9 +549,8 @@
if (*p != '\0') {
Tcl_DString ds;
Tcl_DStringInit(&ds);
- Tcl_DStringAppend(&ds, p, -1);
+ encoding = Tcl_DStringAppend(&ds, p, -1);
- encoding = Tcl_DStringValue(&ds);
Tcl_UtfToLower(Tcl_DStringValue(&ds));
setSysEncCode = Tcl_SetSystemEncoding(NULL, encoding);
if (setSysEncCode != TCL_OK) {
Index: unix/tclUnixPipe.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixPipe.c,v
retrieving revision 1.19
diff -u -r1.19 tclUnixPipe.c
--- unix/tclUnixPipe.c 2002/01/25 20:40:56 1.19
+++ unix/tclUnixPipe.c 2002/02/06 20:19:33
@@ -421,8 +421,7 @@
newArgv = (char **) ckalloc((argc+1) * sizeof(char *));
newArgv[argc] = NULL;
for (i = 0; i < argc; i++) {
- Tcl_UtfToExternalDString(NULL, argv[i], -1, &dsArray[i]);
- newArgv[i] = Tcl_DStringValue(&dsArray[i]);
+ newArgv[i] = Tcl_UtfToExternalDString(NULL, argv[i], -1, &dsArray[i]);
}
joinThisError = errorFile && (errorFile == outputFile);
Index: win/tclWin32Dll.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWin32Dll.c,v
retrieving revision 1.12
diff -u -r1.12 tclWin32Dll.c
--- win/tclWin32Dll.c 2002/01/25 21:36:10 1.12
+++ win/tclWin32Dll.c 2002/02/06 20:19:33
@@ -490,7 +490,7 @@
*---------------------------------------------------------------------------
*/
-CONST TCHAR *
+TCHAR *
Tcl_WinUtfToTChar(string, len, dsPtr)
CONST char *string; /* Source string in UTF-8. */
int len; /* Source string length in bytes, or < 0 for
@@ -502,7 +502,7 @@
string, len, dsPtr);
}
-CONST char *
+char *
Tcl_WinTCharToUtf(string, len, dsPtr)
CONST TCHAR *string; /* Source string in Unicode when running
* NT, ANSI when running 95. */
Index: win/tclWinFCmd.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinFCmd.c,v
retrieving revision 1.21
diff -u -r1.21 tclWinFCmd.c
--- win/tclWinFCmd.c 2002/01/31 21:07:32 1.21
+++ win/tclWinFCmd.c 2002/02/06 20:19:34
@@ -1407,9 +1407,8 @@
*/
Tcl_DStringInit(&ds);
tempString = Tcl_GetStringFromObj(tempPath,&tempLen);
- Tcl_WinUtfToTChar(tempString, tempLen, &ds);
+ nativeName = Tcl_WinUtfToTChar(tempString, tempLen, &ds);
Tcl_DecrRefCount(tempPath);
- nativeName = Tcl_DStringValue(&ds);
handle = (*tclWinProcs->findFirstFileProc)(nativeName, &data);
if (handle == INVALID_HANDLE_VALUE) {
/*
Index: win/tclWinFile.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinFile.c,v
retrieving revision 1.24
diff -u -r1.24 tclWinFile.c
--- win/tclWinFile.c 2002/01/25 21:36:10 1.24
+++ win/tclWinFile.c 2002/02/06 20:19:35
@@ -499,7 +499,7 @@
Tcl_DString ds;
int nameLen, badDomain;
char *domain;
- WCHAR *wHomeDir, *wDomain;
+ WCHAR *wName, *wHomeDir, *wDomain;
WCHAR buf[MAX_PATH];
badDomain = 0;
@@ -508,18 +508,16 @@
domain = strchr(name, '@');
if (domain != NULL) {
Tcl_DStringInit(&ds);
- Tcl_UtfToUniCharDString(domain + 1, -1, &ds);
- badDomain = (*netGetDCNameProc)(NULL,
- (LPWSTR) Tcl_DStringValue(&ds),
+ wName = Tcl_UtfToUniCharDString(domain + 1, -1, &ds);
+ badDomain = (*netGetDCNameProc)(NULL, wName,
(LPBYTE *) &wDomain);
Tcl_DStringFree(&ds);
nameLen = domain - name;
}
if (badDomain == 0) {
Tcl_DStringInit(&ds);
- Tcl_UtfToUniCharDString(name, nameLen, &ds);
- if ((*netUserGetInfoProc)(wDomain,
- (LPWSTR) Tcl_DStringValue(&ds), 1,
+ wName = Tcl_UtfToUniCharDString(name, nameLen, &ds);
+ if ((*netUserGetInfoProc)(wDomain, wName, 1,
(LPBYTE *) &uiPtr) == 0) {
wHomeDir = uiPtr->usri1_home_dir;
if ((wHomeDir != NULL) && (wHomeDir[0] != L'\0')) {
Index: win/tclWinInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinInit.c,v
retrieving revision 1.34
diff -u -r1.34 tclWinInit.c
--- win/tclWinInit.c 2002/01/29 02:19:24 1.34
+++ win/tclWinInit.c 2002/02/06 20:19:35
@@ -698,8 +698,7 @@
* all the characters after the equal sign.
*/
- Tcl_ExternalToUtfDString(NULL, env, -1, &envString);
- envUpper = Tcl_DStringValue(&envString);
+ envUpper = Tcl_ExternalToUtfDString(NULL, env, -1, &envString);
p1 = strchr(envUpper, '=');
if (p1 == NULL) {
continue;
