summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog18
-rw-r--r--generic/tclIOUtil.c6
-rw-r--r--generic/tclNamesp.c4
-rw-r--r--generic/tclObj.c8
-rw-r--r--generic/tclPathObj.c8
-rw-r--r--generic/tclPipe.c6
-rw-r--r--generic/tclPkg.c8
-rw-r--r--generic/tclResult.c6
-rw-r--r--generic/tclTest.c62
-rw-r--r--generic/tclTestObj.c4
-rw-r--r--generic/tclVar.c6
-rw-r--r--unix/tclUnixChan.c8
-rw-r--r--unix/tclUnixTest.c4
-rw-r--r--win/tclWinLoad.c12
-rw-r--r--win/tclWinSerial.c10
15 files changed, 92 insertions, 78 deletions
diff --git a/ChangeLog b/ChangeLog
index 06099a1..599870c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,9 +35,23 @@
* generic/tclCmdMZ.c:
* generic/tclFCmd.c:
* generic/tclFileName.c:
+ * generic/tclInterp.c:
* generic/tclIO.c:
- * generic/tclInterp.c: Replaced commas in varargs with string
- concatenation where possible. [Patch 1515234]
+ * generic/tclIOUtil.c:
+ * generic/tclNamesp.c:
+ * generic/tclObj.c:
+ * generic/tclPathObj.c:
+ * generic/tclPipe.c:
+ * generic/tclPkg.c:
+ * generic/tclResult.c:
+ * generic/tclTest.c:
+ * generic/tclTestObj.c:
+ * generic/tclVar.c:
+ * unix/tclUnixChan.c:
+ * unix/tclUnixTest.c:
+ * win/tclWinLoad.c:
+ * win/tclWinSerial.c: Replaced commas in varargs with string
+ concatenation where possible. [Patch 1515234]
2007-04-19 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 8e3a3f2..a2b0555 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.143 2007/04/10 14:47:15 dkf Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.144 2007/04/20 06:10:57 kennykb Exp $
*/
#include "tclInt.h"
@@ -1697,7 +1697,7 @@ TclGetOpenModeEx(
if (!gotRW) {
if (interp != NULL) {
- Tcl_AppendResult(interp, "access mode must include either",
+ Tcl_AppendResult(interp, "access mode must include either"
" RDONLY, WRONLY, or RDWR", NULL);
}
return -1;
@@ -2243,7 +2243,7 @@ Tcl_FSOpenFileChannel(
if (seekFlag && Tcl_Seek(retVal, (Tcl_WideInt)0,
SEEK_END) < (Tcl_WideInt)0) {
if (interp != NULL) {
- Tcl_AppendResult(interp, "could not seek to end ",
+ Tcl_AppendResult(interp, "could not seek to end "
"of file while opening \"", Tcl_GetString(pathPtr),
"\": ", Tcl_PosixError(interp), NULL);
}
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 676f164..b4c7a4a 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -22,7 +22,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclNamesp.c,v 1.131 2007/04/10 14:47:16 dkf Exp $
+ * RCS: @(#) $Id: tclNamesp.c,v 1.132 2007/04/20 06:10:58 kennykb Exp $
*/
#include "tclInt.h"
@@ -771,7 +771,7 @@ Tcl_CreateNamespace(
simpleName = "";
} else if (*name == '\0') {
Tcl_ResetResult(interp);
- Tcl_AppendResult(interp, "can't create namespace \"\": ",
+ Tcl_AppendResult(interp, "can't create namespace \"\": "
"only global namespace can have empty name", NULL);
return NULL;
} else {
diff --git a/generic/tclObj.c b/generic/tclObj.c
index e478d6b..05f3990 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclObj.c,v 1.120 2007/04/10 22:04:31 dkf Exp $
+ * RCS: @(#) $Id: tclObj.c,v 1.121 2007/04/20 06:10:58 kennykb Exp $
*/
#include "tclInt.h"
@@ -3075,7 +3075,7 @@ Tcl_DbIncrRefCount(
hPtr = Tcl_FindHashEntry(tablePtr, (char *) objPtr);
if (!hPtr) {
Tcl_Panic("%s%s",
- "Trying to incr ref count of ",
+ "Trying to incr ref count of "
"Tcl_Obj allocated in another thread");
}
}
@@ -3140,7 +3140,7 @@ Tcl_DbDecrRefCount(
hPtr = Tcl_FindHashEntry(tablePtr, (char *) objPtr);
if (!hPtr) {
Tcl_Panic("%s%s",
- "Trying to decr ref count of ",
+ "Trying to decr ref count of "
"Tcl_Obj allocated in another thread");
}
@@ -3210,7 +3210,7 @@ Tcl_DbIsShared(
hPtr = Tcl_FindHashEntry(tablePtr, (char *) objPtr);
if (!hPtr) {
Tcl_Panic("%s%s",
- "Trying to check shared status of",
+ "Trying to check shared status of"
"Tcl_Obj allocated in another thread");
}
}
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 174ac22..8744da8 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclPathObj.c,v 1.61 2007/04/20 02:23:31 kennykb Exp $
+ * RCS: @(#) $Id: tclPathObj.c,v 1.62 2007/04/20 06:10:58 kennykb Exp $
*/
#include "tclInt.h"
@@ -1327,7 +1327,7 @@ TclFSMakePathRelative(
if (pathPtr->typePtr->updateStringProc == NULL) {
if (interp != NULL) {
Tcl_ResetResult(interp);
- Tcl_AppendResult(interp, "can't find object",
+ Tcl_AppendResult(interp, "can't find object"
"string representation", (char *) NULL);
}
return NULL;
@@ -1449,7 +1449,7 @@ TclFSMakePathFromNormalized(
if (pathPtr->typePtr->updateStringProc == NULL) {
if (interp != NULL) {
Tcl_ResetResult(interp);
- Tcl_AppendResult(interp, "can't find object",
+ Tcl_AppendResult(interp, "can't find object"
"string representation", (char *) NULL);
}
return TCL_ERROR;
@@ -2318,7 +2318,7 @@ SetFsPathFromAny(
if (dir == NULL) {
if (interp) {
Tcl_ResetResult(interp);
- Tcl_AppendResult(interp, "couldn't find HOME environment ",
+ Tcl_AppendResult(interp, "couldn't find HOME environment "
"variable to expand path", (char *) NULL);
}
return TCL_ERROR;
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index bd66ca6..561d390 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.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: tclPipe.c,v 1.18 2006/03/16 00:38:50 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclPipe.c,v 1.19 2007/04/20 06:10:58 kennykb Exp $
*/
#include "tclInt.h"
@@ -1055,12 +1055,12 @@ Tcl_OpenCommandChannel(
if (flags & TCL_ENFORCE_MODE) {
if ((flags & TCL_STDOUT) && (outPipe == NULL)) {
- Tcl_AppendResult(interp, "can't read output from command:",
+ Tcl_AppendResult(interp, "can't read output from command:"
" standard output was redirected", NULL);
goto error;
}
if ((flags & TCL_STDIN) && (inPipe == NULL)) {
- Tcl_AppendResult(interp, "can't write input to command:",
+ Tcl_AppendResult(interp, "can't write input to command:"
" standard input was redirected", NULL);
goto error;
}
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 5426bc7..dff6090 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclPkg.c,v 1.26 2006/12/05 15:36:12 dgp Exp $
+ * RCS: @(#) $Id: tclPkg.c,v 1.27 2007/04/20 06:10:58 kennykb Exp $
*
* TIP #268.
* Heavily rewritten to handle the extend version numbers, and extended
@@ -286,7 +286,7 @@ Tcl_PkgRequireEx(
tclEmptyStringRep = &tclEmptyString;
Tcl_AppendResult(interp, "Cannot load package \"", name,
- "\" in standalone executable: This package is not ",
+ "\" in standalone executable: This package is not "
"compiled with stub support", NULL);
return NULL;
}
@@ -380,7 +380,7 @@ Tcl_PkgRequireProc(
*/
if (pkgPtr->clientData != NULL) {
- Tcl_AppendResult(interp, "circular package dependency: ",
+ Tcl_AppendResult(interp, "circular package dependency: "
"attempt to provide ", name, " ",
(char *) pkgPtr->clientData, " requires ", name, NULL);
AddRequirementsToResult(interp, reqc, reqv);
@@ -532,7 +532,7 @@ Tcl_PkgRequireProc(
Tcl_Obj *codePtr = Tcl_NewIntObj(code);
Tcl_ResetResult(interp);
Tcl_AppendResult(interp, "attempt to provide package ",
- name, " ", versionToProvide, " failed: ",
+ name, " ", versionToProvide, " failed: "
"bad return code: ", TclGetString(codePtr), NULL);
TclDecrRefCount(codePtr);
code = TCL_ERROR;
diff --git a/generic/tclResult.c b/generic/tclResult.c
index d60f06f..9512989 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.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: tclResult.c,v 1.35 2007/04/10 22:16:42 dkf Exp $
+ * RCS: @(#) $Id: tclResult.c,v 1.36 2007/04/20 06:10:58 kennykb Exp $
*/
#include "tclInt.h"
@@ -1341,7 +1341,7 @@ TclMergeReturnOptions(
Tcl_ResetResult(interp);
Tcl_AppendResult(interp, "bad completion code \"",
TclGetString(valuePtr),
- "\": must be ok, error, return, break, ",
+ "\": must be ok, error, return, break, "
"continue, or an integer", NULL);
goto error;
}
@@ -1361,7 +1361,7 @@ TclMergeReturnOptions(
*/
Tcl_ResetResult(interp);
- Tcl_AppendResult(interp, "bad -level value: ",
+ Tcl_AppendResult(interp, "bad -level value: "
"expected non-negative integer but got \"",
TclGetString(valuePtr), "\"", NULL);
goto error;
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 43deff7..bbfff88 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTest.c,v 1.107 2007/04/16 13:36:35 dkf Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.108 2007/04/20 06:10:59 kennykb Exp $
*/
#define TCL_TEST
@@ -1685,7 +1685,7 @@ TestdstringCmd(
Tcl_DStringStartSublist(&dstring);
} else {
Tcl_AppendResult(interp, "bad option \"", argv[1],
- "\": must be append, element, end, free, get, length, ",
+ "\": must be append, element, end, free, get, length, "
"result, trunc, or start", NULL);
return TCL_ERROR;
}
@@ -2638,7 +2638,7 @@ TestlinkCmd(
if (argc < 2) {
Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
- " option ?arg arg arg arg arg arg arg arg arg arg arg arg",
+ " option ?arg arg arg arg arg arg arg arg arg arg arg arg"
" arg arg?\"", NULL);
return TCL_ERROR;
}
@@ -2646,7 +2646,7 @@ TestlinkCmd(
if (argc != 16) {
Tcl_AppendResult(interp, "wrong # args: should be \"",
argv[0], " ", argv[1],
- " intRO realRO boolRO stringRO wideRO charRO ucharRO shortRO",
+ " intRO realRO boolRO stringRO wideRO charRO ucharRO shortRO"
" ushortRO uintRO longRO ulongRO floatRO uwideRO\"", NULL);
return TCL_ERROR;
}
@@ -2837,8 +2837,8 @@ TestlinkCmd(
if (argc != 16) {
Tcl_AppendResult(interp, "wrong # args: should be \"",
argv[0], " ", argv[1],
- " intValue realValue boolValue stringValue wideValue",
- " charValue ucharValue shortValue ushortValue uintValue",
+ " intValue realValue boolValue stringValue wideValue"
+ " charValue ucharValue shortValue ushortValue uintValue"
" longValue ulongValue floatValue uwideValue\"", NULL);
return TCL_ERROR;
}
@@ -2941,8 +2941,8 @@ TestlinkCmd(
if (argc != 16) {
Tcl_AppendResult(interp, "wrong # args: should be \"",
argv[0], " ", argv[1],
- " intValue realValue boolValue stringValue wideValue",
- " charValue ucharValue shortValue ushortValue uintValue",
+ " intValue realValue boolValue stringValue wideValue"
+ " charValue ucharValue shortValue ushortValue uintValue"
" longValue ulongValue floatValue uwideValue\"", NULL);
return TCL_ERROR;
}
@@ -4042,7 +4042,7 @@ TestsetplatformCmd(
} else if (strncmp(argv[1], "windows", length) == 0) {
*platform = TCL_PLATFORM_WINDOWS;
} else {
- Tcl_AppendResult(interp, "unsupported platform: should be one of ",
+ Tcl_AppendResult(interp, "unsupported platform: should be one of "
"unix, or windows", NULL);
return TCL_ERROR;
}
@@ -4973,16 +4973,16 @@ TeststatprocCmd(
} else if (strcmp(argv[2], "TestStatProc3") == 0) {
proc = TestStatProc3;
} else {
- Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
- "must be TclpStat, ",
+ Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": "
+ "must be TclpStat, "
"TestStatProc1, TestStatProc2, or TestStatProc3", NULL);
return TCL_ERROR;
}
if (strcmp(argv[1], "insert") == 0) {
if (proc == PretendTclpStat) {
- Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
- "must be ",
+ Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": "
+ "must be "
"TestStatProc1, TestStatProc2, or TestStatProc3", NULL);
return TCL_ERROR;
}
@@ -4990,13 +4990,13 @@ TeststatprocCmd(
} else if (strcmp(argv[1], "delete") == 0) {
retVal = TclStatDeleteProc(proc);
} else {
- Tcl_AppendResult(interp, "bad option \"", argv[1], "\": ",
+ Tcl_AppendResult(interp, "bad option \"", argv[1], "\": "
"must be insert or delete", NULL);
return TCL_ERROR;
}
if (retVal == TCL_ERROR) {
- Tcl_AppendResult(interp, "\"", argv[2], "\": ",
+ Tcl_AppendResult(interp, "\"", argv[2], "\": "
"could not be ", argv[1], "ed", NULL);
}
@@ -5283,16 +5283,16 @@ TestaccessprocCmd(
} else if (strcmp(argv[2], "TestAccessProc3") == 0) {
proc = TestAccessProc3;
} else {
- Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
- "must be TclpAccess, ",
+ Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": "
+ "must be TclpAccess, "
"TestAccessProc1, TestAccessProc2, or TestAccessProc3", NULL);
return TCL_ERROR;
}
if (strcmp(argv[1], "insert") == 0) {
if (proc == PretendTclpAccess) {
- Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": must be ",
- "TestAccessProc1, TestAccessProc2, or TestAccessProc3",
+ Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": must be "
+ "TestAccessProc1, TestAccessProc2, or TestAccessProc3"
NULL);
return TCL_ERROR;
}
@@ -5300,13 +5300,13 @@ TestaccessprocCmd(
} else if (strcmp(argv[1], "delete") == 0) {
retVal = TclAccessDeleteProc(proc);
} else {
- Tcl_AppendResult(interp, "bad option \"", argv[1], "\": ",
+ Tcl_AppendResult(interp, "bad option \"", argv[1], "\": "
"must be insert or delete", NULL);
return TCL_ERROR;
}
if (retVal == TCL_ERROR) {
- Tcl_AppendResult(interp, "\"", argv[2], "\": ",
+ Tcl_AppendResult(interp, "\"", argv[2], "\": "
"could not be ", argv[1], "ed", NULL);
}
@@ -5393,18 +5393,18 @@ TestopenfilechannelprocCmd(
} else if (strcmp(argv[2], "TestOpenFileChannelProc3") == 0) {
proc = TestOpenFileChannelProc3;
} else {
- Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
- "must be TclpOpenFileChannel, ",
- "TestOpenFileChannelProc1, TestOpenFileChannelProc2, or ",
+ Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": "
+ "must be TclpOpenFileChannel, "
+ "TestOpenFileChannelProc1, TestOpenFileChannelProc2, or "
"TestOpenFileChannelProc3", NULL);
return TCL_ERROR;
}
if (strcmp(argv[1], "insert") == 0) {
if (proc == PretendTclpOpenFileChannel) {
- Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
- "must be ",
- "TestOpenFileChannelProc1, TestOpenFileChannelProc2, or ",
+ Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": "
+ "must be "
+ "TestOpenFileChannelProc1, TestOpenFileChannelProc2, or "
"TestOpenFileChannelProc3", NULL);
return TCL_ERROR;
}
@@ -5412,13 +5412,13 @@ TestopenfilechannelprocCmd(
} else if (strcmp(argv[1], "delete") == 0) {
retVal = TclOpenFileChannelDeleteProc(proc);
} else {
- Tcl_AppendResult(interp, "bad option \"", argv[1], "\": ",
+ Tcl_AppendResult(interp, "bad option \"", argv[1], "\": "
"must be insert or delete", NULL);
return TCL_ERROR;
}
if (retVal == TCL_ERROR) {
- Tcl_AppendResult(interp, "\"", argv[2], "\": ",
+ Tcl_AppendResult(interp, "\"", argv[2], "\": "
"could not be ", argv[1], "ed", NULL);
}
@@ -6006,7 +6006,7 @@ TestChannelCmd(
return Tcl_UnstackChannel(interp, chan);
}
- Tcl_AppendResult(interp, "bad option \"", cmdName, "\": should be ",
+ Tcl_AppendResult(interp, "bad option \"", cmdName, "\": should be "
"cut, clearchannelhandlers, info, isshared, mode, open, "
"readable, splice, writable, transform, unstack", NULL);
return TCL_ERROR;
@@ -6221,7 +6221,7 @@ TestChannelEventCmd(
TclChannelEventScriptInvoker, (ClientData) esPtr);
return TCL_OK;
}
- Tcl_AppendResult(interp, "bad command ", cmd, ", must be one of ",
+ Tcl_AppendResult(interp, "bad command ", cmd, ", must be one of "
"add, delete, list, set, or removeall", NULL);
return TCL_ERROR;
}
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index a7d51fd..0553005 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTestObj.c,v 1.18 2007/04/16 13:36:35 dkf Exp $
+ * RCS: @(#) $Id: tclTestObj.c,v 1.19 2007/04/20 06:10:59 kennykb Exp $
*/
#include "tclInt.h"
@@ -1025,7 +1025,7 @@ TestobjCmd(
} else {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"bad option \"", Tcl_GetString(objv[1]),
- "\": must be assign, convert, duplicate, freeallvars, ",
+ "\": must be assign, convert, duplicate, freeallvars, "
"newobj, objcount, objtype, refcount, type, or types", NULL);
return TCL_ERROR;
}
diff --git a/generic/tclVar.c b/generic/tclVar.c
index c723e84..1582c26 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -15,7 +15,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclVar.c,v 1.129 2007/04/03 01:34:39 msofer Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.130 2007/04/20 06:10:59 kennykb Exp $
*/
#include "tclInt.h"
@@ -3249,7 +3249,7 @@ ObjMakeUpvar(
|| !HasLocalVars(varFramePtr)
|| (strstr(myName, "::") != NULL))) {
Tcl_AppendResult((Tcl_Interp *) iPtr, "bad variable name \"",
- myName, "\": upvar won't create namespace variable that ",
+ myName, "\": upvar won't create namespace variable that "
"refers to procedure variable", NULL);
return TCL_ERROR;
}
@@ -3319,7 +3319,7 @@ TclPtrMakeUpvar(
*/
Tcl_AppendResult((Tcl_Interp *) iPtr, "bad variable name \"",
- myName, "\": upvar won't create a scalar variable ",
+ myName, "\": upvar won't create a scalar variable "
"that looks like an array element", NULL);
return TCL_ERROR;
}
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 12ddaad..904a991 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixChan.c,v 1.76 2007/02/20 23:24:07 nijtmans Exp $
+ * RCS: @(#) $Id: tclUnixChan.c,v 1.77 2007/04/20 06:11:00 kennykb Exp $
*/
#include "tclInt.h" /* Internal definitions for Tcl. */
@@ -947,7 +947,7 @@ TtySetOptionProc(
return TCL_ERROR;
} else {
if (interp) {
- Tcl_AppendResult(interp, "bad value for -handshake: ",
+ Tcl_AppendResult(interp, "bad value for -handshake: "
"must be one of xonxoff, rtscts, dtrdsr or none",
NULL);
}
@@ -1012,7 +1012,7 @@ TtySetOptionProc(
if ((argc % 2) == 1) {
if (interp) {
Tcl_AppendResult(interp,
- "bad value for -ttycontrol: should be a list of",
+ "bad value for -ttycontrol: should be a list of"
"signal,value pairs", NULL);
}
ckfree((char *) argv);
@@ -1060,7 +1060,7 @@ TtySetOptionProc(
} else {
if (interp) {
Tcl_AppendResult(interp, "bad signal \"", argv[i],
- "\" for -ttycontrol: must be ",
+ "\" for -ttycontrol: must be "
"DTR, RTS or BREAK", NULL);
}
ckfree((char *) argv);
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index acfa5fc..a894d4d 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.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: tclUnixTest.c,v 1.25 2007/04/17 14:49:53 dkf Exp $
+ * RCS: @(#) $Id: tclUnixTest.c,v 1.26 2007/04/20 06:11:00 kennykb Exp $
*/
#include "tclInt.h"
@@ -324,7 +324,7 @@ TestfilehandlerCmd(
Tcl_DoOneEvent(TCL_WINDOW_EVENTS|TCL_DONT_WAIT);
} else {
Tcl_AppendResult(interp, "bad option \"", argv[1],
- "\": must be close, clear, counts, create, empty, fill, ",
+ "\": must be close, clear, counts, create, empty, fill, "
"fillpartial, oneevent, wait, or windowevent", NULL);
return TCL_ERROR;
}
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index 7079571..30bc750 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinLoad.c,v 1.19 2005/11/04 00:06:50 dkf Exp $
+ * RCS: @(#) $Id: tclWinLoad.c,v 1.20 2007/04/20 06:11:00 kennykb Exp $
*/
#include "tclWinInt.h"
@@ -108,20 +108,20 @@ TclpDlopen(
switch (lastError) {
case ERROR_MOD_NOT_FOUND:
case ERROR_DLL_NOT_FOUND:
- Tcl_AppendResult(interp, "this library or a dependent library",
+ Tcl_AppendResult(interp, "this library or a dependent library"
" could not be found in library path", NULL);
break;
case ERROR_PROC_NOT_FOUND:
- Tcl_AppendResult(interp, "A function specified in the import",
- " table could not be resolved by the system. Windows",
+ Tcl_AppendResult(interp, "A function specified in the import"
+ " table could not be resolved by the system. Windows"
" is not telling which one, I'm sorry.", NULL);
break;
case ERROR_INVALID_DLL:
- Tcl_AppendResult(interp, "this library or a dependent library",
+ Tcl_AppendResult(interp, "this library or a dependent library"
" is damaged", NULL);
break;
case ERROR_DLL_INIT_FAILED:
- Tcl_AppendResult(interp, "the library initialization",
+ Tcl_AppendResult(interp, "the library initialization"
" routine failed", NULL);
break;
default:
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index a2846b3..7a4ee94 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -11,7 +11,7 @@
*
* Serial functionality implemented by Rolf.Schroedter@dlr.de
*
- * RCS: @(#) $Id: tclWinSerial.c,v 1.34 2006/03/27 18:08:51 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclWinSerial.c,v 1.35 2007/04/20 06:11:00 kennykb Exp $
*/
#include "tclWinInt.h"
@@ -1758,7 +1758,7 @@ SerialSetOptionProc(
} else {
if (interp != NULL) {
Tcl_AppendResult(interp, "bad value \"", value,
- "\" for -handshake: must be one of xonxoff, rtscts, ",
+ "\" for -handshake: must be one of xonxoff, rtscts, "
"dtrdsr or none", NULL);
}
return TCL_ERROR;
@@ -1791,7 +1791,7 @@ SerialSetOptionProc(
if (argc != 2) {
badXchar:
if (interp != NULL) {
- Tcl_AppendResult(interp, "bad value for -xchar: should be ",
+ Tcl_AppendResult(interp, "bad value for -xchar: should be "
"a list of two elements with each a single character",
NULL);
}
@@ -1850,7 +1850,7 @@ SerialSetOptionProc(
if ((argc % 2) == 1) {
if (interp != NULL) {
Tcl_AppendResult(interp, "bad value \"", value,
- "\" for -ttycontrol: should be a list of ",
+ "\" for -ttycontrol: should be a list of "
"signal,value pairs", NULL);
}
ckfree((char *) argv);
@@ -1931,7 +1931,7 @@ SerialSetOptionProc(
if ((argc < 1) || (argc > 2) || (inSize <= 0) || (outSize <= 0)) {
if (interp != NULL) {
Tcl_AppendResult(interp, "bad value \"", value,
- "\" for -sysbuffer: should be a list of one or two ",
+ "\" for -sysbuffer: should be a list of one or two "
"integers > 0", NULL);
}
return TCL_ERROR;
generated by cgit v0.12 at 2024-11-10 16:37:30 (GMT)