Compare commits

...
Author SHA1 Message Date
jan.nijtmans 2a7ef06150 (Bad idea) 2012-11-19 21:57:09 +00:00
jan.nijtmans e6ee9237ab Merge trunk
<p>Adapt Tcl_Tell and Tcl_Seek to use the new type
2012-11-19 12:17:50 +00:00
jan.nijtmans de95e5caef Merge novem.
<p>Introduce TCL_SIZE_T type. Not complete yet.
2012-11-19 10:20:33 +00:00
jan.nijtmans 2f7b81d7ae merge novem branch 2012-11-18 20:13:19 +00:00
jan.nijtmans 21b753b857 Better programming practice, no literal '-1' in source code. Might even be useful for 64bit-sizes branch
<p>add TCL_NOSIZE as internal defined for -1, and use it in a lot of places
Ass this function argument should be size_t, not ssize_t (still to be TIPped), something like this will be needed anyway.
2012-11-18 07:39:21 +00:00
88 changed files with 1123 additions and 1051 deletions
+10 -10
View File
@@ -780,10 +780,9 @@ declare 218 {
declare 219 {
int Tcl_ScanCountedElement(const char *src, int length, int *flagPtr)
}
# Removed in Tcl 9
#declare 220 {
# int Tcl_SeekOld(Tcl_Channel chan, int offset, int mode)
#}
declare 220 {
TCL_SIZE_T Tcl_Seek(Tcl_Channel chan, TCL_SIZE_T offset, int mode)
}
declare 221 {
int Tcl_ServiceAll(void)
}
@@ -868,10 +867,9 @@ declare 244 {
declare 245 {
int Tcl_StringMatch(const char *str, const char *pattern)
}
# Removed in Tcl 9
#declare 246 {
# int Tcl_TellOld(Tcl_Channel chan)
#}
declare 246 {
TCL_SIZE_T Tcl_Tell(Tcl_Channel chan)
}
declare 247 {
int Tcl_TraceVar(Tcl_Interp *interp, const char *varName, int flags,
Tcl_VarTraceProc *proc, ClientData clientData)
@@ -1753,11 +1751,13 @@ declare 489 {
declare 490 {
Tcl_StatBuf *Tcl_AllocStatBuf(void)
}
# Kept on Tcl9, for binary compatibility with Tcl8
declare 491 {
Tcl_WideInt Tcl_Seek(Tcl_Channel chan, Tcl_WideInt offset, int mode)
Tcl_WideInt Tcl_SeekOld(Tcl_Channel chan, Tcl_WideInt offset, int mode)
}
# Kept on Tcl9, for binary compatibility with Tcl8
declare 492 {
Tcl_WideInt Tcl_Tell(Tcl_Channel chan)
Tcl_WideInt Tcl_TellOld(Tcl_Channel chan)
}
# TIP#91 (back-compat enhancements for channels) dkf
+21
View File
@@ -1375,6 +1375,27 @@ typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, ClientData clientData);
#define TCL_CHANNEL_THREAD_INSERT (0)
#define TCL_CHANNEL_THREAD_REMOVE (1)
/*
* Still to be TIPped.
*
* Actual definition could be size_t, ssize_t, int,
* unsigned int, __int64, __uint64. Still to be
* decided. Can be overridden with -DTCL_SIZE_T=<whatever>.
*
* However, anything different than size_t, ssize_t or
* ptrdiff_t will result in stub tables incompatible with
* Tcl 9. Anything different than int or unsigned int will
* result in stub tables incompatible with Tcl 8. So, on
* platforms where sizeof(int) != sizeof(size_t) it is
* impossible to create an extensions which is compatible
* with both Tcl8 and Tcl9.
*/
#ifndef TCL_SIZE_T
# define TCL_SIZE_T int /* should be size_t or ssize_t */
#endif
#define TCL_NOSIZE ((TCL_SIZE_T)-1)
/*
* Typedefs for the various operations in a channel type:
*/
+14 -14
View File
@@ -1624,7 +1624,7 @@ AssembleOneLine(
if (opnd < 2) {
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("operand must be >=2", -1));
Tcl_NewStringObj("operand must be >=2", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "OPERAND>=2", NULL);
}
goto cleanup;
@@ -1995,7 +1995,7 @@ CreateMirrorJumpTable(
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"jump table must have an even number of list elements",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADJUMPTABLE", NULL);
}
return TCL_ERROR;
@@ -2107,7 +2107,7 @@ GetNextOperand(
Tcl_DecrRefCount(operandObj);
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"assembly code may not contain substitutions", -1));
"assembly code may not contain substitutions", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "NOSUBST", NULL);
}
return TCL_ERROR;
@@ -2329,7 +2329,7 @@ FindLocalVar(
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot use this instruction to create a variable"
" in a non-proc context", -1));
" in a non-proc context", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "LVT", NULL);
}
return -1;
@@ -2399,7 +2399,7 @@ CheckOneByte(
Tcl_Obj* result; /* Error message */
if (value < 0 || value > 0xff) {
result = Tcl_NewStringObj("operand does not fit in one byte", -1);
result = Tcl_NewStringObj("operand does not fit in one byte", TCL_NOSIZE);
Tcl_SetObjResult(interp, result);
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "1BYTE", NULL);
return TCL_ERROR;
@@ -2434,7 +2434,7 @@ CheckSignedOneByte(
Tcl_Obj* result; /* Error message */
if (value > 0x7f || value < -0x80) {
result = Tcl_NewStringObj("operand does not fit in one byte", -1);
result = Tcl_NewStringObj("operand does not fit in one byte", TCL_NOSIZE);
Tcl_SetObjResult(interp, result);
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "1BYTE", NULL);
return TCL_ERROR;
@@ -2467,7 +2467,7 @@ CheckNonNegative(
Tcl_Obj* result; /* Error message */
if (value < 0) {
result = Tcl_NewStringObj("operand must be nonnegative", -1);
result = Tcl_NewStringObj("operand must be nonnegative", TCL_NOSIZE);
Tcl_SetObjResult(interp, result);
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "NONNEGATIVE", NULL);
return TCL_ERROR;
@@ -2500,7 +2500,7 @@ CheckStrictlyPositive(
Tcl_Obj* result; /* Error message */
if (value <= 0) {
result = Tcl_NewStringObj("operand must be positive", -1);
result = Tcl_NewStringObj("operand must be positive", TCL_NOSIZE);
Tcl_SetObjResult(interp, result);
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "POSITIVE", NULL);
return TCL_ERROR;
@@ -3412,7 +3412,7 @@ StackCheckBasicBlock(
}
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"inconsistent stack depths on two execution paths", -1));
"inconsistent stack depths on two execution paths", TCL_NOSIZE));
/*
* TODO - add execution trace of both paths
@@ -3441,7 +3441,7 @@ StackCheckBasicBlock(
if (initialStackDepth + blockPtr->minStackDepth < 0) {
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("stack underflow", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("stack underflow", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADSTACK", NULL);
AddBasicBlockRangeToErrorInfo(assemEnvPtr, blockPtr);
Tcl_SetErrorLine(interp, blockPtr->startLine);
@@ -3460,7 +3460,7 @@ StackCheckBasicBlock(
+ blockPtr->enclosingCatch->finalStackDepth)) {
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"code pops stack below level of enclosing catch", -1));
"code pops stack below level of enclosing catch", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADSTACKINCATCH", -1);
AddBasicBlockRangeToErrorInfo(assemEnvPtr, blockPtr);
Tcl_SetErrorLine(interp, blockPtr->startLine);
@@ -3732,7 +3732,7 @@ ProcessCatchesInBasicBlock(
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"execution reaches an instruction in inconsistent "
"exception contexts", -1));
"exception contexts", TCL_NOSIZE));
Tcl_SetErrorLine(interp, bbPtr->startLine);
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADCATCH", NULL);
}
@@ -3791,7 +3791,7 @@ ProcessCatchesInBasicBlock(
if (enclosing == NULL) {
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"endCatch without a corresponding beginCatch", -1));
"endCatch without a corresponding beginCatch", TCL_NOSIZE));
Tcl_SetErrorLine(interp, bbPtr->startLine);
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADENDCATCH", NULL);
}
@@ -3866,7 +3866,7 @@ CheckForUnclosedCatches(
if (assemEnvPtr->curr_bb->catchState >= BBCS_INCATCH) {
if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"catch still active on exit from assembly code", -1));
"catch still active on exit from assembly code", TCL_NOSIZE));
Tcl_SetErrorLine(interp,
assemEnvPtr->curr_bb->enclosingCatch->startLine);
Tcl_SetErrorCode(interp, "TCL", "ASSEM", "UNCLOSEDCATCH", NULL);
+38 -38
View File
@@ -1692,7 +1692,7 @@ Tcl_HideCommand(
if (strstr(hiddenCmdToken, "::") != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot use namespace qualifiers in hidden command"
" token (rename)", -1));
" token (rename)", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "HIDDENTOKEN", NULL);
return TCL_ERROR;
}
@@ -1717,7 +1717,7 @@ Tcl_HideCommand(
if (cmdPtr->nsPtr != iPtr->globalNsPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can only hide global namespace commands (use rename then hide)",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "HIDE", "NON_GLOBAL", NULL);
return TCL_ERROR;
}
@@ -1847,7 +1847,7 @@ Tcl_ExposeCommand(
if (strstr(cmdName, "::") != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot expose to a namespace (use expose to toplevel, then rename)",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "EXPOSE", "NON_GLOBAL", NULL);
return TCL_ERROR;
}
@@ -1884,7 +1884,7 @@ Tcl_ExposeCommand(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"trying to expose a non-global command namespace command",
-1));
TCL_NOSIZE));
return TCL_ERROR;
}
@@ -2596,11 +2596,11 @@ TclRenameCommand(
*/
Tcl_DStringInit(&newFullName);
Tcl_DStringAppend(&newFullName, newNsPtr->fullName, -1);
Tcl_DStringAppend(&newFullName, newNsPtr->fullName, TCL_NOSIZE);
if (newNsPtr != iPtr->globalNsPtr) {
TclDStringAppendLiteral(&newFullName, "::");
}
Tcl_DStringAppend(&newFullName, newTail, -1);
Tcl_DStringAppend(&newFullName, newTail, TCL_NOSIZE);
cmdPtr->refCount++;
CallCommandTraces(iPtr, cmdPtr, Tcl_GetString(oldFullName),
Tcl_DStringValue(&newFullName), TCL_TRACE_RENAME);
@@ -2889,14 +2889,14 @@ Tcl_GetCommandFullName(
if (cmdPtr != NULL) {
if (cmdPtr->nsPtr != NULL) {
Tcl_AppendToObj(objPtr, cmdPtr->nsPtr->fullName, -1);
Tcl_AppendToObj(objPtr, cmdPtr->nsPtr->fullName, TCL_NOSIZE);
if (cmdPtr->nsPtr != iPtr->globalNsPtr) {
Tcl_AppendToObj(objPtr, "::", 2);
}
}
if (cmdPtr->hPtr != NULL) {
name = Tcl_GetHashKey(cmdPtr->hPtr->tablePtr, cmdPtr->hPtr);
Tcl_AppendToObj(objPtr, name, -1);
Tcl_AppendToObj(objPtr, name, TCL_NOSIZE);
}
}
}
@@ -3447,7 +3447,7 @@ TclInterpReady(
if (iPtr->flags & DELETED) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to call eval in deleted interpreter", -1));
"attempt to call eval in deleted interpreter", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "IDELETE",
"attempt to call eval in deleted interpreter", NULL);
return TCL_ERROR;
@@ -3476,7 +3476,7 @@ TclInterpReady(
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"too many nested evaluations (infinite loop?)", -1));
"too many nested evaluations (infinite loop?)", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LIMIT", "STACK", NULL);
return TCL_ERROR;
}
@@ -3610,7 +3610,7 @@ Tcl_Canceled(
}
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(message, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(message, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "CANCEL", id, message, NULL);
}
@@ -4525,7 +4525,7 @@ Tcl_EvalEx(
Tcl_Interp *interp, /* Interpreter in which to evaluate the
* script. Also used for error reporting. */
const char *script, /* First character of script to evaluate. */
int numBytes, /* Number of bytes in script. If < 0, the
int numBytes, /* Number of bytes in script. If TCL_NOSIZE, the
* script consists of all bytes up to the
* first null character. */
int flags) /* Collection of OR-ed bits that control the
@@ -4605,7 +4605,7 @@ TclEvalEx(
}
}
if (numBytes < 0) {
if (numBytes == TCL_NOSIZE) {
numBytes = strlen(script);
}
Tcl_ResetResult(interp);
@@ -5449,7 +5449,7 @@ Tcl_Eval(
* previous call to Tcl_CreateInterp). */
const char *script) /* Pointer to TCL command to execute. */
{
int code = Tcl_EvalEx(interp, script, -1, 0);
int code = Tcl_EvalEx(interp, script, TCL_NOSIZE, 0);
/*
* For backwards compatibility with old C code that predates the object
@@ -5903,10 +5903,10 @@ ProcessUnexpectedResult(
Tcl_ResetResult(interp);
if (returnCode == TCL_BREAK) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"invoked \"break\" outside of a loop", -1));
"invoked \"break\" outside of a loop", TCL_NOSIZE));
} else if (returnCode == TCL_CONTINUE) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"invoked \"continue\" outside of a loop", -1));
"invoked \"continue\" outside of a loop", TCL_NOSIZE));
} else {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"command returned bad code: %d", returnCode));
@@ -5952,7 +5952,7 @@ Tcl_ExprLong(
*ptr = 0;
} else {
exprPtr = Tcl_NewStringObj(exprstring, -1);
exprPtr = Tcl_NewStringObj(exprstring, TCL_NOSIZE);
Tcl_IncrRefCount(exprPtr);
result = Tcl_ExprLongObj(interp, exprPtr, ptr);
Tcl_DecrRefCount(exprPtr);
@@ -5980,7 +5980,7 @@ Tcl_ExprDouble(
*ptr = 0.0;
} else {
exprPtr = Tcl_NewStringObj(exprstring, -1);
exprPtr = Tcl_NewStringObj(exprstring, TCL_NOSIZE);
Tcl_IncrRefCount(exprPtr);
result = Tcl_ExprDoubleObj(interp, exprPtr, ptr);
Tcl_DecrRefCount(exprPtr);
@@ -6008,7 +6008,7 @@ Tcl_ExprBoolean(
return TCL_OK;
} else {
int result;
Tcl_Obj *exprPtr = Tcl_NewStringObj(exprstring, -1);
Tcl_Obj *exprPtr = Tcl_NewStringObj(exprstring, TCL_NOSIZE);
Tcl_IncrRefCount(exprPtr);
result = Tcl_ExprBooleanObj(interp, exprPtr, ptr);
@@ -6242,7 +6242,7 @@ TclObjInvoke(
if ((objc < 1) || (objv == NULL)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"illegal argument vector", -1));
"illegal argument vector", TCL_NOSIZE));
return TCL_ERROR;
}
@@ -6336,7 +6336,7 @@ Tcl_ExprString(
Tcl_SetObjResult(interp, Tcl_NewIntObj(0));
} else {
Tcl_Obj *resultPtr, *exprObj = Tcl_NewStringObj(expr, -1);
Tcl_Obj *resultPtr, *exprObj = Tcl_NewStringObj(expr, TCL_NOSIZE);
Tcl_IncrRefCount(exprObj);
code = Tcl_ExprObj(interp, exprObj, &resultPtr);
@@ -6413,7 +6413,7 @@ Tcl_AddErrorInfo(
* pertains. */
const char *message) /* Message to record. */
{
Tcl_AddObjErrorInfo(interp, message, -1);
Tcl_AddObjErrorInfo(interp, message, TCL_NOSIZE);
}
/*
@@ -6430,7 +6430,7 @@ Tcl_AddErrorInfo(
*
* Side effects:
* "length" bytes from "message" are appended to the errorInfo field. If
* "length" is negative, use bytes up to the first NULL byte. If we are
* "length" is TCL_NOSIZE, use bytes up to the first NULL byte. If we are
* just starting to log an error, errorInfo is initialized from the error
* message in the interpreter's result.
*
@@ -6443,7 +6443,7 @@ Tcl_AddObjErrorInfo(
* pertains. */
const char *message, /* Points to the first byte of an array of
* bytes of the message. */
int length) /* The number of bytes in the message. If < 0,
int length) /* The number of bytes in the message. If TCL_NOSIZE,
* then append all bytes up to a NULL byte. */
{
register Interp *iPtr = (Interp *) interp;
@@ -6464,7 +6464,7 @@ Tcl_AddObjErrorInfo(
* interp->result completely.
*/
iPtr->errorInfo = Tcl_NewStringObj(iPtr->result, -1);
iPtr->errorInfo = Tcl_NewStringObj(iPtr->result, TCL_NOSIZE);
} else {
iPtr->errorInfo = iPtr->objResultPtr;
}
@@ -6527,7 +6527,7 @@ Tcl_VarEvalVA(
if (string == NULL) {
break;
}
Tcl_DStringAppend(&buf, string, -1);
Tcl_DStringAppend(&buf, string, TCL_NOSIZE);
}
result = Tcl_Eval(interp, Tcl_DStringValue(&buf));
@@ -6888,7 +6888,7 @@ ExprIsqrtFunc(
negarg:
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"square root of negative argument", -1));
"square root of negative argument", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
"domain error: argument not in valid range", NULL);
return TCL_ERROR;
@@ -7939,7 +7939,7 @@ TclNRTailcallObjCmd(
if (!(iPtr->varFramePtr->isProcCallFrame & 1)) { /* or is upleveled */
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"tailcall can only be called from a proc or lambda", -1));
"tailcall can only be called from a proc or lambda", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "TAILCALL", "ILLEGAL", NULL);
return TCL_ERROR;
}
@@ -7970,7 +7970,7 @@ TclNRTailcallObjCmd(
listPtr = Tcl_NewListObj(objc-1, objv+1);
Tcl_IncrRefCount(listPtr);
nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, -1);
nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, TCL_NOSIZE);
if ((TCL_OK != TclGetNamespaceFromObj(interp, nsObjPtr, &ns1Ptr))
|| (nsPtr != ns1Ptr)) {
Tcl_Panic("Tailcall failed to find the proper namespace");
@@ -8099,7 +8099,7 @@ TclNRYieldObjCmd(
if (!corPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"yield can only be called in a coroutine", -1));
"yield can only be called in a coroutine", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD", NULL);
return TCL_ERROR;
}
@@ -8133,7 +8133,7 @@ TclNRYieldToObjCmd(
if (!corPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"yieldto can only be called in a coroutine", -1));
"yieldto can only be called in a coroutine", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD", NULL);
return TCL_ERROR;
}
@@ -8147,7 +8147,7 @@ TclNRYieldToObjCmd(
listPtr = Tcl_NewListObj(objc-1, objv+1);
Tcl_IncrRefCount(listPtr);
nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, -1);
nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, TCL_NOSIZE);
if ((TCL_OK != TclGetNamespaceFromObj(interp, nsObjPtr, &ns1Ptr))
|| (nsPtr != ns1Ptr)) {
Tcl_Panic("yieldto failed to find the proper namespace");
@@ -8382,7 +8382,7 @@ TclNRCoroutineActivateCallback(
if (corPtr->stackLevel != stackLevel) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot yield: C stack busy", -1));
"cannot yield: C stack busy", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "CANT_YIELD",
NULL);
return TCL_ERROR;
@@ -8442,7 +8442,7 @@ NRCoroInjectObjCmd(
cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, objv[1]);
if ((!cmdPtr) || (cmdPtr->nreProc != TclNRInterpCoroutine)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can only inject a command into a coroutine", -1));
"can only inject a command into a coroutine", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COROUTINE",
TclGetString(objv[1]), NULL);
return TCL_ERROR;
@@ -8451,7 +8451,7 @@ NRCoroInjectObjCmd(
corPtr = cmdPtr->objClientData;
if (!COR_IS_SUSPENDED(corPtr)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can only inject a command into a suspended coroutine", -1));
"can only inject a command into a suspended coroutine", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", NULL);
return TCL_ERROR;
}
@@ -8504,7 +8504,7 @@ TclNRInterpCoroutine(
if (corPtr->nargs != objc-1) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("wrong coro nargs; how did we get here? "
"not implemented!", -1));
"not implemented!", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
return TCL_ERROR;
}
@@ -8592,10 +8592,10 @@ TclNRCoroutineObjCmd(
Tcl_DStringInit(&ds);
if (nsPtr != iPtr->globalNsPtr) {
Tcl_DStringAppend(&ds, nsPtr->fullName, -1);
Tcl_DStringAppend(&ds, nsPtr->fullName, TCL_NOSIZE);
TclDStringAppendLiteral(&ds, "::");
}
Tcl_DStringAppend(&ds, procName, -1);
Tcl_DStringAppend(&ds, procName, TCL_NOSIZE);
cmdPtr = (Command *) Tcl_NRCreateCommand(interp, Tcl_DStringValue(&ds),
/*objProc*/ NULL, TclNRInterpCoroutine, corPtr, DeleteCoroutine);
+4 -4
View File
@@ -873,7 +873,7 @@ BinaryFormatCmd(
} else if (count > listc) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"number of elements in list does not match count",
-1));
TCL_NOSIZE));
return TCL_ERROR;
}
}
@@ -883,7 +883,7 @@ BinaryFormatCmd(
case 'x':
if (count == BINARY_ALL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot use \"*\" in format string with \"x\"", -1));
"cannot use \"*\" in format string with \"x\"", TCL_NOSIZE));
return TCL_ERROR;
} else if (count == BINARY_NOCOUNT) {
count = 1;
@@ -1221,7 +1221,7 @@ BinaryFormatCmd(
}
error:
Tcl_SetObjResult(interp, Tcl_NewStringObj(errorString, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(errorString, TCL_NOSIZE));
return TCL_ERROR;
}
@@ -1591,7 +1591,7 @@ BinaryScanCmd(
}
error:
Tcl_SetObjResult(interp, Tcl_NewStringObj(errorString, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(errorString, TCL_NOSIZE));
return TCL_ERROR;
}
+1 -1
View File
@@ -196,7 +196,7 @@ TclDumpMemoryInfo(
fprintf((FILE *)clientData, "%s", buf);
} else {
/* Assume objPtr to append to */
Tcl_AppendToObj((Tcl_Obj *) clientData, buf, -1);
Tcl_AppendToObj((Tcl_Obj *) clientData, buf, TCL_NOSIZE);
}
return 1;
}
+7 -7
View File
@@ -270,7 +270,7 @@ TclClockInit(
data->refCount = 0;
data->literals = ckalloc(LIT__END * sizeof(Tcl_Obj*));
for (i = 0; i < LIT__END; ++i) {
data->literals[i] = Tcl_NewStringObj(literals[i], -1);
data->literals[i] = Tcl_NewStringObj(literals[i], TCL_NOSIZE);
Tcl_IncrRefCount(data->literals[i]);
}
@@ -346,7 +346,7 @@ ClockConvertlocaltoutcObjCmd(
}
if (secondsObj == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("key \"localseconds\" not "
"found in dictionary", -1));
"found in dictionary", TCL_NOSIZE));
return TCL_ERROR;
}
if ((Tcl_GetWideIntFromObj(interp, secondsObj,
@@ -879,7 +879,7 @@ ConvertLocalToUTCUsingC(
if (localErrno != 0
|| (fields->seconds == -1 && timeVal.tm_yday == -1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"time value too large/small to represent", -1));
"time value too large/small to represent", TCL_NOSIZE));
return TCL_ERROR;
}
return TCL_OK;
@@ -1019,7 +1019,7 @@ ConvertUTCToLocalUsingC(
tock = (time_t) fields->seconds;
if ((Tcl_WideInt) tock != fields->seconds) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"number too large to represent as a Posix time", -1));
"number too large to represent as a Posix time", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "CLOCK", "argTooLarge", NULL);
return TCL_ERROR;
}
@@ -1028,7 +1028,7 @@ ConvertUTCToLocalUsingC(
if (timeVal == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"localtime failed (clock value may be too "
"large/small to represent)", -1));
"large/small to represent)", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "CLOCK", "localtimeFailed", NULL);
return TCL_ERROR;
}
@@ -1070,7 +1070,7 @@ ConvertUTCToLocalUsingC(
if (diff > 0) {
sprintf(buffer+5, "%02d", diff);
}
fields->tzName = Tcl_NewStringObj(buffer, -1);
fields->tzName = Tcl_NewStringObj(buffer, TCL_NOSIZE);
Tcl_IncrRefCount(fields->tzName);
return TCL_OK;
}
@@ -1610,7 +1610,7 @@ ClockGetenvObjCmd(
if (varValue == NULL) {
varValue = "";
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(varValue, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(varValue, TCL_NOSIZE));
return TCL_OK;
}
+7 -7
View File
@@ -467,7 +467,7 @@ Tcl_EncodingObjCmd(
}
if (objc == 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
Tcl_GetEncodingName(NULL), -1));
Tcl_GetEncodingName(NULL), TCL_NOSIZE));
} else {
return Tcl_SetSystemEncoding(interp, TclGetString(objv[2]));
}
@@ -924,9 +924,9 @@ TclMakeFileCommandSafe(
const char *oldName, *newName;
Tcl_DStringSetLength(&oldBuf, 13);
oldName = Tcl_DStringAppend(&oldBuf, unsafeInfo[i].cmdName, -1);
oldName = Tcl_DStringAppend(&oldBuf, unsafeInfo[i].cmdName, TCL_NOSIZE);
Tcl_DStringSetLength(&newBuf, 9);
newName = Tcl_DStringAppend(&newBuf, unsafeInfo[i].cmdName, -1);
newName = Tcl_DStringAppend(&newBuf, unsafeInfo[i].cmdName, TCL_NOSIZE);
if (TclRenameCommand(interp, oldName, "___tmp") != TCL_OK
|| Tcl_HideCommand(interp, "___tmp", newName) != TCL_OK) {
Tcl_Panic("problem making 'file %s' safe: %s",
@@ -1234,7 +1234,7 @@ FileAttrTypeCmd(
return TCL_ERROR;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(
GetTypeFromMode((unsigned short) buf.st_mode), -1));
GetTypeFromMode((unsigned short) buf.st_mode), TCL_NOSIZE));
return TCL_OK;
}
@@ -1713,7 +1713,7 @@ PathFilesystemCmd(
}
fsInfo = Tcl_FSFileSystemInfo(objv[1]);
if (fsInfo == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("unrecognised path", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("unrecognised path", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "FILESYSTEM",
Tcl_GetString(objv[1]), NULL);
return TCL_ERROR;
@@ -1965,7 +1965,7 @@ FilesystemSeparatorCmd(
if (separatorObj == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unrecognised path", -1));
"unrecognised path", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "FILESYSTEM",
Tcl_GetString(objv[1]), NULL);
return TCL_ERROR;
@@ -2163,7 +2163,7 @@ StoreStatData(
STORE_ARY("ctime", Tcl_NewLongObj((long)statPtr->st_ctime));
mode = (unsigned short) statPtr->st_mode;
STORE_ARY("mode", Tcl_NewIntObj(mode));
STORE_ARY("type", Tcl_NewStringObj(GetTypeFromMode(mode), -1));
STORE_ARY("type", Tcl_NewStringObj(GetTypeFromMode(mode), TCL_NOSIZE));
#undef STORE_ARY
return TCL_OK;
+36 -36
View File
@@ -349,7 +349,7 @@ IfConditionCallback(
if (i < objc - 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"wrong # args: extra words after \"else\" clause in \"if\" command",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
return TCL_ERROR;
}
@@ -509,7 +509,7 @@ InfoArgsCmd(
localPtr = localPtr->nextPtr) {
if (TclIsVarArgument(localPtr)) {
Tcl_ListObjAppendElement(interp, listObjPtr,
Tcl_NewStringObj(localPtr->name, -1));
Tcl_NewStringObj(localPtr->name, TCL_NOSIZE));
}
}
Tcl_SetObjResult(interp, listObjPtr);
@@ -731,7 +731,7 @@ InfoCommandsCmd(
Tcl_GetCommandFullName(interp, cmd, elemObjPtr);
} else {
cmdName = Tcl_GetHashKey(&nsPtr->cmdTable, entryPtr);
elemObjPtr = Tcl_NewStringObj(cmdName, -1);
elemObjPtr = Tcl_NewStringObj(cmdName, TCL_NOSIZE);
}
Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
Tcl_SetObjResult(interp, listPtr);
@@ -759,7 +759,7 @@ InfoCommandsCmd(
if (entryPtr != NULL) {
cmdName = Tcl_GetHashKey(tablePtr, entryPtr);
Tcl_ListObjAppendElement(interp, listPtr,
Tcl_NewStringObj(cmdName, -1));
Tcl_NewStringObj(cmdName, TCL_NOSIZE));
Tcl_SetObjResult(interp, listPtr);
return TCL_OK;
}
@@ -781,7 +781,7 @@ InfoCommandsCmd(
elemObjPtr = Tcl_NewObj();
Tcl_GetCommandFullName(interp, cmd, elemObjPtr);
} else {
elemObjPtr = Tcl_NewStringObj(cmdName, -1);
elemObjPtr = Tcl_NewStringObj(cmdName, TCL_NOSIZE);
}
Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
}
@@ -804,7 +804,7 @@ InfoCommandsCmd(
|| Tcl_StringMatch(cmdName, simplePattern)) {
if (Tcl_FindHashEntry(&nsPtr->cmdTable,cmdName) == NULL) {
Tcl_ListObjAppendElement(interp, listPtr,
Tcl_NewStringObj(cmdName, -1));
Tcl_NewStringObj(cmdName, TCL_NOSIZE));
}
}
entryPtr = Tcl_NextHashEntry(&search);
@@ -833,7 +833,7 @@ InfoCommandsCmd(
cmdName = Tcl_GetHashKey(&nsPtr->cmdTable, entryPtr);
if ((simplePattern == NULL)
|| Tcl_StringMatch(cmdName, simplePattern)) {
elemObjPtr = Tcl_NewStringObj(cmdName, -1);
elemObjPtr = Tcl_NewStringObj(cmdName, TCL_NOSIZE);
Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
(void) Tcl_CreateHashEntry(&addedCommandsTable,
elemObjPtr, &isNew);
@@ -859,7 +859,7 @@ InfoCommandsCmd(
cmdName = Tcl_GetHashKey(&pathNsPtr->cmdTable, entryPtr);
if ((simplePattern == NULL)
|| Tcl_StringMatch(cmdName, simplePattern)) {
elemObjPtr = Tcl_NewStringObj(cmdName, -1);
elemObjPtr = Tcl_NewStringObj(cmdName, TCL_NOSIZE);
(void) Tcl_CreateHashEntry(&addedCommandsTable,
elemObjPtr, &isNew);
if (isNew) {
@@ -886,7 +886,7 @@ InfoCommandsCmd(
cmdName = Tcl_GetHashKey(&globalNsPtr->cmdTable, entryPtr);
if ((simplePattern == NULL)
|| Tcl_StringMatch(cmdName, simplePattern)) {
elemObjPtr = Tcl_NewStringObj(cmdName, -1);
elemObjPtr = Tcl_NewStringObj(cmdName, TCL_NOSIZE);
if (Tcl_FindHashEntry(&addedCommandsTable,
(char *) elemObjPtr) == NULL) {
Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
@@ -1301,7 +1301,7 @@ TclInfoFrame(
* str.
*/
ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], -1));
ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], TCL_NOSIZE));
ADD_PAIR("line", Tcl_NewIntObj(framePtr->line[0]));
ADD_PAIR("cmd", Tcl_NewStringObj(framePtr->cmd.str.cmd,
framePtr->cmd.str.len));
@@ -1313,7 +1313,7 @@ TclInfoFrame(
* listPtr, possibly a frame.
*/
ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], -1));
ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], TCL_NOSIZE));
ADD_PAIR("line", Tcl_NewIntObj(1));
/*
@@ -1331,7 +1331,7 @@ TclInfoFrame(
* Precompiled. Result contains the type as signal, nothing else.
*/
ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], -1));
ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], TCL_NOSIZE));
break;
case TCL_LOCATION_BC: {
@@ -1356,7 +1356,7 @@ TclInfoFrame(
* Possibly modified: type, path!
*/
ADD_PAIR("type", Tcl_NewStringObj(typeString[fPtr->type], -1));
ADD_PAIR("type", Tcl_NewStringObj(typeString[fPtr->type], TCL_NOSIZE));
if (fPtr->line) {
ADD_PAIR("line", Tcl_NewIntObj(fPtr->line[0]));
}
@@ -1382,7 +1382,7 @@ TclInfoFrame(
* Evaluation of a script file.
*/
ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], -1));
ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], TCL_NOSIZE));
ADD_PAIR("line", Tcl_NewIntObj(framePtr->line[0]));
ADD_PAIR("file", framePtr->data.eval.path);
@@ -1429,7 +1429,7 @@ TclInfoFrame(
*/
for (i=0 ; i<efiPtr->length ; i++) {
lv[lc++] = Tcl_NewStringObj(efiPtr->fields[i].name, -1);
lv[lc++] = Tcl_NewStringObj(efiPtr->fields[i].name, TCL_NOSIZE);
if (efiPtr->fields[i].proc) {
lv[lc++] =
efiPtr->fields[i].proc(efiPtr->fields[i].clientData);
@@ -1513,7 +1513,7 @@ InfoFunctionsCmd(
" }\n"
" }\n"
" ::return $cmds\n"
" } [::namespace current]] ", -1);
" } [::namespace current]] ", TCL_NOSIZE);
if (objc == 2) {
Tcl_Obj *arg = Tcl_NewListObj(1, &(objv[1]));
@@ -1566,12 +1566,12 @@ InfoHostnameCmd(
name = Tcl_GetHostName();
if (name) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(name, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(name, TCL_NOSIZE));
return TCL_OK;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unable to determine name of host", -1));
"unable to determine name of host", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "HOSTNAME", "UNKNOWN", NULL);
return TCL_ERROR;
}
@@ -1686,12 +1686,12 @@ InfoLibraryCmd(
libDirName = Tcl_GetVar(interp, "tcl_library", TCL_GLOBAL_ONLY);
if (libDirName != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(libDirName, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(libDirName, TCL_NOSIZE));
return TCL_OK;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"no library has been specified for Tcl", -1));
"no library has been specified for Tcl", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARIABLE", "tcl_library",NULL);
return TCL_ERROR;
}
@@ -1813,7 +1813,7 @@ InfoPatchLevelCmd(
patchlevel = Tcl_GetVar(interp, "tcl_patchLevel",
(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
if (patchlevel != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(patchlevel, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(patchlevel, TCL_NOSIZE));
return TCL_OK;
}
return TCL_ERROR;
@@ -1926,7 +1926,7 @@ InfoProcsCmd(
Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr,
elemObjPtr);
} else {
elemObjPtr = Tcl_NewStringObj(simplePattern, -1);
elemObjPtr = Tcl_NewStringObj(simplePattern, TCL_NOSIZE);
}
Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
}
@@ -1954,7 +1954,7 @@ InfoProcsCmd(
Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr,
elemObjPtr);
} else {
elemObjPtr = Tcl_NewStringObj(cmdName, -1);
elemObjPtr = Tcl_NewStringObj(cmdName, TCL_NOSIZE);
}
Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
}
@@ -1993,7 +1993,7 @@ InfoProcsCmd(
if (TclIsProc(cmdPtr) || ((realCmdPtr != NULL)
&& TclIsProc(realCmdPtr))) {
Tcl_ListObjAppendElement(interp, listPtr,
Tcl_NewStringObj(cmdName, -1));
Tcl_NewStringObj(cmdName, TCL_NOSIZE));
}
}
}
@@ -2090,7 +2090,7 @@ InfoSharedlibCmd(
}
#ifdef TCL_SHLIB_EXT
Tcl_SetObjResult(interp, Tcl_NewStringObj(TCL_SHLIB_EXT, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(TCL_SHLIB_EXT, TCL_NOSIZE));
#endif
return TCL_OK;
}
@@ -3034,7 +3034,7 @@ Tcl_LsearchObjCmd(
}
if (i > objc-4) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing starting index", -1));
"missing starting index", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
result = TCL_ERROR;
goto done;
@@ -3067,7 +3067,7 @@ Tcl_LsearchObjCmd(
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-index\" option must be followed by list index",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
return TCL_ERROR;
}
@@ -3127,7 +3127,7 @@ Tcl_LsearchObjCmd(
Tcl_DecrRefCount(startPtr);
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-subindices cannot be used without -index option", -1));
"-subindices cannot be used without -index option", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
"BAD_OPTION_MIX", NULL);
return TCL_ERROR;
@@ -3135,7 +3135,7 @@ Tcl_LsearchObjCmd(
if (bisect && (allMatches || negatedMatch)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-bisect is not compatible with -all or -not", -1));
"-bisect is not compatible with -all or -not", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
"BAD_OPTION_MIX", NULL);
return TCL_ERROR;
@@ -3704,7 +3704,7 @@ Tcl_LsortObjCmd(
if (i == objc-2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-command\" option must be followed "
"by comparison command", -1));
"by comparison command", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
sortInfo.resultCode = TCL_ERROR;
goto done2;
@@ -3729,7 +3729,7 @@ Tcl_LsortObjCmd(
if (i == objc-2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-index\" option must be followed by list index",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
sortInfo.resultCode = TCL_ERROR;
goto done2;
@@ -3780,7 +3780,7 @@ Tcl_LsortObjCmd(
if (i == objc-2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-stride\" option must be "
"followed by stride length", -1));
"followed by stride length", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
sortInfo.resultCode = TCL_ERROR;
goto done2;
@@ -3791,7 +3791,7 @@ Tcl_LsortObjCmd(
}
if (groupSize < 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"stride length must be at least 2", -1));
"stride length must be at least 2", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT",
"BADSTRIDE", NULL);
sortInfo.resultCode = TCL_ERROR;
@@ -3889,7 +3889,7 @@ Tcl_LsortObjCmd(
if (length % groupSize) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"list size must be a multiple of the stride length",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT", "BADSTRIDE",
NULL);
sortInfo.resultCode = TCL_ERROR;
@@ -3909,7 +3909,7 @@ Tcl_LsortObjCmd(
if (groupOffset < 0 || groupOffset >= groupSize) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"when used with \"-stride\", the leading \"-index\""
" value must be within the group", -1));
" value must be within the group", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT",
"BADINDEX", NULL);
sortInfo.resultCode = TCL_ERROR;
@@ -4296,7 +4296,7 @@ SortCompare(
if (TclGetIntFromObj(infoPtr->interp,
Tcl_GetObjResult(infoPtr->interp), &order) != TCL_OK) {
Tcl_SetObjResult(infoPtr->interp, Tcl_NewStringObj(
"-compare command returned non-integer result", -1));
"-compare command returned non-integer result", TCL_NOSIZE));
Tcl_SetErrorCode(infoPtr->interp, "TCL", "OPERATION", "LSORT",
"COMPARISONFAILED", NULL);
infoPtr->resultCode = TCL_ERROR;
+16 -16
View File
@@ -228,7 +228,7 @@ Tcl_RegexpObjCmd(
if (doinline && ((objc - 2) != 0)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"regexp match variables not allowed when using -inline", -1));
"regexp match variables not allowed when using -inline", TCL_NOSIZE));
goto optionError;
}
@@ -1578,7 +1578,7 @@ StringIsCmd(
goto str_is_done;
}
end = string1 + length1;
if (TclParseNumber(NULL, objPtr, NULL, NULL, -1,
if (TclParseNumber(NULL, objPtr, NULL, NULL, TCL_NOSIZE,
(const char **) &stop, 0) != TCL_OK) {
result = 0;
failat = 0;
@@ -1615,7 +1615,7 @@ StringIsCmd(
goto str_is_done;
}
end = string1 + length1;
if (TclParseNumber(NULL, objPtr, NULL, NULL, -1,
if (TclParseNumber(NULL, objPtr, NULL, NULL, TCL_NOSIZE,
(const char **) &stop, TCL_PARSE_INTEGER_ONLY) == TCL_OK) {
if (stop == end) {
/*
@@ -1667,7 +1667,7 @@ StringIsCmd(
break;
}
end = string1 + length1;
if (TclParseNumber(NULL, objPtr, NULL, NULL, -1,
if (TclParseNumber(NULL, objPtr, NULL, NULL, TCL_NOSIZE,
(const char **) &stop, TCL_PARSE_INTEGER_ONLY) == TCL_OK) {
if (stop == end) {
/*
@@ -1927,7 +1927,7 @@ StringMapCmd(
*/
Tcl_SetObjResult(interp,
Tcl_NewStringObj("char map list unbalanced", -1));
Tcl_NewStringObj("char map list unbalanced", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "MAP",
"UNBALANCED", NULL);
return TCL_ERROR;
@@ -2980,7 +2980,7 @@ StringLowerCmd(
length2 = Tcl_UtfToLower(string2);
Tcl_SetObjLength(resultPtr, length2 + (start - string1));
Tcl_AppendToObj(resultPtr, end, -1);
Tcl_AppendToObj(resultPtr, end, TCL_NOSIZE);
Tcl_SetObjResult(interp, resultPtr);
}
@@ -3065,7 +3065,7 @@ StringUpperCmd(
length2 = Tcl_UtfToUpper(string2);
Tcl_SetObjLength(resultPtr, length2 + (start - string1));
Tcl_AppendToObj(resultPtr, end, -1);
Tcl_AppendToObj(resultPtr, end, TCL_NOSIZE);
Tcl_SetObjResult(interp, resultPtr);
}
@@ -3150,7 +3150,7 @@ StringTitleCmd(
length2 = Tcl_UtfToTitle(string2);
Tcl_SetObjLength(resultPtr, length2 + (start - string1));
Tcl_AppendToObj(resultPtr, end, -1);
Tcl_AppendToObj(resultPtr, end, TCL_NOSIZE);
Tcl_SetObjResult(interp, resultPtr);
}
@@ -3650,7 +3650,7 @@ TclNRSwitchObjCmd(
if (objc % 2) {
Tcl_ResetResult(interp);
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"extra switch pattern with no body", -1));
"extra switch pattern with no body", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "SWITCH", "BADARM",
NULL);
@@ -3668,7 +3668,7 @@ TclNRSwitchObjCmd(
Tcl_AppendToObj(Tcl_GetObjResult(interp),
", this may be due to a comment incorrectly"
" placed outside of a switch body - see the"
" \"switch\" documentation", -1);
" \"switch\" documentation", TCL_NOSIZE);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "SWITCH",
"BADARM", "COMMENT?", NULL);
break;
@@ -4014,7 +4014,7 @@ Tcl_ThrowObjCmd(
return TCL_ERROR;
} else if (len < 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"type must be non-empty list", -1));
"type must be non-empty list", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "THROW", "BADEXCEPTION",
NULL);
return TCL_ERROR;
@@ -4199,7 +4199,7 @@ TclNRTryObjCmd(
case TryFinally: /* finally script */
if (i < objc-2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"finally clause must be last", -1));
"finally clause must be last", TCL_NOSIZE));
Tcl_DecrRefCount(handlersObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "FINALLY",
"NONTERMINAL", NULL);
@@ -4207,7 +4207,7 @@ TclNRTryObjCmd(
} else if (i == objc-1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"wrong # args to finally clause: must be"
" \"... finally script\"", -1));
" \"... finally script\"", TCL_NOSIZE));
Tcl_DecrRefCount(handlersObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "FINALLY",
"ARGUMENT", NULL);
@@ -4220,7 +4220,7 @@ TclNRTryObjCmd(
if (i > objc-4) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"wrong # args to on clause: must be \"... on code"
" variableList script\"", -1));
" variableList script\"", TCL_NOSIZE));
Tcl_DecrRefCount(handlersObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "ON",
"ARGUMENT", NULL);
@@ -4239,7 +4239,7 @@ TclNRTryObjCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"wrong # args to trap clause: "
"must be \"... trap pattern variableList script\"",
-1));
TCL_NOSIZE));
Tcl_DecrRefCount(handlersObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "TRAP",
"ARGUMENT", NULL);
@@ -4281,7 +4281,7 @@ TclNRTryObjCmd(
}
if (bodyShared) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"last non-finally clause must not have a body of \"-\"", -1));
"last non-finally clause must not have a body of \"-\"", TCL_NOSIZE));
Tcl_DecrRefCount(handlersObj);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "BADFALLTHROUGH",
NULL);
+6 -6
View File
@@ -2191,7 +2191,7 @@ PrintDictUpdateInfo(
for (i=0 ; i<duiPtr->length ; i++) {
if (i) {
Tcl_AppendToObj(appendObj, ", ", -1);
Tcl_AppendToObj(appendObj, ", ", TCL_NOSIZE);
}
Tcl_AppendPrintfToObj(appendObj, "%%v%u", duiPtr->varIndices[i]);
}
@@ -2952,11 +2952,11 @@ PrintForeachInfo(
register ForeachVarList *varsPtr;
int i, j;
Tcl_AppendToObj(appendObj, "data=[", -1);
Tcl_AppendToObj(appendObj, "data=[", TCL_NOSIZE);
for (i=0 ; i<infoPtr->numLists ; i++) {
if (i) {
Tcl_AppendToObj(appendObj, ", ", -1);
Tcl_AppendToObj(appendObj, ", ", TCL_NOSIZE);
}
Tcl_AppendPrintfToObj(appendObj, "%%v%u",
(unsigned) (infoPtr->firstValueTemp + i));
@@ -2965,19 +2965,19 @@ PrintForeachInfo(
(unsigned) infoPtr->loopCtTemp);
for (i=0 ; i<infoPtr->numLists ; i++) {
if (i) {
Tcl_AppendToObj(appendObj, ",", -1);
Tcl_AppendToObj(appendObj, ",", TCL_NOSIZE);
}
Tcl_AppendPrintfToObj(appendObj, "\n\t\t it%%v%u\t[",
(unsigned) (infoPtr->firstValueTemp + i));
varsPtr = infoPtr->varLists[i];
for (j=0 ; j<varsPtr->numVars ; j++) {
if (j) {
Tcl_AppendToObj(appendObj, ", ", -1);
Tcl_AppendToObj(appendObj, ", ", TCL_NOSIZE);
}
Tcl_AppendPrintfToObj(appendObj, "%%v%u",
(unsigned) varsPtr->varIndexes[j]);
}
Tcl_AppendToObj(appendObj, "]", -1);
Tcl_AppendToObj(appendObj, "]", TCL_NOSIZE);
}
}
+3 -3
View File
@@ -1879,9 +1879,9 @@ PrintJumptableInfo(
offset = PTR2INT(Tcl_GetHashValue(hPtr));
if (i++) {
Tcl_AppendToObj(appendObj, ", ", -1);
Tcl_AppendToObj(appendObj, ", ", TCL_NOSIZE);
if (i%4==0) {
Tcl_AppendToObj(appendObj, "\n\t\t", -1);
Tcl_AppendToObj(appendObj, "\n\t\t", TCL_NOSIZE);
}
}
Tcl_AppendPrintfToObj(appendObj, "\"%s\"->pc %d",
@@ -3308,7 +3308,7 @@ CompileAssociativeBinaryOpCmd(
CompileWord(envPtr, tokenPtr, interp, words);
}
if (parsePtr->numWords <= 2) {
PushLiteral(envPtr, identity, -1);
PushLiteral(envPtr, identity, TCL_NOSIZE);
words++;
}
if (words > 3) {
+4 -4
View File
@@ -762,14 +762,14 @@ ParseExpr(
switch (start[1]) {
case 'b':
Tcl_AppendToObj(post,
" (invalid binary number?)", -1);
" (invalid binary number?)", TCL_NOSIZE);
parsePtr->errorType = TCL_PARSE_BAD_NUMBER;
errCode = "BADNUMBER";
subErrCode = "BINARY";
break;
case 'o':
Tcl_AppendToObj(post,
" (invalid octal number?)", -1);
" (invalid octal number?)", TCL_NOSIZE);
parsePtr->errorType = TCL_PARSE_BAD_NUMBER;
errCode = "BADNUMBER";
subErrCode = "OCTAL";
@@ -777,7 +777,7 @@ ParseExpr(
default:
if (isdigit(UCHAR(start[1]))) {
Tcl_AppendToObj(post,
" (invalid octal number?)", -1);
" (invalid octal number?)", TCL_NOSIZE);
parsePtr->errorType = TCL_PARSE_BAD_NUMBER;
errCode = "BADNUMBER";
subErrCode = "OCTAL";
@@ -1426,7 +1426,7 @@ ParseExpr(
*/
if (post != NULL) {
Tcl_AppendToObj(msg, ";\n", -1);
Tcl_AppendToObj(msg, ";\n", TCL_NOSIZE);
Tcl_AppendObjToObj(msg, post);
Tcl_DecrRefCount(post);
}
+20 -20
View File
@@ -4081,7 +4081,7 @@ TclDisassembleByteCodeObj(
"ByteCode 0x%s, refCt %u, epoch %u, interp 0x%s (epoch %u)\n",
ptrBuf1, codePtr->refCount, codePtr->compileEpoch, ptrBuf2,
iPtr->compileEpoch);
Tcl_AppendToObj(bufferObj, " Source ", -1);
Tcl_AppendToObj(bufferObj, " Source ", TCL_NOSIZE);
PrintSourceToObj(bufferObj, codePtr->source,
TclMin(codePtr->numSrcBytes, 55));
Tcl_AppendPrintfToObj(bufferObj,
@@ -4135,7 +4135,7 @@ TclDisassembleByteCodeObj(
(localPtr->flags & VAR_TEMPORARY) ? ", temp" : "",
(localPtr->flags & VAR_RESOLVED) ? ", resolved" : "");
if (TclIsVarTemporary(localPtr)) {
Tcl_AppendToObj(bufferObj, "\n", -1);
Tcl_AppendToObj(bufferObj, "\n", TCL_NOSIZE);
} else {
Tcl_AppendPrintfToObj(bufferObj, ", \"%s\"\n",
localPtr->name);
@@ -4185,7 +4185,7 @@ TclDisassembleByteCodeObj(
if (numCmds == 0) {
pc = codeStart;
while (pc < codeLimit) {
Tcl_AppendToObj(bufferObj, " ", -1);
Tcl_AppendToObj(bufferObj, " ", TCL_NOSIZE);
pc += FormatInstruction(codePtr, pc, bufferObj);
}
return bufferObj;
@@ -4247,7 +4247,7 @@ TclDisassembleByteCodeObj(
srcOffset, (srcOffset + srcLen - 1));
}
if (numCmds > 0) {
Tcl_AppendToObj(bufferObj, "\n", -1);
Tcl_AppendToObj(bufferObj, "\n", TCL_NOSIZE);
}
/*
@@ -4296,14 +4296,14 @@ TclDisassembleByteCodeObj(
*/
while ((pc-codeStart) < codeOffset) {
Tcl_AppendToObj(bufferObj, " ", -1);
Tcl_AppendToObj(bufferObj, " ", TCL_NOSIZE);
pc += FormatInstruction(codePtr, pc, bufferObj);
}
Tcl_AppendPrintfToObj(bufferObj, " Command %d: ", i+1);
PrintSourceToObj(bufferObj, (codePtr->source + srcOffset),
TclMin(srcLen, 55));
Tcl_AppendToObj(bufferObj, "\n", -1);
Tcl_AppendToObj(bufferObj, "\n", TCL_NOSIZE);
}
if (pc < codeLimit) {
/*
@@ -4311,7 +4311,7 @@ TclDisassembleByteCodeObj(
*/
while (pc < codeLimit) {
Tcl_AppendToObj(bufferObj, " ", -1);
Tcl_AppendToObj(bufferObj, " ", TCL_NOSIZE);
pc += FormatInstruction(codePtr, pc, bufferObj);
}
}
@@ -4435,7 +4435,7 @@ FormatInstruction(
const char *bytes;
int length;
Tcl_AppendToObj(bufferObj, "\t# ", -1);
Tcl_AppendToObj(bufferObj, "\t# ", TCL_NOSIZE);
bytes = Tcl_GetStringFromObj(codePtr->objArrayPtr[opnd], &length);
PrintSourceToObj(bufferObj, bytes, TclMin(length, 40));
} else if (suffixBuffer[0]) {
@@ -4444,12 +4444,12 @@ FormatInstruction(
PrintSourceToObj(bufferObj, suffixSrc, 40);
}
}
Tcl_AppendToObj(bufferObj, "\n", -1);
Tcl_AppendToObj(bufferObj, "\n", TCL_NOSIZE);
if (auxPtr && auxPtr->type->printProc) {
Tcl_AppendToObj(bufferObj, "\t\t[", -1);
Tcl_AppendToObj(bufferObj, "\t\t[", TCL_NOSIZE);
auxPtr->type->printProc(auxPtr->clientData, bufferObj, codePtr,
pcOffset);
Tcl_AppendToObj(bufferObj, "]\n", -1);
Tcl_AppendToObj(bufferObj, "]\n", TCL_NOSIZE);
}
return numBytes;
}
@@ -4641,38 +4641,38 @@ PrintSourceToObj(
register int i = 0;
if (stringPtr == NULL) {
Tcl_AppendToObj(appendObj, "\"\"", -1);
Tcl_AppendToObj(appendObj, "\"\"", TCL_NOSIZE);
return;
}
Tcl_AppendToObj(appendObj, "\"", -1);
Tcl_AppendToObj(appendObj, "\"", TCL_NOSIZE);
p = stringPtr;
for (; (*p != '\0') && (i < maxChars); p++, i++) {
switch (*p) {
case '"':
Tcl_AppendToObj(appendObj, "\\\"", -1);
Tcl_AppendToObj(appendObj, "\\\"", TCL_NOSIZE);
continue;
case '\f':
Tcl_AppendToObj(appendObj, "\\f", -1);
Tcl_AppendToObj(appendObj, "\\f", TCL_NOSIZE);
continue;
case '\n':
Tcl_AppendToObj(appendObj, "\\n", -1);
Tcl_AppendToObj(appendObj, "\\n", TCL_NOSIZE);
continue;
case '\r':
Tcl_AppendToObj(appendObj, "\\r", -1);
Tcl_AppendToObj(appendObj, "\\r", TCL_NOSIZE);
continue;
case '\t':
Tcl_AppendToObj(appendObj, "\\t", -1);
Tcl_AppendToObj(appendObj, "\\t", TCL_NOSIZE);
continue;
case '\v':
Tcl_AppendToObj(appendObj, "\\v", -1);
Tcl_AppendToObj(appendObj, "\\v", TCL_NOSIZE);
continue;
default:
Tcl_AppendPrintfToObj(appendObj, "%c", *p);
continue;
}
}
Tcl_AppendToObj(appendObj, "\"", -1);
Tcl_AppendToObj(appendObj, "\"", TCL_NOSIZE);
}
#ifdef TCL_COMPILE_STATS
+8 -8
View File
@@ -81,7 +81,7 @@ Tcl_RegisterConfig(
QCCD *cdPtr = ckalloc(sizeof(QCCD));
cdPtr->interp = interp;
cdPtr->pkg = Tcl_NewStringObj(pkgName, -1);
cdPtr->pkg = Tcl_NewStringObj(pkgName, TCL_NOSIZE);
/*
* Phase I: Adding the provided information to the internal database of
@@ -124,15 +124,15 @@ Tcl_RegisterConfig(
for (cfg=configuration ; cfg->key!=NULL && cfg->key[0]!='\0' ; cfg++) {
Tcl_DString conv;
const char *convValue =
Tcl_ExternalToUtfDString(venc, cfg->value, -1, &conv);
Tcl_ExternalToUtfDString(venc, cfg->value, TCL_NOSIZE, &conv);
/*
* We know that the keys are in ASCII/UTF-8, so for them is no
* conversion required.
*/
Tcl_DictObjPut(interp, pkgDict, Tcl_NewStringObj(cfg->key, -1),
Tcl_NewStringObj(convValue, -1));
Tcl_DictObjPut(interp, pkgDict, Tcl_NewStringObj(cfg->key, TCL_NOSIZE),
Tcl_NewStringObj(convValue, TCL_NOSIZE));
Tcl_DStringFree(&conv);
}
@@ -156,7 +156,7 @@ Tcl_RegisterConfig(
Tcl_DStringInit(&cmdName);
TclDStringAppendLiteral(&cmdName, "::");
Tcl_DStringAppend(&cmdName, pkgName, -1);
Tcl_DStringAppend(&cmdName, pkgName, TCL_NOSIZE);
/*
* The incomplete command name is the name of the namespace to place it
@@ -236,7 +236,7 @@ QueryConfigObjCmd(
* present.
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj("package not known", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("package not known", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FATAL", "PKGCFG_BASE",
Tcl_GetString(pkgName), NULL);
return TCL_ERROR;
@@ -251,7 +251,7 @@ QueryConfigObjCmd(
if (Tcl_DictObjGet(interp, pkgDict, objv[2], &val) != TCL_OK
|| val == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("key not known", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("key not known", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "CONFIG",
Tcl_GetString(objv[2]), NULL);
return TCL_ERROR;
@@ -271,7 +271,7 @@ QueryConfigObjCmd(
if (!listPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"insufficient memory to create list", -1));
"insufficient memory to create list", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
return TCL_ERROR;
}
+12 -12
View File
@@ -2503,19 +2503,19 @@ TclDateerror(
const char *s)
{
Tcl_Obj* t;
Tcl_AppendToObj(infoPtr->messages, infoPtr->separatrix, -1);
Tcl_AppendToObj(infoPtr->messages, s, -1);
Tcl_AppendToObj(infoPtr->messages, " (characters ", -1);
Tcl_AppendToObj(infoPtr->messages, infoPtr->separatrix, TCL_NOSIZE);
Tcl_AppendToObj(infoPtr->messages, s, TCL_NOSIZE);
Tcl_AppendToObj(infoPtr->messages, " (characters ", TCL_NOSIZE);
t = Tcl_NewIntObj(location->first_column);
Tcl_IncrRefCount(t);
Tcl_AppendObjToObj(infoPtr->messages, t);
Tcl_DecrRefCount(t);
Tcl_AppendToObj(infoPtr->messages, "-", -1);
Tcl_AppendToObj(infoPtr->messages, "-", TCL_NOSIZE);
t = Tcl_NewIntObj(location->last_column);
Tcl_IncrRefCount(t);
Tcl_AppendObjToObj(infoPtr->messages, t);
Tcl_DecrRefCount(t);
Tcl_AppendToObj(infoPtr->messages, ")", -1);
Tcl_AppendToObj(infoPtr->messages, ")", TCL_NOSIZE);
infoPtr->separatrix = "\n";
}
@@ -2803,7 +2803,7 @@ TclClockOldscanObjCmd(
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DATE", "PARSE", NULL);
return TCL_ERROR;
} else if (status == 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("memory exhausted", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("memory exhausted", TCL_NOSIZE));
Tcl_DecrRefCount(dateInfo.messages);
Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
return TCL_ERROR;
@@ -2811,7 +2811,7 @@ TclClockOldscanObjCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj("Unknown status returned "
"from date parser. Please "
"report this error as a "
"bug in Tcl.", -1));
"bug in Tcl.", TCL_NOSIZE));
Tcl_DecrRefCount(dateInfo.messages);
Tcl_SetErrorCode(interp, "TCL", "BUG", NULL);
return TCL_ERROR;
@@ -2820,31 +2820,31 @@ TclClockOldscanObjCmd(
if (yyHaveDate > 1) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("more than one date in string", -1));
Tcl_NewStringObj("more than one date in string", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DATE", "MULTIPLE", NULL);
return TCL_ERROR;
}
if (yyHaveTime > 1) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("more than one time of day in string", -1));
Tcl_NewStringObj("more than one time of day in string", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DATE", "MULTIPLE", NULL);
return TCL_ERROR;
}
if (yyHaveZone > 1) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("more than one time zone in string", -1));
Tcl_NewStringObj("more than one time zone in string", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DATE", "MULTIPLE", NULL);
return TCL_ERROR;
}
if (yyHaveDay > 1) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("more than one weekday in string", -1));
Tcl_NewStringObj("more than one weekday in string", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DATE", "MULTIPLE", NULL);
return TCL_ERROR;
}
if (yyHaveOrdinalMonth > 1) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("more than one ordinal month in string", -1));
Tcl_NewStringObj("more than one ordinal month in string", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DATE", "MULTIPLE", NULL);
return TCL_ERROR;
}
+19 -14
View File
@@ -648,7 +648,9 @@ EXTERN int Tcl_ScanElement(const char *src, int *flagPtr);
/* 219 */
EXTERN int Tcl_ScanCountedElement(const char *src, int length,
int *flagPtr);
/* Slot 220 is reserved */
/* 220 */
EXTERN TCL_SIZE_T Tcl_Seek(Tcl_Channel chan, TCL_SIZE_T offset,
int mode);
/* 221 */
EXTERN int Tcl_ServiceAll(void);
/* 222 */
@@ -717,7 +719,8 @@ EXTERN void Tcl_StaticPackage(Tcl_Interp *interp,
Tcl_PackageInitProc *safeInitProc);
/* 245 */
EXTERN int Tcl_StringMatch(const char *str, const char *pattern);
/* Slot 246 is reserved */
/* 246 */
EXTERN TCL_SIZE_T Tcl_Tell(Tcl_Channel chan);
/* 247 */
EXTERN int Tcl_TraceVar(Tcl_Interp *interp, const char *varName,
int flags, Tcl_VarTraceProc *proc,
@@ -1389,10 +1392,10 @@ EXTERN void Tcl_SetWideIntObj(Tcl_Obj *objPtr,
/* 490 */
EXTERN Tcl_StatBuf * Tcl_AllocStatBuf(void);
/* 491 */
EXTERN Tcl_WideInt Tcl_Seek(Tcl_Channel chan, Tcl_WideInt offset,
EXTERN Tcl_WideInt Tcl_SeekOld(Tcl_Channel chan, Tcl_WideInt offset,
int mode);
/* 492 */
EXTERN Tcl_WideInt Tcl_Tell(Tcl_Channel chan);
EXTERN Tcl_WideInt Tcl_TellOld(Tcl_Channel chan);
/* 493 */
EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc(
const Tcl_ChannelType *chanTypePtr);
@@ -2046,7 +2049,7 @@ typedef struct TclStubs {
void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */
int (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
int (*tcl_ScanCountedElement) (const char *src, int length, int *flagPtr); /* 219 */
void (*reserved220)(void);
TCL_SIZE_T (*tcl_Seek) (Tcl_Channel chan, TCL_SIZE_T offset, int mode); /* 220 */
int (*tcl_ServiceAll) (void); /* 221 */
int (*tcl_ServiceEvent) (int flags); /* 222 */
void (*tcl_SetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 223 */
@@ -2072,7 +2075,7 @@ typedef struct TclStubs {
void (*tcl_SplitPath) (const char *path, int *argcPtr, const char ***argvPtr); /* 243 */
void (*tcl_StaticPackage) (Tcl_Interp *interp, const char *pkgName, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 244 */
int (*tcl_StringMatch) (const char *str, const char *pattern); /* 245 */
void (*reserved246)(void);
TCL_SIZE_T (*tcl_Tell) (Tcl_Channel chan); /* 246 */
int (*tcl_TraceVar) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 247 */
int (*tcl_TraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 248 */
char * (*tcl_TranslateFileName) (Tcl_Interp *interp, const char *name, Tcl_DString *bufferPtr); /* 249 */
@@ -2317,8 +2320,8 @@ typedef struct TclStubs {
Tcl_Obj * (*tcl_NewWideIntObj) (Tcl_WideInt wideValue); /* 488 */
void (*tcl_SetWideIntObj) (Tcl_Obj *objPtr, Tcl_WideInt wideValue); /* 489 */
Tcl_StatBuf * (*tcl_AllocStatBuf) (void); /* 490 */
Tcl_WideInt (*tcl_Seek) (Tcl_Channel chan, Tcl_WideInt offset, int mode); /* 491 */
Tcl_WideInt (*tcl_Tell) (Tcl_Channel chan); /* 492 */
Tcl_WideInt (*tcl_SeekOld) (Tcl_Channel chan, Tcl_WideInt offset, int mode); /* 491 */
Tcl_WideInt (*tcl_TellOld) (Tcl_Channel chan); /* 492 */
Tcl_DriverWideSeekProc * (*tcl_ChannelWideSeekProc) (const Tcl_ChannelType *chanTypePtr); /* 493 */
int (*tcl_DictObjPut) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj *valuePtr); /* 494 */
int (*tcl_DictObjGet) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr); /* 495 */
@@ -2929,7 +2932,8 @@ extern const TclStubs *tclStubsPtr;
(tclStubsPtr->tcl_ScanElement) /* 218 */
#define Tcl_ScanCountedElement \
(tclStubsPtr->tcl_ScanCountedElement) /* 219 */
/* Slot 220 is reserved */
#define Tcl_Seek \
(tclStubsPtr->tcl_Seek) /* 220 */
#define Tcl_ServiceAll \
(tclStubsPtr->tcl_ServiceAll) /* 221 */
#define Tcl_ServiceEvent \
@@ -2980,7 +2984,8 @@ extern const TclStubs *tclStubsPtr;
(tclStubsPtr->tcl_StaticPackage) /* 244 */
#define Tcl_StringMatch \
(tclStubsPtr->tcl_StringMatch) /* 245 */
/* Slot 246 is reserved */
#define Tcl_Tell \
(tclStubsPtr->tcl_Tell) /* 246 */
#define Tcl_TraceVar \
(tclStubsPtr->tcl_TraceVar) /* 247 */
#define Tcl_TraceVar2 \
@@ -3466,10 +3471,10 @@ extern const TclStubs *tclStubsPtr;
(tclStubsPtr->tcl_SetWideIntObj) /* 489 */
#define Tcl_AllocStatBuf \
(tclStubsPtr->tcl_AllocStatBuf) /* 490 */
#define Tcl_Seek \
(tclStubsPtr->tcl_Seek) /* 491 */
#define Tcl_Tell \
(tclStubsPtr->tcl_Tell) /* 492 */
#define Tcl_SeekOld \
(tclStubsPtr->tcl_SeekOld) /* 491 */
#define Tcl_TellOld \
(tclStubsPtr->tcl_TellOld) /* 492 */
#define Tcl_ChannelWideSeekProc \
(tclStubsPtr->tcl_ChannelWideSeekProc) /* 493 */
#define Tcl_DictObjPut \
+5 -5
View File
@@ -722,7 +722,7 @@ SetDictFromAny(
missingValue:
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing value to go with key", -1));
"missing value to go with key", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DICTIONARY", NULL);
}
result = TCL_ERROR;
@@ -2067,7 +2067,7 @@ DictInfoCmd(
dict = dictPtr->internalRep.otherValuePtr;
statsStr = Tcl_HashStats(&dict->table);
Tcl_SetObjResult(interp, Tcl_NewStringObj(statsStr, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(statsStr, TCL_NOSIZE));
ckfree(statsStr);
return TCL_OK;
}
@@ -2398,7 +2398,7 @@ DictForNRCmd(
}
if (varc != 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must have exactly two variable names", -1));
"must have exactly two variable names", TCL_NOSIZE));
return TCL_ERROR;
}
searchPtr = TclStackAlloc(interp, sizeof(Tcl_DictSearch));
@@ -2589,7 +2589,7 @@ DictMapNRCmd(
}
if (varc != 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must have exactly two variable names", -1));
"must have exactly two variable names", TCL_NOSIZE));
return TCL_ERROR;
}
storagePtr = TclStackAlloc(interp, sizeof(DictMapStorage));
@@ -3027,7 +3027,7 @@ DictFilterCmd(
}
if (varc != 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must have exactly two variable names", -1));
"must have exactly two variable names", TCL_NOSIZE));
return TCL_ERROR;
}
keyVarObj = varv[0];
+4 -4
View File
@@ -724,7 +724,7 @@ Tcl_SetDefaultEncodingDir(
const char *path)
{
Tcl_Obj *searchPath = Tcl_GetEncodingSearchPath();
Tcl_Obj *directory = Tcl_NewStringObj(path, -1);
Tcl_Obj *directory = Tcl_NewStringObj(path, TCL_NOSIZE);
searchPath = Tcl_DuplicateObj(searchPath);
Tcl_ListObjReplace(NULL, searchPath, 0, 0, 1, &directory);
@@ -923,7 +923,7 @@ Tcl_GetEncodingNames(
Encoding *encodingPtr = Tcl_GetHashValue(hPtr);
Tcl_CreateHashEntry(&table,
Tcl_NewStringObj(encodingPtr->name, -1), &dummy);
Tcl_NewStringObj(encodingPtr->name, TCL_NOSIZE), &dummy);
}
Tcl_MutexUnlock(&encodingMutex);
@@ -1461,7 +1461,7 @@ OpenEncodingFileChannel(
const char *name) /* The name of the encoding file on disk and
* also the name for new encoding. */
{
Tcl_Obj *nameObj = Tcl_NewStringObj(name, -1);
Tcl_Obj *nameObj = Tcl_NewStringObj(name, TCL_NOSIZE);
Tcl_Obj *fileNameObj = Tcl_DuplicateObj(nameObj);
Tcl_Obj *searchPath = Tcl_DuplicateObj(Tcl_GetEncodingSearchPath());
Tcl_Obj *map = TclGetProcessGlobalValue(&encodingFileMap);
@@ -1471,7 +1471,7 @@ OpenEncodingFileChannel(
Tcl_ListObjGetElements(NULL, searchPath, &numDirs, &dir);
Tcl_IncrRefCount(nameObj);
Tcl_AppendToObj(fileNameObj, ".enc", -1);
Tcl_AppendToObj(fileNameObj, ".enc", TCL_NOSIZE);
Tcl_IncrRefCount(fileNameObj);
Tcl_DictObjGet(NULL, map, nameObj, &directory);
+37 -37
View File
@@ -88,7 +88,7 @@ NewNsObj(
if (namespacePtr == TclGetGlobalNamespace(nsPtr->interp)) {
return Tcl_NewStringObj("::", 2);
} else {
return Tcl_NewStringObj(nsPtr->fullName, -1);
return Tcl_NewStringObj(nsPtr->fullName, TCL_NOSIZE);
}
}
@@ -132,7 +132,7 @@ TclNamespaceEnsembleCmd(
if (!Tcl_InterpDeleted(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"tried to manipulate ensemble of deleted namespace",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "DEAD", NULL);
}
return TCL_ERROR;
@@ -252,7 +252,7 @@ TclNamespaceEnsembleCmd(
if (len < 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"ensemble subcommand implementations "
"must be non-empty lists", -1));
"must be non-empty lists", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE",
"EMPTY_TARGET", NULL);
Tcl_DictObjDone(&search);
@@ -416,7 +416,7 @@ TclNamespaceEnsembleCmd(
/* -map option */
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(ensembleConfigOptions[CONF_MAP], -1));
Tcl_NewStringObj(ensembleConfigOptions[CONF_MAP], TCL_NOSIZE));
Tcl_GetEnsembleMappingDict(NULL, token, &tmpObj);
Tcl_ListObjAppendElement(NULL, resultObj,
(tmpObj != NULL) ? tmpObj : Tcl_NewObj());
@@ -424,35 +424,35 @@ TclNamespaceEnsembleCmd(
/* -namespace option */
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(ensembleConfigOptions[CONF_NAMESPACE],
-1));
TCL_NOSIZE));
namespacePtr = NULL; /* silence gcc 4 warning */
Tcl_GetEnsembleNamespace(NULL, token, &namespacePtr);
Tcl_ListObjAppendElement(NULL, resultObj, NewNsObj(namespacePtr));
/* -parameters option */
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(ensembleConfigOptions[CONF_PARAM], -1));
Tcl_NewStringObj(ensembleConfigOptions[CONF_PARAM], TCL_NOSIZE));
Tcl_GetEnsembleParameterList(NULL, token, &tmpObj);
Tcl_ListObjAppendElement(NULL, resultObj,
(tmpObj != NULL) ? tmpObj : Tcl_NewObj());
/* -prefix option */
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(ensembleConfigOptions[CONF_PREFIX], -1));
Tcl_NewStringObj(ensembleConfigOptions[CONF_PREFIX], TCL_NOSIZE));
Tcl_GetEnsembleFlags(NULL, token, &flags);
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewBooleanObj(flags & TCL_ENSEMBLE_PREFIX));
/* -subcommands option */
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(ensembleConfigOptions[CONF_SUBCMDS],-1));
Tcl_NewStringObj(ensembleConfigOptions[CONF_SUBCMDS], TCL_NOSIZE));
Tcl_GetEnsembleSubcommandList(NULL, token, &tmpObj);
Tcl_ListObjAppendElement(NULL, resultObj,
(tmpObj != NULL) ? tmpObj : Tcl_NewObj());
/* -unknown option */
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(ensembleConfigOptions[CONF_UNKNOWN],-1));
Tcl_NewStringObj(ensembleConfigOptions[CONF_UNKNOWN], TCL_NOSIZE));
Tcl_GetEnsembleUnknownHandler(NULL, token, &tmpObj);
Tcl_ListObjAppendElement(NULL, resultObj,
(tmpObj != NULL) ? tmpObj : Tcl_NewObj());
@@ -531,7 +531,7 @@ TclNamespaceEnsembleCmd(
if (len < 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"ensemble subcommand implementations "
"must be non-empty lists", -1));
"must be non-empty lists", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE",
"EMPTY_TARGET", NULL);
Tcl_DictObjDone(&search);
@@ -570,7 +570,7 @@ TclNamespaceEnsembleCmd(
}
case CONF_NAMESPACE:
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"option -namespace is read-only", -1));
"option -namespace is read-only", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "READ_ONLY",
NULL);
goto freeMapAndError;
@@ -720,7 +720,7 @@ Tcl_SetEnsembleSubcommandList(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
return TCL_ERROR;
}
@@ -796,7 +796,7 @@ Tcl_SetEnsembleParameterList(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
return TCL_ERROR;
}
@@ -872,7 +872,7 @@ Tcl_SetEnsembleMappingDict(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
return TCL_ERROR;
}
@@ -898,7 +898,7 @@ Tcl_SetEnsembleMappingDict(
if (bytes[0] != ':' || bytes[1] != ':') {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"ensemble target is not a fully-qualified command",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE",
"UNQUALIFIED_TARGET", NULL);
Tcl_DictObjDone(&search);
@@ -971,7 +971,7 @@ Tcl_SetEnsembleUnknownHandler(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
return TCL_ERROR;
}
@@ -1037,7 +1037,7 @@ Tcl_SetEnsembleFlags(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
return TCL_ERROR;
}
@@ -1114,7 +1114,7 @@ Tcl_GetEnsembleSubcommandList(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
}
return TCL_ERROR;
@@ -1156,7 +1156,7 @@ Tcl_GetEnsembleParameterList(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
}
return TCL_ERROR;
@@ -1198,7 +1198,7 @@ Tcl_GetEnsembleMappingDict(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
}
return TCL_ERROR;
@@ -1239,7 +1239,7 @@ Tcl_GetEnsembleUnknownHandler(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
}
return TCL_ERROR;
@@ -1280,7 +1280,7 @@ Tcl_GetEnsembleFlags(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
}
return TCL_ERROR;
@@ -1321,7 +1321,7 @@ Tcl_GetEnsembleNamespace(
if (cmdPtr->objProc != NsEnsembleImplementationCmd) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command is not an ensemble", -1));
"command is not an ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
}
return TCL_ERROR;
@@ -1468,7 +1468,7 @@ TclMakeEnsemble(
Tcl_DStringInit(&buf);
Tcl_DStringInit(&hiddenBuf);
TclDStringAppendLiteral(&hiddenBuf, "tcl:");
Tcl_DStringAppend(&hiddenBuf, name, -1);
Tcl_DStringAppend(&hiddenBuf, name, TCL_NOSIZE);
TclDStringAppendLiteral(&hiddenBuf, ":");
hiddenLen = Tcl_DStringLength(&hiddenBuf);
if (name[0] == ':' && name[1] == ':') {
@@ -1477,7 +1477,7 @@ TclMakeEnsemble(
*/
cmdName = name;
Tcl_DStringAppend(&buf, name, -1);
Tcl_DStringAppend(&buf, name, TCL_NOSIZE);
ensembleFlags = TCL_ENSEMBLE_PREFIX;
} else {
/*
@@ -1493,7 +1493,7 @@ TclMakeEnsemble(
for (i = 0; i < nameCount; ++i) {
TclDStringAppendLiteral(&buf, "::");
Tcl_DStringAppend(&buf, nameParts[i], -1);
Tcl_DStringAppend(&buf, nameParts[i], TCL_NOSIZE);
}
}
@@ -1530,10 +1530,10 @@ TclMakeEnsemble(
TclDStringAppendLiteral(&buf, "::");
TclNewObj(mapDict);
for (i=0 ; map[i].name != NULL ; i++) {
fromObj = Tcl_NewStringObj(map[i].name, -1);
fromObj = Tcl_NewStringObj(map[i].name, TCL_NOSIZE);
TclNewStringObj(toObj, Tcl_DStringValue(&buf),
Tcl_DStringLength(&buf));
Tcl_AppendToObj(toObj, map[i].name, -1);
Tcl_AppendToObj(toObj, map[i].name, TCL_NOSIZE);
Tcl_DictObjPut(NULL, mapDict, fromObj, toObj);
if (map[i].proc || map[i].nreProc) {
@@ -1551,7 +1551,7 @@ TclMakeEnsemble(
map[i].nreProc, map[i].clientData, NULL);
Tcl_DStringSetLength(&hiddenBuf, hiddenLen);
if (Tcl_HideCommand(interp, "___tmp",
Tcl_DStringAppend(&hiddenBuf, map[i].name, -1))) {
Tcl_DStringAppend(&hiddenBuf, map[i].name, TCL_NOSIZE))) {
Tcl_Panic("%s", Tcl_GetString(Tcl_GetObjResult(interp)));
}
} else {
@@ -1675,7 +1675,7 @@ NsEnsembleImplementationCmdNR(
if (!Tcl_InterpDeleted(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"ensemble activated for deleted namespace", -1));
"ensemble activated for deleted namespace", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "DEAD", NULL);
}
return TCL_ERROR;
@@ -1940,12 +1940,12 @@ NsEnsembleImplementationCmdNR(
(ensemblePtr->flags & TCL_ENSEMBLE_PREFIX ? " or ambiguous" : ""),
TclGetString(objv[1+ensemblePtr->numParameters]));
if (ensemblePtr->subcommandTable.numEntries == 1) {
Tcl_AppendToObj(errorObj, ensemblePtr->subcommandArrayPtr[0], -1);
Tcl_AppendToObj(errorObj, ensemblePtr->subcommandArrayPtr[0], TCL_NOSIZE);
} else {
int i;
for (i=0 ; i<ensemblePtr->subcommandTable.numEntries-1 ; i++) {
Tcl_AppendToObj(errorObj, ensemblePtr->subcommandArrayPtr[i], -1);
Tcl_AppendToObj(errorObj, ensemblePtr->subcommandArrayPtr[i], TCL_NOSIZE);
Tcl_AppendToObj(errorObj, ", ", 2);
}
Tcl_AppendPrintfToObj(errorObj, "or %s",
@@ -2105,7 +2105,7 @@ EnsembleUnknownCallback(
if ((result == TCL_OK) && (ensemblePtr->flags & ENSEMBLE_DEAD)) {
if (!Tcl_InterpDeleted(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unknown subcommand handler deleted its ensemble", -1));
"unknown subcommand handler deleted its ensemble", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "UNKNOWN_DELETED",
NULL);
}
@@ -2158,16 +2158,16 @@ EnsembleUnknownCallback(
if (result != TCL_ERROR) {
Tcl_ResetResult(interp);
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unknown subcommand handler returned bad code: ", -1));
"unknown subcommand handler returned bad code: ", TCL_NOSIZE));
switch (result) {
case TCL_RETURN:
Tcl_AppendToObj(Tcl_GetObjResult(interp), "return", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "return", TCL_NOSIZE);
break;
case TCL_BREAK:
Tcl_AppendToObj(Tcl_GetObjResult(interp), "break", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "break", TCL_NOSIZE);
break;
case TCL_CONTINUE:
Tcl_AppendToObj(Tcl_GetObjResult(interp), "continue", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "continue", TCL_NOSIZE);
break;
default:
Tcl_AppendPrintfToObj(Tcl_GetObjResult(interp), "%d", result);
+7 -7
View File
@@ -106,7 +106,7 @@ TclSetupEnv(
} else {
Tcl_MutexLock(&envMutex);
for (i = 0; environ[i] != NULL; i++) {
p1 = Tcl_ExternalToUtfDString(NULL, environ[i], -1, &envString);
p1 = Tcl_ExternalToUtfDString(NULL, environ[i], TCL_NOSIZE, &envString);
p2 = strchr(p1, '=');
if (p2 == NULL) {
/*
@@ -206,7 +206,7 @@ TclSetEnv(
* interpreters.
*/
env = Tcl_ExternalToUtfDString(NULL, environ[index], -1, &envString);
env = Tcl_ExternalToUtfDString(NULL, environ[index], TCL_NOSIZE, &envString);
if (strcmp(value, env + (length + 1)) == 0) {
Tcl_DStringFree(&envString);
Tcl_MutexUnlock(&envMutex);
@@ -229,7 +229,7 @@ TclSetEnv(
memcpy(p, name, nameLength);
p[nameLength] = '=';
memcpy(p+nameLength+1, value, valueLength+1);
p2 = Tcl_UtfToExternalDString(NULL, p, -1, &envString);
p2 = Tcl_UtfToExternalDString(NULL, p, TCL_NOSIZE, &envString);
/*
* Copy the native string to heap memory.
@@ -320,7 +320,7 @@ Tcl_PutEnv(
* name and value parts, and call TclSetEnv to do all of the real work.
*/
name = Tcl_ExternalToUtfDString(NULL, assignment, -1, &nameString);
name = Tcl_ExternalToUtfDString(NULL, assignment, TCL_NOSIZE, &nameString);
value = strchr(name, '=');
if ((value != NULL) && (value != name)) {
@@ -406,7 +406,7 @@ TclUnsetEnv(
string[length] = '\0';
#endif /* WIN32 */
Tcl_UtfToExternalDString(NULL, string, -1, &envString);
Tcl_UtfToExternalDString(NULL, string, TCL_NOSIZE, &envString);
string = ckrealloc(string, Tcl_DStringLength(&envString) + 1);
memcpy(string, Tcl_DStringValue(&envString),
(unsigned) Tcl_DStringLength(&envString)+1);
@@ -481,12 +481,12 @@ TclGetEnv(
if (index != -1) {
Tcl_DString envStr;
result = Tcl_ExternalToUtfDString(NULL, environ[index], -1, &envStr);
result = Tcl_ExternalToUtfDString(NULL, environ[index], TCL_NOSIZE, &envStr);
result += length;
if (*result == '=') {
result++;
Tcl_DStringInit(valuePtr);
Tcl_DStringAppend(valuePtr, result, -1);
Tcl_DStringAppend(valuePtr, result, TCL_NOSIZE);
result = Tcl_DStringValue(valuePtr);
} else {
result = NULL;
+10 -10
View File
@@ -270,7 +270,7 @@ HandleBgErrors(
Tcl_DecrRefCount(keyPtr);
Tcl_WriteChars(errChannel,
"error in background error handler:\n", -1);
"error in background error handler:\n", TCL_NOSIZE);
if (valuePtr) {
Tcl_WriteObj(errChannel, valuePtr);
} else {
@@ -332,7 +332,7 @@ TclDefaultBgErrorHandlerObjCmd(
Tcl_DecrRefCount(keyPtr);
if (valuePtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing return option \"-level\"", -1));
"missing return option \"-level\"", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
return TCL_ERROR;
}
@@ -345,7 +345,7 @@ TclDefaultBgErrorHandlerObjCmd(
Tcl_DecrRefCount(keyPtr);
if (valuePtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing return option \"-code\"", -1));
"missing return option \"-code\"", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
return TCL_ERROR;
}
@@ -463,17 +463,17 @@ TclDefaultBgErrorHandlerObjCmd(
Tcl_RestoreInterpState(interp, saved);
Tcl_WriteObj(errChannel, Tcl_GetVar2Ex(interp,
"errorInfo", NULL, TCL_GLOBAL_ONLY));
Tcl_WriteChars(errChannel, "\n", -1);
Tcl_WriteChars(errChannel, "\n", TCL_NOSIZE);
} else {
Tcl_DiscardInterpState(saved);
Tcl_WriteChars(errChannel,
"bgerror failed to handle background error.\n",-1);
Tcl_WriteChars(errChannel, " Original error: ", -1);
Tcl_WriteChars(errChannel, " Original error: ", TCL_NOSIZE);
Tcl_WriteObj(errChannel, tempObjv[1]);
Tcl_WriteChars(errChannel, "\n", -1);
Tcl_WriteChars(errChannel, " Error in bgerror: ", -1);
Tcl_WriteChars(errChannel, "\n", TCL_NOSIZE);
Tcl_WriteChars(errChannel, " Error in bgerror: ", TCL_NOSIZE);
Tcl_WriteObj(errChannel, resultPtr);
Tcl_WriteChars(errChannel, "\n", -1);
Tcl_WriteChars(errChannel, "\n", TCL_NOSIZE);
}
Tcl_DecrRefCount(resultPtr);
Tcl_Flush(errChannel);
@@ -1416,7 +1416,7 @@ Tcl_VwaitObjCmd(
}
if (Tcl_LimitExceeded(interp)) {
Tcl_ResetResult(interp);
Tcl_SetObjResult(interp, Tcl_NewStringObj("limit exceeded", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("limit exceeded", TCL_NOSIZE));
break;
}
}
@@ -1520,7 +1520,7 @@ Tcl_UpdateObjCmd(
}
if (Tcl_LimitExceeded(interp)) {
Tcl_ResetResult(interp);
Tcl_SetObjResult(interp, Tcl_NewStringObj("limit exceeded", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("limit exceeded", TCL_NOSIZE));
return TCL_ERROR;
}
}
+17 -17
View File
@@ -2282,7 +2282,7 @@ TEBCresume(
if (!corPtr) {
TRACE_APPEND(("ERROR: yield outside coroutine\n"));
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"yield can only be called in a coroutine", -1));
"yield can only be called in a coroutine", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD",
NULL);
goto gotError;
@@ -2326,7 +2326,7 @@ TEBCresume(
if (!(iPtr->varFramePtr->isProcCallFrame & 1)) {
TRACE(("%d => ERROR: tailcall in non-proc context\n", opnd));
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"tailcall can only be called from a proc or lambda", -1));
"tailcall can only be called from a proc or lambda", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "TAILCALL", "ILLEGAL", NULL);
goto gotError;
}
@@ -2352,7 +2352,7 @@ TEBCresume(
*/
listPtr = Tcl_NewListObj(opnd, &OBJ_AT_DEPTH(opnd-1));
nsObjPtr = Tcl_NewStringObj(iPtr->varFramePtr->nsPtr->fullName, -1);
nsObjPtr = Tcl_NewStringObj(iPtr->varFramePtr->nsPtr->fullName, TCL_NOSIZE);
Tcl_IncrRefCount(listPtr);
Tcl_IncrRefCount(nsObjPtr);
TclNRAddCallback(interp, TclNRTailcallEval, listPtr, nsObjPtr,
@@ -3302,7 +3302,7 @@ TEBCresume(
TCL_LEAVE_ERR_MSG, "read", 1, 1, &arrayPtr);
if (!varPtr) {
Tcl_AddObjErrorInfo(interp,
"\n (reading value of variable to increment)", -1);
"\n (reading value of variable to increment)", TCL_NOSIZE);
TRACE_APPEND(("ERROR: %.30s\n", O2S(Tcl_GetObjResult(interp))));
Tcl_DecrRefCount(incrPtr);
goto gotError;
@@ -4187,7 +4187,7 @@ TEBCresume(
TRACE(("=> ERROR: no TclOO call context\n"));
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"self may only be called from inside a method",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "CONTEXT_REQUIRED", NULL);
goto gotError;
}
@@ -5262,7 +5262,7 @@ TEBCresume(
case INST_RSHIFT:
if (l2 < 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"negative shift argument", -1));
"negative shift argument", TCL_NOSIZE));
#if 0
DECACHE_STACK_INFO();
Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
@@ -5310,7 +5310,7 @@ TEBCresume(
case INST_LSHIFT:
if (l2 < 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"negative shift argument", -1));
"negative shift argument", TCL_NOSIZE));
#if 0
DECACHE_STACK_INFO();
Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
@@ -5333,7 +5333,7 @@ TEBCresume(
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"integer value too large to represent", -1));
"integer value too large to represent", TCL_NOSIZE));
#if 0
DECACHE_STACK_INFO();
Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW",
@@ -6700,7 +6700,7 @@ TEBCresume(
divideByZero:
DECACHE_STACK_INFO();
Tcl_SetObjResult(interp, Tcl_NewStringObj("divide by zero", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("divide by zero", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "ARITH", "DIVZERO", "divide by zero", NULL);
CACHE_STACK_INFO();
goto gotError;
@@ -6713,7 +6713,7 @@ TEBCresume(
exponOfZero:
DECACHE_STACK_INFO();
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"exponentiation of zero by negative power", -1));
"exponentiation of zero by negative power", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
"exponentiation of zero by negative power", NULL);
CACHE_STACK_INFO();
@@ -7090,7 +7090,7 @@ ExecuteExtendedBinaryMathOp(
}
if (invalid) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"negative shift argument", -1));
"negative shift argument", TCL_NOSIZE));
return GENERAL_ARITHMETIC_ERROR;
}
@@ -7121,7 +7121,7 @@ ExecuteExtendedBinaryMathOp(
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"integer value too large to represent", -1));
"integer value too large to represent", TCL_NOSIZE));
return GENERAL_ARITHMETIC_ERROR;
}
shift = (int)(*((const long *)ptr2));
@@ -7523,7 +7523,7 @@ ExecuteExtendedBinaryMathOp(
if (type2 != TCL_NUMBER_LONG) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"exponent too large", -1));
"exponent too large", TCL_NOSIZE));
return GENERAL_ARITHMETIC_ERROR;
}
@@ -7762,7 +7762,7 @@ ExecuteExtendedBinaryMathOp(
if (big2.used > 1) {
mp_clear(&big2);
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"exponent too large", -1));
"exponent too large", TCL_NOSIZE));
return GENERAL_ARITHMETIC_ERROR;
}
Tcl_TakeBignumFromObj(NULL, valuePtr, &big1);
@@ -8795,16 +8795,16 @@ TclExprFloatError(
if ((errno == EDOM) || TclIsNaN(value)) {
s = "domain error: argument not in valid range";
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", s, NULL);
} else if ((errno == ERANGE) || TclIsInfinite(value)) {
if (value == 0.0) {
s = "floating-point value too small to represent";
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", s, NULL);
} else {
s = "floating-point value too large to represent";
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", s, NULL);
}
} else {
+2 -2
View File
@@ -1047,7 +1047,7 @@ TclFileAttrsCmd(
res = Tcl_FSFileAttrsGet(interp, index, filePtr, &objPtrAttr);
if (res == TCL_OK) {
Tcl_Obj *objPtr =
Tcl_NewStringObj(attributeStrings[index], -1);
Tcl_NewStringObj(attributeStrings[index], TCL_NOSIZE);
Tcl_ListObjAppendElement(interp, listPtr, objPtr);
Tcl_ListObjAppendElement(interp, listPtr, objPtrAttr);
@@ -1503,7 +1503,7 @@ TclFileTemporaryCmd(
return TCL_ERROR;
}
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), TCL_NOSIZE));
return TCL_OK;
}
+21 -21
View File
@@ -342,7 +342,7 @@ Tcl_GetPathType(
const char *path)
{
Tcl_PathType type;
Tcl_Obj *tempObj = Tcl_NewStringObj(path,-1);
Tcl_Obj *tempObj = Tcl_NewStringObj(path, TCL_NOSIZE);
Tcl_IncrRefCount(tempObj);
type = Tcl_FSGetPathType(tempObj);
@@ -565,7 +565,7 @@ Tcl_SplitPath(
* Perform the splitting, using objectified, vfs-aware code.
*/
tmpPtr = Tcl_NewStringObj(path, -1);
tmpPtr = Tcl_NewStringObj(path, TCL_NOSIZE);
Tcl_IncrRefCount(tmpPtr);
resultPtr = Tcl_FSSplitPath(tmpPtr, argcPtr);
Tcl_IncrRefCount(resultPtr);
@@ -987,7 +987,7 @@ Tcl_JoinPath(
for (i = 0; i < argc; i++) {
Tcl_ListObjAppendElement(NULL, listObj,
Tcl_NewStringObj(argv[i], -1));
Tcl_NewStringObj(argv[i], TCL_NOSIZE));
}
/*
@@ -1051,7 +1051,7 @@ Tcl_TranslateFileName(
Tcl_DString *bufferPtr) /* Uninitialized or free DString filled with
* name after tilde substitution. */
{
Tcl_Obj *path = Tcl_NewStringObj(name, -1);
Tcl_Obj *path = Tcl_NewStringObj(name, TCL_NOSIZE);
Tcl_Obj *transPtr;
Tcl_IncrRefCount(path);
@@ -1181,7 +1181,7 @@ DoTildeSubst(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"couldn't find HOME environment "
"variable to expand path", -1));
"variable to expand path", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FILENAME", "NO_HOME", NULL);
}
return NULL;
@@ -1275,13 +1275,13 @@ Tcl_GlobObjCmd(
case GLOB_DIR: /* -dir */
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-directory\"", -1));
"missing argument to \"-directory\"", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
return TCL_ERROR;
}
if (dir != PATH_NONE) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-directory\" cannot be used with \"-path\"", -1));
"\"-directory\" cannot be used with \"-path\"", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
"BADOPTIONCOMBINATION", NULL);
return TCL_ERROR;
@@ -1300,13 +1300,13 @@ Tcl_GlobObjCmd(
case GLOB_PATH: /* -path */
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-path\"", -1));
"missing argument to \"-path\"", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
return TCL_ERROR;
}
if (dir != PATH_NONE) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-path\" cannot be used with \"-directory\"", -1));
"\"-path\" cannot be used with \"-directory\"", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
"BADOPTIONCOMBINATION", NULL);
return TCL_ERROR;
@@ -1318,7 +1318,7 @@ Tcl_GlobObjCmd(
case GLOB_TYPE: /* -types */
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-types\"", -1));
"missing argument to \"-types\"", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
return TCL_ERROR;
}
@@ -1338,7 +1338,7 @@ Tcl_GlobObjCmd(
if ((globFlags & TCL_GLOBMODE_TAILS) && (pathOrDir == NULL)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-tails\" must be used with either "
"\"-directory\" or \"-path\"", -1));
"\"-directory\" or \"-path\"", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
"BADOPTIONCOMBINATION", NULL);
return TCL_ERROR;
@@ -1389,7 +1389,7 @@ Tcl_GlobObjCmd(
* in TclGlob requires a non-NULL pathOrDir.
*/
Tcl_DStringAppend(&pref, first, -1);
Tcl_DStringAppend(&pref, first, TCL_NOSIZE);
globFlags &= ~TCL_GLOBMODE_TAILS;
pathOrDir = NULL;
} else {
@@ -1428,7 +1428,7 @@ Tcl_GlobObjCmd(
}
}
if (*search != '\0') {
Tcl_DStringAppend(&prefix, search, -1);
Tcl_DStringAppend(&prefix, search, TCL_NOSIZE);
}
Tcl_DStringFree(&pref);
}
@@ -1557,7 +1557,7 @@ Tcl_GlobObjCmd(
badMacTypesArg:
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"only one MacOS type or creator argument"
" to \"-types\" allowed", -1));
" to \"-types\" allowed", TCL_NOSIZE));
result = TCL_ERROR;
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", NULL);
join = 0;
@@ -1637,7 +1637,7 @@ Tcl_GlobObjCmd(
(join || (objc == 1)) ? "" : "s");
if (join) {
Tcl_AppendToObj(errorMsg, Tcl_DStringValue(&prefix), -1);
Tcl_AppendToObj(errorMsg, Tcl_DStringValue(&prefix), TCL_NOSIZE);
} else {
const char *sep = "";
@@ -1647,7 +1647,7 @@ Tcl_GlobObjCmd(
sep = " ";
}
}
Tcl_AppendToObj(errorMsg, "\"", -1);
Tcl_AppendToObj(errorMsg, "\"", TCL_NOSIZE);
Tcl_SetObjResult(interp, errorMsg);
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "NOMATCH",
NULL);
@@ -1771,7 +1771,7 @@ TclGlob(
return TCL_ERROR;
}
if (head != Tcl_DStringValue(&buffer)) {
Tcl_DStringAppend(&buffer, head, -1);
Tcl_DStringAppend(&buffer, head, TCL_NOSIZE);
}
pathPrefix = TclDStringToObj(&buffer);
Tcl_IncrRefCount(pathPrefix);
@@ -1827,7 +1827,7 @@ TclGlob(
|| (tail[0] == '\\' && tail[1] == '\\'))) {
int driveNameLen;
Tcl_Obj *driveName;
Tcl_Obj *temp = Tcl_NewStringObj(tail, -1);
Tcl_Obj *temp = Tcl_NewStringObj(tail, TCL_NOSIZE);
Tcl_IncrRefCount(temp);
switch (TclGetPathType(temp, NULL, &driveNameLen, &driveName)) {
@@ -2218,14 +2218,14 @@ DoGlob(
break;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched open-brace in file name", -1));
"unmatched open-brace in file name", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BALANCE",
NULL);
return TCL_ERROR;
} else if (*p == '}') {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched close-brace in file name", -1));
"unmatched close-brace in file name", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BALANCE",
NULL);
return TCL_ERROR;
@@ -2257,7 +2257,7 @@ DoGlob(
SkipToChar(&p, ',');
Tcl_DStringSetLength(&newName, baseLength);
Tcl_DStringAppend(&newName, element, p-element);
Tcl_DStringAppend(&newName, closeBrace+1, -1);
Tcl_DStringAppend(&newName, closeBrace+1, TCL_NOSIZE);
result = DoGlob(interp, matchesObj, separators, pathPtr, flags,
Tcl_DStringValue(&newName), types);
if (result != TCL_OK) {
+133 -74
View File
@@ -64,9 +64,9 @@ static int CloseChannelPart(Tcl_Interp *interp, Channel *chanPtr,
int errorCode, int flags);
static int CloseWrite(Tcl_Interp *interp, Channel *chanPtr);
static void CommonGetsCleanup(Channel *chanPtr);
static int CopyAndTranslateBuffer(ChannelState *statePtr,
char *result, int space);
static int CopyBuffer(Channel *chanPtr, char *result, int space);
static TCL_SIZE_T CopyAndTranslateBuffer(ChannelState *statePtr,
char *result, TCL_SIZE_T space);
static TCL_SIZE_T CopyBuffer(Channel *chanPtr, char *result, TCL_SIZE_T space);
static int CopyData(CopyState *csPtr, int mask);
static void CopyEventProc(ClientData clientData, int mask);
static void CreateScriptRecord(Tcl_Interp *interp,
@@ -79,9 +79,9 @@ static int DetachChannel(Tcl_Interp *interp, Tcl_Channel chan);
static void DiscardInputQueued(ChannelState *statePtr,
int discardSavedBuffers);
static void DiscardOutputQueued(ChannelState *chanPtr);
static int DoRead(Channel *chanPtr, char *srcPtr, int slen, int allowShortReads);
static int DoWrite(Channel *chanPtr, const char *src, int srcLen);
static int DoReadChars(Channel *chan, Tcl_Obj *objPtr, int toRead,
static TCL_SIZE_T DoRead(Channel *chanPtr, char *srcPtr, TCL_SIZE_T slen, int allowShortReads);
static TCL_SIZE_T DoWrite(Channel *chanPtr, const char *src, TCL_SIZE_T srcLen);
static TCL_SIZE_T DoReadChars(Channel *chan, Tcl_Obj *objPtr, TCL_SIZE_T toRead,
int appendFlag);
static int DoWriteChars(Channel *chan, const char *src, int len);
static int FilterInputBytes(Channel *chanPtr,
@@ -1035,7 +1035,7 @@ Tcl_UnregisterChannel(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"illegal recursive call to close through close-handler"
" of channel", -1));
" of channel", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -2328,7 +2328,7 @@ CheckForDeadChannel(
Tcl_SetErrno(EINVAL);
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unable to access channel: invalid channel", -1));
"unable to access channel: invalid channel", TCL_NOSIZE));
}
return 1;
}
@@ -2523,7 +2523,7 @@ FlushChannel(
if (interp != NULL && !TclChanCaughtErrorBypass(interp,
(Tcl_Channel) chanPtr)) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj(Tcl_PosixError(interp), -1));
Tcl_NewStringObj(Tcl_PosixError(interp), TCL_NOSIZE));
}
/*
@@ -3062,7 +3062,7 @@ Tcl_Close(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"illegal recursive call to close through close-handler"
" of channel", -1));
" of channel", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -3163,7 +3163,7 @@ Tcl_Close(
Tcl_SetErrno(stickyError);
if (interp != NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj(Tcl_PosixError(interp), -1));
Tcl_NewStringObj(Tcl_PosixError(interp), TCL_NOSIZE));
}
flushcode = -1;
}
@@ -3232,7 +3232,7 @@ Tcl_CloseEx(
if (chanPtr != statePtr->topChanPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"half-close not applicable to stack of transformations", -1));
"half-close not applicable to stack of transformations", TCL_NOSIZE));
return TCL_ERROR;
}
@@ -3265,7 +3265,7 @@ Tcl_CloseEx(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"illegal recursive call to close through close-handler"
" of channel", -1));
" of channel", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -5520,7 +5520,7 @@ Tcl_ReadRaw(
Channel *chanPtr = (Channel *) chan;
ChannelState *statePtr = chanPtr->state;
/* State info for channel */
int nread, result, copied, copiedNow;
TCL_SIZE_T nread, result, copied, copiedNow;
/*
* The check below does too much because it will reject a call to this
@@ -5672,7 +5672,7 @@ Tcl_ReadChars(
Tcl_Channel chan, /* The channel to read. */
Tcl_Obj *objPtr, /* Input data is stored in this object. */
int toRead, /* Maximum number of characters to store, or
* -1 to read all available data (up to EOF or
* TCL_NOSIZE to read all available data (up to EOF or
* when channel blocks). */
int appendFlag) /* If non-zero, data read from the channel
* will be appended to the object. Otherwise,
@@ -5699,7 +5699,7 @@ Tcl_ReadChars(
return -1;
}
return DoReadChars(chanPtr, objPtr, toRead, appendFlag);
return (int) DoReadChars(chanPtr, objPtr, toRead, appendFlag);
}
/*
*---------------------------------------------------------------------------
@@ -5714,7 +5714,7 @@ Tcl_ReadChars(
* object.
*
* Results:
* The number of characters read, or -1 on error. Use Tcl_GetErrno() to
* The number of characters read, or TCL_NOSIZE on error. Use Tcl_GetErrno() to
* retrieve the error code for the error that occurred.
*
* Side effects:
@@ -5723,11 +5723,11 @@ Tcl_ReadChars(
*---------------------------------------------------------------------------
*/
static int
static TCL_SIZE_T
DoReadChars(
Channel *chanPtr, /* The channel to read. */
Tcl_Obj *objPtr, /* Input data is stored in this object. */
int toRead, /* Maximum number of characters to store, or
TCL_SIZE_T toRead, /* Maximum number of characters to store, or
* -1 to read all available data (up to EOF or
* when channel blocks). */
int appendFlag) /* If non-zero, data read from the channel
@@ -5738,7 +5738,8 @@ DoReadChars(
ChannelState *statePtr = chanPtr->state;
/* State info for channel */
ChannelBuffer *bufPtr;
int offset, factor, copied, copiedNow, result;
TCL_SIZE_T offset, factor, copied, copiedNow;
int result;
Tcl_Encoding encoding;
#define UTF_EXPANSION_FACTOR 1024
@@ -6812,10 +6813,10 @@ GetInput(
*----------------------------------------------------------------------
*/
Tcl_WideInt
TCL_SIZE_T
Tcl_Seek(
Tcl_Channel chan, /* The channel on which to seek. */
Tcl_WideInt offset, /* Offset to seek to. */
TCL_SIZE_T offset, /* Offset to seek to. */
int mode) /* Relative to which location to seek? */
{
Channel *chanPtr = (Channel *) chan;
@@ -6825,13 +6826,13 @@ Tcl_Seek(
int inputBuffered, outputBuffered;
/* # bytes held in buffers. */
int result; /* Of device driver operations. */
Tcl_WideInt curPos; /* Position on the device. */
TCL_SIZE_T curPos; /* Position on the device. */
int wasAsync; /* Was the channel nonblocking before the seek
* operation? If so, must restore to
* non-blocking mode after the seek. */
if (CheckChannelErrors(statePtr, TCL_WRITABLE | TCL_READABLE) != 0) {
return Tcl_LongAsWide(-1);
return TCL_NOSIZE;
}
/*
@@ -6842,7 +6843,7 @@ Tcl_Seek(
*/
if (CheckForDeadChannel(NULL, statePtr)) {
return Tcl_LongAsWide(-1);
return TCL_NOSIZE;
}
/*
@@ -6858,7 +6859,7 @@ Tcl_Seek(
if (chanPtr->typePtr->seekProc == NULL) {
Tcl_SetErrno(EINVAL);
return Tcl_LongAsWide(-1);
return TCL_NOSIZE;
}
/*
@@ -6871,7 +6872,7 @@ Tcl_Seek(
if ((inputBuffered != 0) && (outputBuffered != 0)) {
Tcl_SetErrno(EFAULT);
return Tcl_LongAsWide(-1);
return TCL_NOSIZE;
}
/*
@@ -6976,7 +6977,7 @@ Tcl_Seek(
* channel.
*
* Results:
* A nonnegative integer on success, -1 on failure. If failed, use
* A nonnegative integer on success, TCL_NOSIZE on failure. If failed, use
* Tcl_GetErrno() to retrieve the POSIX error code for the error that
* occurred.
*
@@ -6986,7 +6987,7 @@ Tcl_Seek(
*----------------------------------------------------------------------
*/
Tcl_WideInt
TCL_SIZE_T
Tcl_Tell(
Tcl_Channel chan) /* The channel to return pos for. */
{
@@ -6994,13 +6995,13 @@ Tcl_Tell(
/* The real IO channel. */
ChannelState *statePtr = chanPtr->state;
/* State info for channel */
int inputBuffered, outputBuffered;
TCL_SIZE_T inputBuffered, outputBuffered;
/* # bytes held in buffers. */
int result; /* Of calling device driver. */
Tcl_WideInt curPos; /* Position on device. */
TCL_SIZE_T curPos; /* Position on device. */
if (CheckChannelErrors(statePtr, TCL_WRITABLE | TCL_READABLE) != 0) {
return Tcl_LongAsWide(-1);
return TCL_NOSIZE;
}
/*
@@ -7011,7 +7012,7 @@ Tcl_Tell(
*/
if (CheckForDeadChannel(NULL, statePtr)) {
return Tcl_LongAsWide(-1);
return TCL_NOSIZE;
}
/*
@@ -7027,7 +7028,7 @@ Tcl_Tell(
if (chanPtr->typePtr->seekProc == NULL) {
Tcl_SetErrno(EINVAL);
return Tcl_LongAsWide(-1);
return TCL_NOSIZE;
}
/*
@@ -7044,10 +7045,10 @@ Tcl_Tell(
* wideSeekProc if that is available and non-NULL...
*/
curPos = ChanSeek(chanPtr, Tcl_LongAsWide(0), SEEK_CUR, &result);
if (curPos == Tcl_LongAsWide(-1)) {
curPos = ChanSeek(chanPtr, 0, SEEK_CUR, &result);
if (curPos == TCL_NOSIZE) {
Tcl_SetErrno(result);
return Tcl_LongAsWide(-1);
return TCL_NOSIZE;
}
if (inputBuffered != 0) {
@@ -7056,6 +7057,52 @@ Tcl_Tell(
return curPos + outputBuffered;
}
/*
*---------------------------------------------------------------------------
*
* Tcl_SeekOld, Tcl_TellOld --
*
* Backward-compatability versions of the seek/tell interface which used
* 64-bit offsets. This interface is not documented or expected
* to be supported indefinitely.
*
* Results:
* As for Tcl_Seek and Tcl_Tell respectively, except expanded to
* 64-bits even on platforms which support only 32-bits.
*
* Side effects:
* As for Tcl_Seek and Tcl_Tell respectively.
*
*---------------------------------------------------------------------------
*/
Tcl_WideInt
Tcl_SeekOld(
Tcl_Channel chan, /* The channel on which to seek. */
Tcl_WideInt offset, /* Offset to seek to. */
int mode) /* Relative to which location to seek? */
{
TCL_SIZE_T wResult;
wResult = Tcl_Seek(chan, (TCL_SIZE_T) offset, mode);
if (wResult == TCL_NOSIZE) {
return -1;
}
return (Tcl_WideInt) wResult;
}
Tcl_WideInt
Tcl_TellOld(
Tcl_Channel chan) /* The channel to return pos for. */
{
TCL_SIZE_T wResult = Tcl_Tell(chan);
if (wResult == TCL_NOSIZE) {
return -1;
}
return (Tcl_WideInt) wResult;
}
/*
*---------------------------------------------------------------------------
*
@@ -7520,10 +7567,10 @@ Tcl_BadChannelOption(
Tcl_Obj *errObj;
Tcl_DStringInit(&ds);
Tcl_DStringAppend(&ds, genericopt, -1);
Tcl_DStringAppend(&ds, genericopt, TCL_NOSIZE);
if (optionList && (*optionList)) {
TclDStringAppendLiteral(&ds, " ");
Tcl_DStringAppend(&ds, optionList, -1);
Tcl_DStringAppend(&ds, optionList, TCL_NOSIZE);
}
if (Tcl_SplitList(interp, Tcl_DStringValue(&ds),
&argc, &argv) != TCL_OK) {
@@ -7817,7 +7864,7 @@ Tcl_SetChannelOption(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unable to set channel options: background copy in"
" progress", -1));
" progress", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -7868,7 +7915,7 @@ Tcl_SetChannelOption(
} else if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -buffering: must be one of"
" full, line, or none", -1));
" full, line, or none", TCL_NOSIZE));
return TCL_ERROR;
}
return TCL_OK;
@@ -7925,7 +7972,7 @@ Tcl_SetChannelOption(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -eofchar: must be non-NUL ASCII"
" character", -1));
" character", TCL_NOSIZE));
}
ckfree(argv);
return TCL_ERROR;
@@ -7940,7 +7987,7 @@ Tcl_SetChannelOption(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -eofchar: should be a list of zero,"
" one, or two elements", -1));
" one, or two elements", TCL_NOSIZE));
}
ckfree(argv);
return TCL_ERROR;
@@ -7974,7 +8021,7 @@ Tcl_SetChannelOption(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -translation: must be a one or two"
" element list", -1));
" element list", TCL_NOSIZE));
}
ckfree(argv);
return TCL_ERROR;
@@ -8004,7 +8051,7 @@ Tcl_SetChannelOption(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -translation: must be one of "
"auto, binary, cr, lf, crlf, or platform", -1));
"auto, binary, cr, lf, crlf, or platform", TCL_NOSIZE));
}
ckfree(argv);
return TCL_ERROR;
@@ -8054,7 +8101,7 @@ Tcl_SetChannelOption(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -translation: must be one of "
"auto, binary, cr, lf, crlf, or platform", -1));
"auto, binary, cr, lf, crlf, or platform", TCL_NOSIZE));
}
ckfree(argv);
return TCL_ERROR;
@@ -8965,12 +9012,24 @@ ZeroTransferTimerProc(
*/
int
TclCopyChannel(
TclCopyChannelOld(
Tcl_Interp *interp, /* Current interpreter. */
Tcl_Channel inChan, /* Channel to read from. */
Tcl_Channel outChan, /* Channel to write to. */
Tcl_WideInt toRead, /* Amount of data to copy, or -1 for all. */
Tcl_Obj *cmdPtr) /* Pointer to script to execute or NULL. */
{
return TclCopyChannelOld(interp, inChan, outChan, (TCL_SIZE_T) toRead,
cmdPtr);
}
int
TclCopyChannel(
Tcl_Interp *interp, /* Current interpreter. */
Tcl_Channel inChan, /* Channel to read from. */
Tcl_Channel outChan, /* Channel to write to. */
TCL_SIZE_T toRead, /* Amount of data to copy, or TCL_NO_SIZE for all. */
Tcl_Obj *cmdPtr) /* Pointer to script to execute or NULL. */
{
Channel *inPtr = (Channel *) inChan;
Channel *outPtr = (Channel *) outChan;
@@ -9041,7 +9100,7 @@ TclCopyChannel(
csPtr->readFlags = readFlags;
csPtr->writeFlags = writeFlags;
csPtr->toRead = toRead;
csPtr->total = (Tcl_WideInt) 0;
csPtr->total = 0;
csPtr->interp = interp;
if (cmdPtr) {
Tcl_IncrRefCount(cmdPtr);
@@ -9094,8 +9153,8 @@ CopyData(
Tcl_Obj *cmdPtr, *errObj = NULL, *bufObj = NULL, *msg = NULL;
Tcl_Channel inChan, outChan;
ChannelState *inStatePtr, *outStatePtr;
int result = TCL_OK, size, sizeb;
Tcl_WideInt total;
int result = TCL_OK;
TCL_SIZE_T size, sizeb, total;
const char *buffer;
int inBinary, outBinary, sameEncoding;
/* Encoding control */
@@ -9125,7 +9184,7 @@ CopyData(
Tcl_IncrRefCount(bufObj);
}
while (csPtr->toRead != (Tcl_WideInt) 0) {
while (csPtr->toRead != 0) {
/*
* Check for unreported background errors.
*/
@@ -9156,11 +9215,11 @@ CopyData(
* Read up to bufSize bytes.
*/
if ((csPtr->toRead == (Tcl_WideInt) -1)
|| (csPtr->toRead > (Tcl_WideInt) csPtr->bufSize)) {
if ((csPtr->toRead == TCL_NOSIZE)
|| (csPtr->toRead > csPtr->bufSize)) {
sizeb = csPtr->bufSize;
} else {
sizeb = (int) csPtr->toRead;
sizeb = csPtr->toRead;
}
if (inBinary || sameEncoding) {
@@ -9273,7 +9332,7 @@ CopyData(
* of bytes left to copy.
*/
if (csPtr->toRead != -1) {
if (csPtr->toRead != TCL_NOSIZE) {
csPtr->toRead -= size;
}
csPtr->total += size;
@@ -9391,7 +9450,7 @@ CopyData(
* are applied to the bytes being read.
*
* Results:
* The number of characters read, or -1 on error. Use Tcl_GetErrno() to
* The number of characters read, or TCL_NOSIZE on error. Use Tcl_GetErrno() to
* retrieve the error code for the error that occurred.
*
* Side effects:
@@ -9400,18 +9459,18 @@ CopyData(
*----------------------------------------------------------------------
*/
static int
static TCL_SIZE_T
DoRead(
Channel *chanPtr, /* The channel from which to read. */
char *bufPtr, /* Where to store input read. */
int toRead, /* Maximum number of bytes to read. */
TCL_SIZE_T toRead, /* Maximum number of bytes to read. */
int allowShortReads) /* Allow half-blocking (pipes,sockets) */
{
ChannelState *statePtr = chanPtr->state;
/* State info for channel */
int copied; /* How many characters were copied into the
TCL_SIZE_T copied; /* How many characters were copied into the
* result string? */
int copiedNow; /* How many characters were copied from the
TCL_SIZE_T copiedNow; /* How many characters were copied from the
* current input buffer? */
int result; /* Of calling GetInput. */
@@ -9442,7 +9501,7 @@ DoRead(
result = GetInput(chanPtr);
if (result != 0) {
if (result != EAGAIN) {
copied = -1;
copied = TCL_NOSIZE;
}
goto done;
}
@@ -9483,19 +9542,19 @@ DoRead(
*----------------------------------------------------------------------
*/
static int
static TCL_SIZE_T
CopyAndTranslateBuffer(
ChannelState *statePtr, /* Channel state from which to read input. */
char *result, /* Where to store the copied input. */
int space) /* How many bytes are available in result to
TCL_SIZE_T space) /* How many bytes are available in result to
* store the copied input? */
{
ChannelBuffer *bufPtr; /* The buffer from which to copy bytes. */
int bytesInBuffer; /* How many bytes are available to be copied
TCL_SIZE_T bytesInBuffer; /* How many bytes are available to be copied
* in the current input buffer? */
int copied; /* How many characters were already copied
TCL_SIZE_T copied; /* How many characters were already copied
* into the destination space? */
int i; /* Iterates over the copied input looking for
TCL_SIZE_T i; /* Iterates over the copied input looking for
* the input eofChar. */
/*
@@ -9525,7 +9584,7 @@ CopyAndTranslateBuffer(
if (bytesInBuffer < space) {
space = bytesInBuffer;
}
memcpy(result, RemovePoint(bufPtr), (size_t) space);
memcpy(result, RemovePoint(bufPtr), space);
bufPtr->nextRemoved += space;
copied = space;
break;
@@ -9708,17 +9767,17 @@ CopyAndTranslateBuffer(
*----------------------------------------------------------------------
*/
static int
static TCL_SIZE_T
CopyBuffer(
Channel *chanPtr, /* Channel from which to read input. */
char *result, /* Where to store the copied input. */
int space) /* How many bytes are available in result to
TCL_SIZE_T space) /* How many bytes are available in result to
* store the copied input? */
{
ChannelBuffer *bufPtr; /* The buffer from which to copy bytes. */
int bytesInBuffer; /* How many bytes are available to be copied
TCL_SIZE_T bytesInBuffer; /* How many bytes are available to be copied
* in the current input buffer? */
int copied; /* How many characters were already copied
TCL_SIZE_T copied; /* How many characters were already copied
* into the destination space? */
/*
@@ -9752,7 +9811,7 @@ CopyBuffer(
space = bytesInBuffer;
}
memcpy(result, RemovePoint(bufPtr), (size_t) space);
memcpy(result, RemovePoint(bufPtr), space);
bufPtr->nextRemoved += space;
copied = space;
@@ -10212,7 +10271,7 @@ Tcl_GetChannelNamesEx(
&& (pattern[2] == 'd'))) {
if ((Tcl_FindHashEntry(hTblPtr, pattern) != NULL)
&& (Tcl_ListObjAppendElement(interp, resultPtr,
Tcl_NewStringObj(pattern, -1)) != TCL_OK)) {
Tcl_NewStringObj(pattern, TCL_NOSIZE)) != TCL_OK)) {
goto error;
}
goto done;
@@ -10239,7 +10298,7 @@ Tcl_GetChannelNamesEx(
if (((pattern == NULL) || Tcl_StringMatch(name, pattern)) &&
(Tcl_ListObjAppendElement(interp, resultPtr,
Tcl_NewStringObj(name, -1)) != TCL_OK)) {
Tcl_NewStringObj(name, TCL_NOSIZE)) != TCL_OK)) {
error:
TclDecrRefCount(resultPtr);
return TCL_ERROR;
+3 -3
View File
@@ -40,11 +40,11 @@ typedef struct CopyState {
struct Channel *writePtr; /* Pointer to output channel. */
int readFlags; /* Original read channel flags. */
int writeFlags; /* Original write channel flags. */
Tcl_WideInt toRead; /* Number of bytes to copy, or -1. */
Tcl_WideInt total; /* Total bytes transferred (written). */
TCL_SIZE_T toRead; /* Number of bytes to copy, or TCL_NOSIZE. */
TCL_SIZE_T total; /* Total bytes transferred (written). */
Tcl_Interp *interp; /* Interp that started the copy. */
Tcl_Obj *cmdPtr; /* Command to be invoked at completion. */
int bufSize; /* Size of appended buffer. */
TCL_SIZE_T bufSize; /* Size of appended buffer. */
char buffer[1]; /* Copy buffer, this must be the last
* field. */
} CopyState;
+19 -19
View File
@@ -531,7 +531,7 @@ Tcl_SeekObjCmd(
mode = modeArray[optionIndex];
}
result = Tcl_Seek(chan, offset, mode);
result = Tcl_SeekOld(chan, offset, mode);
if (result == Tcl_LongAsWide(-1)) {
/*
* TIP #219.
@@ -592,7 +592,7 @@ Tcl_TellObjCmd(
return TCL_ERROR;
}
newLoc = Tcl_Tell(chan);
newLoc = Tcl_TellOld(chan);
/*
* TIP #219.
@@ -957,7 +957,7 @@ Tcl_ExecObjCmd(
resultPtr = Tcl_NewObj();
if (Tcl_GetChannelHandle(chan, TCL_READABLE, NULL) == TCL_OK) {
if (Tcl_ReadChars(chan, resultPtr, -1, 0) < 0) {
if (Tcl_ReadChars(chan, resultPtr, TCL_NOSIZE, 0) < 0) {
/*
* TIP #219.
* Capture error messages put by the driver into the bypass area
@@ -1101,7 +1101,7 @@ Tcl_OpenObjCmd(
Tcl_Obj *permObj;
TclNewLiteralStringObj(permObj, "0o");
Tcl_AppendToObj(permObj, permString+scanned+1, -1);
Tcl_AppendToObj(permObj, permString+scanned+1, TCL_NOSIZE);
code = TclGetIntFromObj(NULL, permObj, &prot);
Tcl_DecrRefCount(permObj);
}
@@ -1164,7 +1164,7 @@ Tcl_OpenObjCmd(
return TCL_ERROR;
}
Tcl_RegisterChannel(interp, chan);
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), TCL_NOSIZE));
return TCL_OK;
}
@@ -1470,7 +1470,7 @@ Tcl_SocketObjCmd(
case SKT_ASYNC:
if (server == 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot set -async option for server sockets", -1));
"cannot set -async option for server sockets", TCL_NOSIZE));
return TCL_ERROR;
}
async = 1;
@@ -1479,7 +1479,7 @@ Tcl_SocketObjCmd(
a++;
if (a >= objc) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"no argument given for -myaddr option", -1));
"no argument given for -myaddr option", TCL_NOSIZE));
return TCL_ERROR;
}
myaddr = TclGetString(objv[a]);
@@ -1490,7 +1490,7 @@ Tcl_SocketObjCmd(
a++;
if (a >= objc) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"no argument given for -myport option", -1));
"no argument given for -myport option", TCL_NOSIZE));
return TCL_ERROR;
}
myPortName = TclGetString(objv[a]);
@@ -1502,14 +1502,14 @@ Tcl_SocketObjCmd(
case SKT_SERVER:
if (async == 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot set -async option for server sockets", -1));
"cannot set -async option for server sockets", TCL_NOSIZE));
return TCL_ERROR;
}
server = 1;
a++;
if (a >= objc) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"no argument given for -server option", -1));
"no argument given for -server option", TCL_NOSIZE));
return TCL_ERROR;
}
script = TclGetString(objv[a]);
@@ -1522,7 +1522,7 @@ Tcl_SocketObjCmd(
host = myaddr; /* NULL implies INADDR_ANY */
if (myport != 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"option -myport is not valid for servers", -1));
"option -myport is not valid for servers", TCL_NOSIZE));
return TCL_ERROR;
}
} else if (a < objc) {
@@ -1591,7 +1591,7 @@ Tcl_SocketObjCmd(
}
Tcl_RegisterChannel(interp, chan);
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), TCL_NOSIZE));
return TCL_OK;
}
@@ -1686,7 +1686,7 @@ Tcl_FcopyObjCmd(
}
}
return TclCopyChannel(interp, inChan, outChan, toRead, cmdPtr);
return TclCopyChannelOld(interp, inChan, outChan, toRead, cmdPtr);
}
/*
@@ -1799,7 +1799,7 @@ ChanTruncateObjCmd(
}
if (length < 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot truncate to negative length of file", -1));
"cannot truncate to negative length of file", TCL_NOSIZE));
return TCL_ERROR;
}
} else {
@@ -1807,7 +1807,7 @@ ChanTruncateObjCmd(
* User wants to truncate to the current file position.
*/
length = Tcl_Tell(chan);
length = Tcl_TellOld(chan);
if (length == Tcl_WideAsLong(-1)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"could not determine current location in \"%s\": %s",
@@ -1869,9 +1869,9 @@ ChanPipeObjCmd(
resultPtr = Tcl_NewObj();
Tcl_ListObjAppendElement(NULL, resultPtr,
Tcl_NewStringObj(channelNames[0], -1));
Tcl_NewStringObj(channelNames[0], TCL_NOSIZE));
Tcl_ListObjAppendElement(NULL, resultPtr,
Tcl_NewStringObj(channelNames[1], -1));
Tcl_NewStringObj(channelNames[1], TCL_NOSIZE));
Tcl_SetObjResult(interp, resultPtr);
return TCL_OK;
@@ -1975,8 +1975,8 @@ TclInitChanCmd(
* Can assume that reference counts are all incremented.
*/
Tcl_DictObjPut(NULL, mapObj, Tcl_NewStringObj(extras[i], -1),
Tcl_NewStringObj(extras[i+1], -1));
Tcl_DictObjPut(NULL, mapObj, Tcl_NewStringObj(extras[i], TCL_NOSIZE),
Tcl_NewStringObj(extras[i+1], TCL_NOSIZE));
}
Tcl_SetEnsembleMappingDict(interp, ensemble, mapObj);
return ensemble;
+1 -1
View File
@@ -366,7 +366,7 @@ ExecuteCallback(
Tcl_IncrRefCount(command);
res = Tcl_ListObjAppendElement(dataPtr->interp, command,
Tcl_NewStringObj((char *) op, -1));
Tcl_NewStringObj((char *) op, TCL_NOSIZE));
if (res != TCL_OK) {
goto cleanup;
}
+18 -18
View File
@@ -410,11 +410,11 @@ static void SrcExitProc(ClientData clientData);
#define PassReceivedErrorInterp(i,p) \
if ((i) != NULL) { \
Tcl_SetChannelErrorInterp((i), \
Tcl_NewStringObj((p)->base.msgStr, -1)); \
Tcl_NewStringObj((p)->base.msgStr, TCL_NOSIZE)); \
} \
FreeReceivedError(p)
#define PassReceivedError(c,p) \
Tcl_SetChannelError((c), Tcl_NewStringObj((p)->base.msgStr, -1)); \
Tcl_SetChannelError((c), Tcl_NewStringObj((p)->base.msgStr, TCL_NOSIZE)); \
FreeReceivedError(p)
#define ForwardSetStaticError(p,emsg) \
(p)->base.code = TCL_ERROR; \
@@ -433,7 +433,7 @@ static void DeleteThreadReflectedChannelMap(ClientData clientData);
#endif /* TCL_THREADS */
#define SetChannelErrorStr(c,msgStr) \
Tcl_SetChannelError((c), Tcl_NewStringObj((msgStr), -1))
Tcl_SetChannelError((c), Tcl_NewStringObj((msgStr), TCL_NOSIZE))
static Tcl_Obj * MarshallError(Tcl_Interp *interp);
static void UnmarshallErrorResult(Tcl_Interp *interp,
@@ -630,7 +630,7 @@ TclChanCreateObjCmd(
"method", TCL_EXACT, &methIndex) != TCL_OK) {
TclNewLiteralStringObj(err, "chan handler \"");
Tcl_AppendObjToObj(err, cmdObj);
Tcl_AppendToObj(err, " initialize\" returned ", -1);
Tcl_AppendToObj(err, " initialize\" returned ", TCL_NOSIZE);
Tcl_AppendObjToObj(err, Tcl_GetObjResult(interp));
Tcl_SetObjResult(interp, err);
Tcl_DecrRefCount(resObj);
@@ -740,7 +740,7 @@ TclChanCreateObjCmd(
*/
Tcl_SetObjResult(interp,
Tcl_NewStringObj(chanPtr->state->channelName, -1));
Tcl_NewStringObj(chanPtr->state->channelName, TCL_NOSIZE));
return TCL_OK;
error:
@@ -1564,7 +1564,7 @@ ReflectSeekWide(
offObj = Tcl_NewWideIntObj(offset);
baseObj = Tcl_NewStringObj(
(seekMode == SEEK_SET) ? "start" :
(seekMode == SEEK_CUR) ? "current" : "end", -1);
(seekMode == SEEK_CUR) ? "current" : "end", TCL_NOSIZE);
Tcl_IncrRefCount(offObj);
Tcl_IncrRefCount(baseObj);
@@ -1836,7 +1836,7 @@ ReflectSetOption(
ForwardOpToHandlerThread(rcPtr, ForwardedSetOpt, &p);
if (p.base.code != TCL_OK) {
Tcl_Obj *err = Tcl_NewStringObj(p.base.msgStr, -1);
Tcl_Obj *err = Tcl_NewStringObj(p.base.msgStr, TCL_NOSIZE);
UnmarshallErrorResult(interp, err);
Tcl_DecrRefCount(err);
@@ -1848,8 +1848,8 @@ ReflectSetOption(
#endif
Tcl_Preserve(rcPtr);
optionObj = Tcl_NewStringObj(optionName, -1);
valueObj = Tcl_NewStringObj(newValue, -1);
optionObj = Tcl_NewStringObj(optionName, TCL_NOSIZE);
valueObj = Tcl_NewStringObj(newValue, TCL_NOSIZE);
Tcl_IncrRefCount(optionObj);
Tcl_IncrRefCount(valueObj);
@@ -1922,7 +1922,7 @@ ReflectGetOption(
ForwardOpToHandlerThread(rcPtr, opcode, &p);
if (p.base.code != TCL_OK) {
Tcl_Obj *err = Tcl_NewStringObj(p.base.msgStr, -1);
Tcl_Obj *err = Tcl_NewStringObj(p.base.msgStr, TCL_NOSIZE);
UnmarshallErrorResult(interp, err);
Tcl_DecrRefCount(err);
@@ -1946,7 +1946,7 @@ ReflectGetOption(
*/
method = "cget";
optionObj = Tcl_NewStringObj(optionName, -1);
optionObj = Tcl_NewStringObj(optionName, TCL_NOSIZE);
Tcl_IncrRefCount(optionObj);
}
@@ -2128,7 +2128,7 @@ DecodeEventMask(
break;
}
evObj = Tcl_NewStringObj(eventStr, -1);
evObj = Tcl_NewStringObj(eventStr, TCL_NOSIZE);
Tcl_IncrRefCount(evObj);
/* assert evObj.refCount == 1 */
return evObj;
@@ -2358,7 +2358,7 @@ InvokeTclMethod(
*/
if (resultObjPtr != NULL) {
resObj = Tcl_NewStringObj(msg_dstlost,-1);
resObj = Tcl_NewStringObj(msg_dstlost, TCL_NOSIZE);
*resultObjPtr = resObj;
Tcl_IncrRefCount(resObj);
}
@@ -2382,7 +2382,7 @@ InvokeTclMethod(
* before the channel id.
*/
methObj = Tcl_NewStringObj(method, -1);
methObj = Tcl_NewStringObj(method, TCL_NOSIZE);
Tcl_IncrRefCount(methObj);
rcPtr->argv[rcPtr->argc - 2] = methObj;
@@ -3132,7 +3132,7 @@ ForwardProc(
Tcl_Obj *offObj = Tcl_NewWideIntObj(paramPtr->seek.offset);
Tcl_Obj *baseObj = Tcl_NewStringObj(
(paramPtr->seek.seekMode==SEEK_SET) ? "start" :
(paramPtr->seek.seekMode==SEEK_CUR) ? "current" : "end", -1);
(paramPtr->seek.seekMode==SEEK_CUR) ? "current" : "end", TCL_NOSIZE);
Tcl_IncrRefCount(offObj);
Tcl_IncrRefCount(baseObj);
@@ -3195,8 +3195,8 @@ ForwardProc(
}
case ForwardedSetOpt: {
Tcl_Obj *optionObj = Tcl_NewStringObj(paramPtr->setOpt.name, -1);
Tcl_Obj *valueObj = Tcl_NewStringObj(paramPtr->setOpt.value, -1);
Tcl_Obj *optionObj = Tcl_NewStringObj(paramPtr->setOpt.name, TCL_NOSIZE);
Tcl_Obj *valueObj = Tcl_NewStringObj(paramPtr->setOpt.value, TCL_NOSIZE);
Tcl_IncrRefCount(optionObj);
Tcl_IncrRefCount(valueObj);
@@ -3216,7 +3216,7 @@ ForwardProc(
* Retrieve the value of one option.
*/
Tcl_Obj *optionObj = Tcl_NewStringObj(paramPtr->getOpt.name, -1);
Tcl_Obj *optionObj = Tcl_NewStringObj(paramPtr->getOpt.name, TCL_NOSIZE);
Tcl_IncrRefCount(optionObj);
Tcl_Preserve(rcPtr);
+7 -7
View File
@@ -372,14 +372,14 @@ static void SrcExitProc(ClientData clientData);
do { \
if ((i) != NULL) { \
Tcl_SetChannelErrorInterp((i), \
Tcl_NewStringObj((p)->base.msgStr, -1)); \
Tcl_NewStringObj((p)->base.msgStr, TCL_NOSIZE)); \
} \
FreeReceivedError(p); \
} while (0)
#define PassReceivedError(c,p) \
do { \
Tcl_SetChannelError((c), \
Tcl_NewStringObj((p)->base.msgStr, -1)); \
Tcl_NewStringObj((p)->base.msgStr, TCL_NOSIZE)); \
FreeReceivedError(p); \
} while (0)
#define ForwardSetStaticError(p,emsg) \
@@ -403,7 +403,7 @@ static void DeleteThreadReflectedTransformMap(
#endif /* TCL_THREADS */
#define SetChannelErrorStr(c,msgStr) \
Tcl_SetChannelError((c), Tcl_NewStringObj((msgStr), -1))
Tcl_SetChannelError((c), Tcl_NewStringObj((msgStr), TCL_NOSIZE))
static Tcl_Obj * MarshallError(Tcl_Interp *interp);
static void UnmarshallErrorResult(Tcl_Interp *interp,
@@ -710,7 +710,7 @@ TclChanPushObjCmd(
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj(
Tcl_GetChannelName(rtPtr->chan), -1));
Tcl_GetChannelName(rtPtr->chan), TCL_NOSIZE));
return TCL_OK;
error:
@@ -1721,7 +1721,7 @@ DecodeEventMask(
break;
}
evObj = Tcl_NewStringObj(eventStr, -1);
evObj = Tcl_NewStringObj(eventStr, TCL_NOSIZE);
Tcl_IncrRefCount(evObj);
return evObj;
}
@@ -1962,7 +1962,7 @@ InvokeTclMethod(
*/
if (resultObjPtr != NULL) {
resObj = Tcl_NewStringObj(msg_dstlost,-1);
resObj = Tcl_NewStringObj(msg_dstlost, TCL_NOSIZE);
*resultObjPtr = resObj;
Tcl_IncrRefCount(resObj);
}
@@ -1981,7 +1981,7 @@ InvokeTclMethod(
* before the channel id.
*/
methObj = Tcl_NewStringObj(method, -1);
methObj = Tcl_NewStringObj(method, TCL_NOSIZE);
Tcl_IncrRefCount(methObj);
rtPtr->argv[rtPtr->argc - 2] = methObj;
+3 -3
View File
@@ -52,7 +52,7 @@ TclSockGetPort(
* Don't bother translating 'proto' to native.
*/
native = Tcl_UtfToExternalDString(NULL, string, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, string, TCL_NOSIZE, &ds);
sp = getservbyname(native, proto); /* INTL: Native. */
Tcl_DStringFree(&ds);
if (sp != NULL) {
@@ -65,7 +65,7 @@ TclSockGetPort(
}
if (*portPtr > 0xFFFF) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"couldn't open socket: port number too high", -1));
"couldn't open socket: port number too high", TCL_NOSIZE));
return TCL_ERROR;
}
return TCL_OK;
@@ -157,7 +157,7 @@ TclCreateSocketAddress(
int result, i;
if (host != NULL) {
native = Tcl_UtfToExternalDString(NULL, host, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, host, TCL_NOSIZE, &ds);
}
/*
+15 -15
View File
@@ -264,7 +264,7 @@ Tcl_Stat(
{
int ret;
Tcl_StatBuf buf;
Tcl_Obj *pathPtr = Tcl_NewStringObj(path,-1);
Tcl_Obj *pathPtr = Tcl_NewStringObj(path, TCL_NOSIZE);
Tcl_IncrRefCount(pathPtr);
ret = Tcl_FSStat(pathPtr, &buf);
@@ -350,7 +350,7 @@ Tcl_Access(
int mode) /* Permission setting. */
{
int ret;
Tcl_Obj *pathPtr = Tcl_NewStringObj(path,-1);
Tcl_Obj *pathPtr = Tcl_NewStringObj(path, TCL_NOSIZE);
Tcl_IncrRefCount(pathPtr);
ret = Tcl_FSAccess(pathPtr,mode);
@@ -371,7 +371,7 @@ Tcl_OpenFileChannel(
* what modes to create it? */
{
Tcl_Channel ret;
Tcl_Obj *pathPtr = Tcl_NewStringObj(path,-1);
Tcl_Obj *pathPtr = Tcl_NewStringObj(path, TCL_NOSIZE);
Tcl_IncrRefCount(pathPtr);
ret = Tcl_FSOpenFileChannel(interp, pathPtr, modeString, permissions);
@@ -386,7 +386,7 @@ Tcl_Chdir(
const char *dirName)
{
int ret;
Tcl_Obj *pathPtr = Tcl_NewStringObj(dirName,-1);
Tcl_Obj *pathPtr = Tcl_NewStringObj(dirName, TCL_NOSIZE);
Tcl_IncrRefCount(pathPtr);
ret = Tcl_FSChdir(pathPtr);
Tcl_DecrRefCount(pathPtr);
@@ -418,7 +418,7 @@ Tcl_EvalFile(
* will be performed on this name. */
{
int ret;
Tcl_Obj *pathPtr = Tcl_NewStringObj(fileName,-1);
Tcl_Obj *pathPtr = Tcl_NewStringObj(fileName, TCL_NOSIZE);
Tcl_IncrRefCount(pathPtr);
ret = Tcl_FSEvalFile(interp, pathPtr);
@@ -1100,7 +1100,7 @@ Tcl_FSMatchInDirectory(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"glob couldn't determine the current working directory",
-1));
TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -1671,7 +1671,7 @@ TclGetOpenModeEx(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"access mode must include either RDONLY, WRONLY, or RDWR",
-1));
TCL_NOSIZE));
}
return -1;
}
@@ -1785,7 +1785,7 @@ Tcl_FSEvalFileEx(
* otherwise replace them. [Bug 3466099]
*/
if (Tcl_ReadChars(chan, objPtr, -1,
if (Tcl_ReadChars(chan, objPtr, TCL_NOSIZE,
memcmp(string, "\xef\xbb\xbf", 3)) < 0) {
Tcl_Close(interp, chan);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -1920,7 +1920,7 @@ TclNREvalFile(
* otherwise replace them. [Bug 3466099]
*/
if (Tcl_ReadChars(chan, objPtr, -1,
if (Tcl_ReadChars(chan, objPtr, TCL_NOSIZE,
memcmp(string, "\xef\xbb\xbf", 3)) < 0) {
Tcl_Close(interp, chan);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -2258,7 +2258,7 @@ Tcl_FSOpenFileChannel(
* Apply appropriate flags parsed out above.
*/
if (seekFlag && Tcl_Seek(retVal, (Tcl_WideInt) 0, SEEK_END)
if (seekFlag && Tcl_Seek(retVal, 0, SEEK_END)
< (Tcl_WideInt) 0) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -2488,7 +2488,7 @@ TclFSFileAttrIndex(
* It's a constant attribute table, so use T_GIFO.
*/
Tcl_Obj *tmpObj = Tcl_NewStringObj(attributeName, -1);
Tcl_Obj *tmpObj = Tcl_NewStringObj(attributeName, TCL_NOSIZE);
int result;
result = Tcl_GetIndexFromObj(NULL, tmpObj, attrTable, NULL, TCL_EXACT,
@@ -3241,7 +3241,7 @@ Tcl_LoadFile(
Tcl_FSDeleteFile(copyToPtr);
Tcl_DecrRefCount(copyToPtr);
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"couldn't load from current filesystem", -1));
"couldn't load from current filesystem", TCL_NOSIZE));
return TCL_ERROR;
}
@@ -3560,7 +3560,7 @@ Tcl_FSUnloadFile(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot unload: filesystem does not support unloading",
-1));
TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -4278,7 +4278,7 @@ TclCrossFilesystemCopy(
* support vfs's which are slow (e.g. network sockets).
*/
if (TclCopyChannel(interp, in, out, -1, NULL) == TCL_OK) {
if (TclCopyChannel(interp, in, out, TCL_NOSIZE, NULL) == TCL_OK) {
result = TCL_OK;
}
@@ -4655,7 +4655,7 @@ Tcl_FSFileSystemInfo(
resPtr = Tcl_NewListObj(0, NULL);
Tcl_ListObjAppendElement(NULL, resPtr,
Tcl_NewStringObj(fsPtr->typeName, -1));
Tcl_NewStringObj(fsPtr->typeName, TCL_NOSIZE));
if (fsPtr->filesystemPathTypeProc != NULL) {
Tcl_Obj *typePtr = fsPtr->filesystemPathTypeProc(pathPtr);
+8 -8
View File
@@ -421,7 +421,7 @@ SetIndexFromAny(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't convert value to index except via Tcl_GetIndexFromObj API",
-1));
TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -602,7 +602,7 @@ PrefixMatchObjCmd(
case PRFMATCH_MESSAGE:
if (i > objc-4) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing value for -message", -1));
"missing value for -message", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NOARG", NULL);
return TCL_ERROR;
}
@@ -612,7 +612,7 @@ PrefixMatchObjCmd(
case PRFMATCH_ERROR:
if (i > objc-4) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing value for -error", -1));
"missing value for -error", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NOARG", NULL);
return TCL_ERROR;
}
@@ -624,7 +624,7 @@ PrefixMatchObjCmd(
if ((errorLength % 2) != 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"error options must have an even number of elements",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DICTIONARY", NULL);
return TCL_ERROR;
}
@@ -908,9 +908,9 @@ Tcl_WrongNumArgs(
if (iPtr->flags & INTERP_ALTERNATE_WRONG_ARGS) {
iPtr->flags &= ~INTERP_ALTERNATE_WRONG_ARGS;
Tcl_AppendObjToObj(objPtr, Tcl_GetObjResult(interp));
Tcl_AppendToObj(objPtr, " or \"", -1);
Tcl_AppendToObj(objPtr, " or \"", TCL_NOSIZE);
} else {
Tcl_AppendToObj(objPtr, "wrong # args: should be \"", -1);
Tcl_AppendToObj(objPtr, "wrong # args: should be \"", TCL_NOSIZE);
}
/*
@@ -1388,7 +1388,7 @@ PrintUsage(
* Now add the option information, with pretty-printing.
*/
msg = Tcl_NewStringObj("Command-specific options:", -1);
msg = Tcl_NewStringObj("Command-specific options:", TCL_NOSIZE);
for (infoPtr = argTable; infoPtr->type != TCL_ARGV_END; infoPtr++) {
if ((infoPtr->type == TCL_ARGV_HELP) && (infoPtr->keyStr == NULL)) {
Tcl_AppendPrintfToObj(msg, "\n%s", infoPtr->helpStr);
@@ -1404,7 +1404,7 @@ PrintUsage(
}
numSpaces -= NUM_SPACES;
}
Tcl_AppendToObj(msg, infoPtr->helpStr, -1);
Tcl_AppendToObj(msg, infoPtr->helpStr, TCL_NOSIZE);
switch (infoPtr->type) {
case TCL_ARGV_INT:
Tcl_AppendPrintfToObj(msg, "\n\t\tDefault value: %d",
+6 -6
View File
@@ -51,11 +51,10 @@ declare 6 {
declare 7 {
int TclCopyAndCollapse(int count, const char *src, char *dst)
}
# Removed in Tcl 9
#declare 8 {
# int TclCopyChannelOld(Tcl_Interp *interp, Tcl_Channel inChan,
# Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr)
#}
declare 8 {
int TclCopyChannel(Tcl_Interp *interp, Tcl_Channel inChan,
Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr)
}
# TclCreatePipeline unofficially exported for use by BLT.
@@ -995,8 +994,9 @@ declare 247 {
void TclResetRewriteEnsemble(Tcl_Interp *interp, int isRootEnsemble)
}
# Kept on Tcl9, for binary compatibility with Tcl8
declare 248 {
int TclCopyChannel(Tcl_Interp *interp, Tcl_Channel inChan,
int TclCopyChannelOld(Tcl_Interp *interp, Tcl_Channel inChan,
Tcl_Channel outChan, Tcl_WideInt toRead, Tcl_Obj *cmdPtr)
}
+11 -7
View File
@@ -69,7 +69,10 @@ EXTERN void TclCleanupCommand(Command *cmdPtr);
/* 7 */
EXTERN int TclCopyAndCollapse(int count, const char *src,
char *dst);
/* Slot 8 is reserved */
/* 8 */
EXTERN int TclCopyChannel(Tcl_Interp *interp,
Tcl_Channel inChan, Tcl_Channel outChan,
int toRead, Tcl_Obj *cmdPtr);
/* 9 */
EXTERN int TclCreatePipeline(Tcl_Interp *interp, int argc,
const char **argv, Tcl_Pid **pidArrayPtr,
@@ -585,7 +588,7 @@ EXTERN int TclInitRewriteEnsemble(Tcl_Interp *interp,
EXTERN void TclResetRewriteEnsemble(Tcl_Interp *interp,
int isRootEnsemble);
/* 248 */
EXTERN int TclCopyChannel(Tcl_Interp *interp,
EXTERN int TclCopyChannelOld(Tcl_Interp *interp,
Tcl_Channel inChan, Tcl_Channel outChan,
Tcl_WideInt toRead, Tcl_Obj *cmdPtr);
/* 249 */
@@ -607,7 +610,7 @@ typedef struct TclIntStubs {
int (*tclCleanupChildren) (Tcl_Interp *interp, int numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan); /* 5 */
void (*tclCleanupCommand) (Command *cmdPtr); /* 6 */
int (*tclCopyAndCollapse) (int count, const char *src, char *dst); /* 7 */
void (*reserved8)(void);
int (*tclCopyChannel) (Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr); /* 8 */
int (*tclCreatePipeline) (Tcl_Interp *interp, int argc, const char **argv, Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr, TclFile *errFilePtr); /* 9 */
int (*tclCreateProc) (Tcl_Interp *interp, Namespace *nsPtr, const char *procName, Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Proc **procPtrPtr); /* 10 */
void (*tclDeleteCompiledLocalVars) (Interp *iPtr, CallFrame *framePtr); /* 11 */
@@ -847,7 +850,7 @@ typedef struct TclIntStubs {
Tcl_HashTable * (*tclGetNamespaceCommandTable) (Tcl_Namespace *nsPtr); /* 245 */
int (*tclInitRewriteEnsemble) (Tcl_Interp *interp, int numRemoved, int numInserted, Tcl_Obj *const *objv); /* 246 */
void (*tclResetRewriteEnsemble) (Tcl_Interp *interp, int isRootEnsemble); /* 247 */
int (*tclCopyChannel) (Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, Tcl_WideInt toRead, Tcl_Obj *cmdPtr); /* 248 */
int (*tclCopyChannelOld) (Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, Tcl_WideInt toRead, Tcl_Obj *cmdPtr); /* 248 */
char * (*tclDoubleDigits) (double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr); /* 249 */
void (*tclSetSlaveCancelFlags) (Tcl_Interp *interp, int flags, int force); /* 250 */
} TclIntStubs;
@@ -878,7 +881,8 @@ extern const TclIntStubs *tclIntStubsPtr;
(tclIntStubsPtr->tclCleanupCommand) /* 6 */
#define TclCopyAndCollapse \
(tclIntStubsPtr->tclCopyAndCollapse) /* 7 */
/* Slot 8 is reserved */
#define TclCopyChannel \
(tclIntStubsPtr->tclCopyChannel) /* 8 */
#define TclCreatePipeline \
(tclIntStubsPtr->tclCreatePipeline) /* 9 */
#define TclCreateProc \
@@ -1265,8 +1269,8 @@ extern const TclIntStubs *tclIntStubsPtr;
(tclIntStubsPtr->tclInitRewriteEnsemble) /* 246 */
#define TclResetRewriteEnsemble \
(tclIntStubsPtr->tclResetRewriteEnsemble) /* 247 */
#define TclCopyChannel \
(tclIntStubsPtr->tclCopyChannel) /* 248 */
#define TclCopyChannelOld \
(tclIntStubsPtr->tclCopyChannelOld) /* 248 */
#define TclDoubleDigits \
(tclIntStubsPtr->tclDoubleDigits) /* 249 */
#define TclSetSlaveCancelFlags \
+44 -44
View File
@@ -768,7 +768,7 @@ Tcl_InterpObjCmd(
break;
}
}
slavePtr = Tcl_NewStringObj(buf, -1);
slavePtr = Tcl_NewStringObj(buf, TCL_NOSIZE);
}
if (SlaveCreate(interp, slavePtr, safe) == NULL) {
if (buf[0] != '\0') {
@@ -803,7 +803,7 @@ Tcl_InterpObjCmd(
return TCL_ERROR;
} else if (slaveInterp == interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot delete the current interpreter", -1));
"cannot delete the current interpreter", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"DELETESELF", NULL);
return TCL_ERROR;
@@ -981,7 +981,7 @@ Tcl_InterpObjCmd(
for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&hashSearch)) {
string = Tcl_GetHashKey(&iiPtr->master.slaveTable, hPtr);
Tcl_ListObjAppendElement(NULL, resultPtr,
Tcl_NewStringObj(string, -1));
Tcl_NewStringObj(string, TCL_NOSIZE));
}
Tcl_SetObjResult(interp, resultPtr);
return TCL_OK;
@@ -1135,14 +1135,14 @@ Tcl_CreateAlias(
objv = TclStackAlloc(slaveInterp, (unsigned) sizeof(Tcl_Obj *) * argc);
for (i = 0; i < argc; i++) {
objv[i] = Tcl_NewStringObj(argv[i], -1);
objv[i] = Tcl_NewStringObj(argv[i], TCL_NOSIZE);
Tcl_IncrRefCount(objv[i]);
}
slaveObjPtr = Tcl_NewStringObj(slaveCmd, -1);
slaveObjPtr = Tcl_NewStringObj(slaveCmd, TCL_NOSIZE);
Tcl_IncrRefCount(slaveObjPtr);
targetObjPtr = Tcl_NewStringObj(targetCmd, -1);
targetObjPtr = Tcl_NewStringObj(targetCmd, TCL_NOSIZE);
Tcl_IncrRefCount(targetObjPtr);
result = AliasCreate(slaveInterp, slaveInterp, targetInterp, slaveObjPtr,
@@ -1186,10 +1186,10 @@ Tcl_CreateAliasObj(
Tcl_Obj *slaveObjPtr, *targetObjPtr;
int result;
slaveObjPtr = Tcl_NewStringObj(slaveCmd, -1);
slaveObjPtr = Tcl_NewStringObj(slaveCmd, TCL_NOSIZE);
Tcl_IncrRefCount(slaveObjPtr);
targetObjPtr = Tcl_NewStringObj(targetCmd, -1);
targetObjPtr = Tcl_NewStringObj(targetCmd, TCL_NOSIZE);
Tcl_IncrRefCount(targetObjPtr);
result = AliasCreate(slaveInterp, slaveInterp, targetInterp, slaveObjPtr,
@@ -1991,7 +1991,7 @@ Tcl_CreateSlave(
Tcl_Obj *pathPtr;
Tcl_Interp *slaveInterp;
pathPtr = Tcl_NewStringObj(slavePath, -1);
pathPtr = Tcl_NewStringObj(slavePath, TCL_NOSIZE);
slaveInterp = SlaveCreate(interp, pathPtr, isSafe);
Tcl_DecrRefCount(pathPtr);
@@ -2022,7 +2022,7 @@ Tcl_GetSlave(
Tcl_Obj *pathPtr;
Tcl_Interp *slaveInterp;
pathPtr = Tcl_NewStringObj(slavePath, -1);
pathPtr = Tcl_NewStringObj(slavePath, TCL_NOSIZE);
slaveInterp = GetInterp(interp, pathPtr);
Tcl_DecrRefCount(pathPtr);
@@ -2168,7 +2168,7 @@ Tcl_GetInterpPath(
}
Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(askingInterp),
Tcl_NewStringObj(Tcl_GetHashKey(&iiPtr->master.slaveTable,
iiPtr->slave.slaveEntryPtr), -1));
iiPtr->slave.slaveEntryPtr), TCL_NOSIZE));
return TCL_OK;
}
@@ -2261,7 +2261,7 @@ SlaveBgerror(
if (TCL_ERROR == TclListObjLength(NULL, objv[0], &length)
|| (length < 1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cmdPrefix must be list of length >= 1", -1));
"cmdPrefix must be list of length >= 1", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"BGERRORFORMAT", NULL);
return TCL_ERROR;
@@ -2696,7 +2696,7 @@ SlaveDebugCmd(
if (objc == 0) {
resultPtr = Tcl_NewObj();
Tcl_ListObjAppendElement(NULL, resultPtr,
Tcl_NewStringObj("-frame", -1));
Tcl_NewStringObj("-frame", TCL_NOSIZE));
Tcl_ListObjAppendElement(NULL, resultPtr,
Tcl_NewBooleanObj(iPtr->flags & INTERP_DEBUG_FRAME));
Tcl_SetObjResult(interp, resultPtr);
@@ -2821,7 +2821,7 @@ SlaveExpose(
if (Tcl_IsSafe(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"permission denied: safe interpreter cannot expose commands",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
NULL);
return TCL_ERROR;
@@ -2866,7 +2866,7 @@ SlaveRecursionLimit(
if (objc) {
if (Tcl_IsSafe(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("permission denied: "
"safe interpreters cannot change recursion limit", -1));
"safe interpreters cannot change recursion limit", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
NULL);
return TCL_ERROR;
@@ -2876,7 +2876,7 @@ SlaveRecursionLimit(
}
if (limit <= 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"recursion limit must be > 0", -1));
"recursion limit must be > 0", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "BADLIMIT",
NULL);
return TCL_ERROR;
@@ -2885,7 +2885,7 @@ SlaveRecursionLimit(
iPtr = (Interp *) slaveInterp;
if (interp == slaveInterp && iPtr->numLevels > limit) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"falling back due to new recursion limit", -1));
"falling back due to new recursion limit", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "RECURSION", NULL);
return TCL_ERROR;
}
@@ -2927,7 +2927,7 @@ SlaveHide(
if (Tcl_IsSafe(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"permission denied: safe interpreter cannot hide commands",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
NULL);
return TCL_ERROR;
@@ -2974,7 +2974,7 @@ SlaveHidden(
hPtr != NULL;
hPtr = Tcl_NextHashEntry(&hSearch)) {
Tcl_ListObjAppendElement(NULL, listObjPtr,
Tcl_NewStringObj(Tcl_GetHashKey(hTblPtr, hPtr), -1));
Tcl_NewStringObj(Tcl_GetHashKey(hTblPtr, hPtr), TCL_NOSIZE));
}
}
Tcl_SetObjResult(interp, listObjPtr);
@@ -3011,7 +3011,7 @@ SlaveInvokeHidden(
if (Tcl_IsSafe(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"not allowed to invoke hidden commands from safe interpreter",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
NULL);
return TCL_ERROR;
@@ -3067,7 +3067,7 @@ SlaveMarkTrusted(
if (Tcl_IsSafe(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"permission denied: safe interpreter cannot mark trusted",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
NULL);
return TCL_ERROR;
@@ -3326,7 +3326,7 @@ Tcl_LimitCheck(
iPtr->limit.exceeded &= ~TCL_LIMIT_COMMANDS;
} else if (iPtr->limit.exceeded & TCL_LIMIT_COMMANDS) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command count limit exceeded", -1));
"command count limit exceeded", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LIMIT", "COMMANDS", NULL);
Tcl_Release(interp);
return TCL_ERROR;
@@ -3352,7 +3352,7 @@ Tcl_LimitCheck(
iPtr->limit.exceeded &= ~TCL_LIMIT_TIME;
} else if (iPtr->limit.exceeded & TCL_LIMIT_TIME) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"time limit exceeded", -1));
"time limit exceeded", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LIMIT", "TIME", NULL);
Tcl_Release(interp);
return TCL_ERROR;
@@ -4359,7 +4359,7 @@ SlaveCommandLimitCmd(
if (interp == slaveInterp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"limits on current interpreter inaccessible", -1));
"limits on current interpreter inaccessible", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "SELF", NULL);
return TCL_ERROR;
}
@@ -4374,7 +4374,7 @@ SlaveCommandLimitCmd(
if (hPtr != NULL) {
limitCBPtr = Tcl_GetHashValue(hPtr);
if (limitCBPtr != NULL && limitCBPtr->scriptObj != NULL) {
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], -1),
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], TCL_NOSIZE),
limitCBPtr->scriptObj);
} else {
goto putEmptyCommandInDict;
@@ -4385,21 +4385,21 @@ SlaveCommandLimitCmd(
putEmptyCommandInDict:
TclNewObj(empty);
Tcl_DictObjPut(NULL, dictPtr,
Tcl_NewStringObj(options[0], -1), empty);
Tcl_NewStringObj(options[0], TCL_NOSIZE), empty);
}
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[1], -1),
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[1], TCL_NOSIZE),
Tcl_NewIntObj(Tcl_LimitGetGranularity(slaveInterp,
TCL_LIMIT_COMMANDS)));
if (Tcl_LimitTypeEnabled(slaveInterp, TCL_LIMIT_COMMANDS)) {
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[2], -1),
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[2], TCL_NOSIZE),
Tcl_NewIntObj(Tcl_LimitGetCommands(slaveInterp)));
} else {
Tcl_Obj *empty;
TclNewObj(empty);
Tcl_DictObjPut(NULL, dictPtr,
Tcl_NewStringObj(options[2], -1), empty);
Tcl_NewStringObj(options[2], TCL_NOSIZE), empty);
}
Tcl_SetObjResult(interp, dictPtr);
return TCL_OK;
@@ -4457,7 +4457,7 @@ SlaveCommandLimitCmd(
}
if (gran < 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"granularity must be at least 1", -1));
"granularity must be at least 1", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"BADVALUE", NULL);
return TCL_ERROR;
@@ -4474,7 +4474,7 @@ SlaveCommandLimitCmd(
}
if (limit < 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"command limit value must be at least 0", -1));
"command limit value must be at least 0", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"BADVALUE", NULL);
return TCL_ERROR;
@@ -4547,7 +4547,7 @@ SlaveTimeLimitCmd(
if (interp == slaveInterp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"limits on current interpreter inaccessible", -1));
"limits on current interpreter inaccessible", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "SELF", NULL);
return TCL_ERROR;
}
@@ -4562,7 +4562,7 @@ SlaveTimeLimitCmd(
if (hPtr != NULL) {
limitCBPtr = Tcl_GetHashValue(hPtr);
if (limitCBPtr != NULL && limitCBPtr->scriptObj != NULL) {
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], -1),
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], TCL_NOSIZE),
limitCBPtr->scriptObj);
} else {
goto putEmptyCommandInDict;
@@ -4572,9 +4572,9 @@ SlaveTimeLimitCmd(
putEmptyCommandInDict:
TclNewObj(empty);
Tcl_DictObjPut(NULL, dictPtr,
Tcl_NewStringObj(options[0], -1), empty);
Tcl_NewStringObj(options[0], TCL_NOSIZE), empty);
}
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[1], -1),
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[1], TCL_NOSIZE),
Tcl_NewIntObj(Tcl_LimitGetGranularity(slaveInterp,
TCL_LIMIT_TIME)));
@@ -4582,18 +4582,18 @@ SlaveTimeLimitCmd(
Tcl_Time limitMoment;
Tcl_LimitGetTime(slaveInterp, &limitMoment);
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[2], -1),
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[2], TCL_NOSIZE),
Tcl_NewLongObj(limitMoment.usec/1000));
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[3], -1),
Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[3], TCL_NOSIZE),
Tcl_NewLongObj(limitMoment.sec));
} else {
Tcl_Obj *empty;
TclNewObj(empty);
Tcl_DictObjPut(NULL, dictPtr,
Tcl_NewStringObj(options[2], -1), empty);
Tcl_NewStringObj(options[2], TCL_NOSIZE), empty);
Tcl_DictObjPut(NULL, dictPtr,
Tcl_NewStringObj(options[3], -1), empty);
Tcl_NewStringObj(options[3], TCL_NOSIZE), empty);
}
Tcl_SetObjResult(interp, dictPtr);
return TCL_OK;
@@ -4666,7 +4666,7 @@ SlaveTimeLimitCmd(
}
if (gran < 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"granularity must be at least 1", -1));
"granularity must be at least 1", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"BADVALUE", NULL);
return TCL_ERROR;
@@ -4683,7 +4683,7 @@ SlaveTimeLimitCmd(
}
if (tmp < 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"milliseconds must be at least 0", -1));
"milliseconds must be at least 0", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"BADVALUE", NULL);
return TCL_ERROR;
@@ -4701,7 +4701,7 @@ SlaveTimeLimitCmd(
}
if (tmp < 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"seconds must be at least 0", -1));
"seconds must be at least 0", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"BADVALUE", NULL);
return TCL_ERROR;
@@ -4720,7 +4720,7 @@ SlaveTimeLimitCmd(
if (secObj != NULL && secLen == 0 && milliLen > 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may only set -milliseconds if -seconds is not "
"also being reset", -1));
"also being reset", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"BADUSAGE", NULL);
return TCL_ERROR;
@@ -4728,7 +4728,7 @@ SlaveTimeLimitCmd(
if (milliLen == 0 && (secObj == NULL || secLen > 0)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may only reset -milliseconds if -seconds is "
"also being reset", -1));
"also being reset", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
"BADUSAGE", NULL);
return TCL_ERROR;
+2 -2
View File
@@ -122,7 +122,7 @@ Tcl_LinkVar(
linkPtr = ckalloc(sizeof(Link));
linkPtr->interp = interp;
linkPtr->varName = Tcl_NewStringObj(varName, -1);
linkPtr->varName = Tcl_NewStringObj(varName, TCL_NOSIZE);
Tcl_IncrRefCount(linkPtr->varName);
linkPtr->addr = addr;
linkPtr->type = type & ~TCL_LINK_READ_ONLY;
@@ -613,7 +613,7 @@ ObjValue(
TclNewLiteralStringObj(resultObj, "NULL");
return resultObj;
}
return Tcl_NewStringObj(p, -1);
return Tcl_NewStringObj(p, TCL_NOSIZE);
/*
* This code only gets executed if the link type is unknown (shouldn't
+3 -3
View File
@@ -1434,7 +1434,7 @@ TclLsetFlat(
/* ...the index points outside the sublist. */
if (interp != NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("list index out of range", -1));
Tcl_NewStringObj("list index out of range", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSET",
"BADINDEX", NULL);
}
@@ -1612,7 +1612,7 @@ TclListObjSetElement(
if (listPtr->bytes == tclEmptyStringRep) {
if (interp != NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("list index out of range", -1));
Tcl_NewStringObj("list index out of range", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSET",
"BADINDEX", NULL);
}
@@ -1634,7 +1634,7 @@ TclListObjSetElement(
if (index<0 || index>=elemCount) {
if (interp != NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("list index out of range", -1));
Tcl_NewStringObj("list index out of range", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSET", "BADINDEX",
NULL);
}
+11 -11
View File
@@ -183,7 +183,7 @@ Tcl_LoadObjCmd(
}
if ((fullFileName[0] == 0) && (packageName == NULL)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must specify either file name or package name", -1));
"must specify either file name or package name", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LOAD", "NOLIBRARY",
NULL);
code = TCL_ERROR;
@@ -223,9 +223,9 @@ Tcl_LoadObjCmd(
namesMatch = 0;
} else {
TclDStringClear(&pkgName);
Tcl_DStringAppend(&pkgName, packageName, -1);
Tcl_DStringAppend(&pkgName, packageName, TCL_NOSIZE);
TclDStringClear(&tmp);
Tcl_DStringAppend(&tmp, pkgPtr->packageName, -1);
Tcl_DStringAppend(&tmp, pkgPtr->packageName, TCL_NOSIZE);
Tcl_UtfToLower(Tcl_DStringValue(&pkgName));
Tcl_UtfToLower(Tcl_DStringValue(&tmp));
if (strcmp(Tcl_DStringValue(&tmp),
@@ -300,7 +300,7 @@ Tcl_LoadObjCmd(
*/
if (packageName != NULL) {
Tcl_DStringAppend(&pkgName, packageName, -1);
Tcl_DStringAppend(&pkgName, packageName, TCL_NOSIZE);
} else {
int retc;
@@ -612,7 +612,7 @@ Tcl_UnloadObjCmd(
}
if ((fullFileName[0] == 0) && (packageName == NULL)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"must specify either file name or package name", -1));
"must specify either file name or package name", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "UNLOAD", "NOLIBRARY",
NULL);
code = TCL_ERROR;
@@ -653,9 +653,9 @@ Tcl_UnloadObjCmd(
namesMatch = 0;
} else {
TclDStringClear(&pkgName);
Tcl_DStringAppend(&pkgName, packageName, -1);
Tcl_DStringAppend(&pkgName, packageName, TCL_NOSIZE);
TclDStringClear(&tmp);
Tcl_DStringAppend(&tmp, pkgPtr->packageName, -1);
Tcl_DStringAppend(&tmp, pkgPtr->packageName, TCL_NOSIZE);
Tcl_UtfToLower(Tcl_DStringValue(&pkgName));
Tcl_UtfToLower(Tcl_DStringValue(&tmp));
if (strcmp(Tcl_DStringValue(&tmp),
@@ -1059,8 +1059,8 @@ TclGetLoadedPackages(
Tcl_MutexLock(&packageMutex);
for (pkgPtr = firstPackagePtr; pkgPtr != NULL;
pkgPtr = pkgPtr->nextPtr) {
pkgDesc[0] = Tcl_NewStringObj(pkgPtr->fileName, -1);
pkgDesc[1] = Tcl_NewStringObj(pkgPtr->packageName, -1);
pkgDesc[0] = Tcl_NewStringObj(pkgPtr->fileName, TCL_NOSIZE);
pkgDesc[1] = Tcl_NewStringObj(pkgPtr->packageName, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewListObj(2, pkgDesc));
}
@@ -1082,8 +1082,8 @@ TclGetLoadedPackages(
resultObj = Tcl_NewObj();
for (; ipPtr != NULL; ipPtr = ipPtr->nextPtr) {
pkgPtr = ipPtr->pkgPtr;
pkgDesc[0] = Tcl_NewStringObj(pkgPtr->fileName, -1);
pkgDesc[1] = Tcl_NewStringObj(pkgPtr->packageName, -1);
pkgDesc[0] = Tcl_NewStringObj(pkgPtr->fileName, TCL_NOSIZE);
pkgDesc[1] = Tcl_NewStringObj(pkgPtr->packageName, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewListObj(2, pkgDesc));
}
Tcl_SetObjResult(interp, resultObj);
+1 -1
View File
@@ -47,7 +47,7 @@ TclpDlopen(
{
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"dynamic loading is not currently available on this system",
-1));
TCL_NOSIZE));
return TCL_ERROR;
}
+7 -7
View File
@@ -159,7 +159,7 @@ Tcl_SetStartupScript(
Tcl_Obj *newEncoding = NULL;
if (encoding != NULL) {
newEncoding = Tcl_NewStringObj(encoding, -1);
newEncoding = Tcl_NewStringObj(encoding, TCL_NOSIZE);
}
if (tsdPtr->path != NULL) {
@@ -335,14 +335,14 @@ Tcl_MainEx(
if ((argc > 3) && (0 == _tcscmp(TEXT("-encoding"), argv[1]))
&& ('-' != argv[3][0])) {
Tcl_Obj *value = NewNativeObj(argv[2], -1);
Tcl_SetStartupScript(NewNativeObj(argv[3], -1),
Tcl_Obj *value = NewNativeObj(argv[2], TCL_NOSIZE);
Tcl_SetStartupScript(NewNativeObj(argv[3], TCL_NOSIZE),
Tcl_GetString(value));
Tcl_DecrRefCount(value);
argc -= 3;
argv += 3;
} else if ((argc > 1) && ('-' != argv[1][0])) {
Tcl_SetStartupScript(NewNativeObj(argv[1], -1), NULL);
Tcl_SetStartupScript(NewNativeObj(argv[1], TCL_NOSIZE), NULL);
argc--;
argv++;
}
@@ -350,7 +350,7 @@ Tcl_MainEx(
path = Tcl_GetStartupScript(&encodingName);
if (path == NULL) {
appName = NewNativeObj(argv[0], -1);
appName = NewNativeObj(argv[0], TCL_NOSIZE);
} else {
appName = path;
}
@@ -362,7 +362,7 @@ Tcl_MainEx(
argvPtr = Tcl_NewListObj(0, NULL);
while (argc--) {
Tcl_ListObjAppendElement(NULL, argvPtr, NewNativeObj(*argv++, -1));
Tcl_ListObjAppendElement(NULL, argvPtr, NewNativeObj(*argv++, TCL_NOSIZE));
}
Tcl_SetVar2Ex(interp, "argv", NULL, argvPtr, TCL_GLOBAL_ONLY);
@@ -383,7 +383,7 @@ Tcl_MainEx(
chan = Tcl_GetStdChannel(TCL_STDERR);
if (chan) {
Tcl_WriteChars(chan,
"application-specific initialization failed: ", -1);
"application-specific initialization failed: ", TCL_NOSIZE);
Tcl_WriteObj(chan, Tcl_GetObjResult(interp));
Tcl_WriteChars(chan, "\n", 1);
}
+17 -17
View File
@@ -688,7 +688,7 @@ Tcl_CreateNamespace(
simpleName = "";
} else if (*name == '\0') {
Tcl_SetObjResult(interp, Tcl_NewStringObj("can't create namespace"
" \"\": only global namespace can have empty name", -1));
" \"\": only global namespace can have empty name", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NAMESPACE",
"CREATEGLOBAL", NULL);
return NULL;
@@ -803,7 +803,7 @@ Tcl_CreateNamespace(
register Tcl_DString *tempPtr = namePtr;
TclDStringAppendLiteral(buffPtr, "::");
Tcl_DStringAppend(buffPtr, ancestorPtr->name, -1);
Tcl_DStringAppend(buffPtr, ancestorPtr->name, TCL_NOSIZE);
TclDStringAppendDString(buffPtr, namePtr);
/*
@@ -1442,7 +1442,7 @@ Tcl_AppendExportList(
for (i = 0; i < nsPtr->numExportPatterns; i++) {
result = Tcl_ListObjAppendElement(interp, objPtr,
Tcl_NewStringObj(nsPtr->exportArrayPtr[i], -1));
Tcl_NewStringObj(nsPtr->exportArrayPtr[i], TCL_NOSIZE));
if (result != TCL_OK) {
return result;
}
@@ -1521,7 +1521,7 @@ Tcl_Import(
int result;
TclNewLiteralStringObj(objv[0], "auto_import");
objv[1] = Tcl_NewStringObj(pattern, -1);
objv[1] = Tcl_NewStringObj(pattern, TCL_NOSIZE);
Tcl_IncrRefCount(objv[0]);
Tcl_IncrRefCount(objv[1]);
@@ -1541,7 +1541,7 @@ Tcl_Import(
*/
if (strlen(pattern) == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("empty import pattern",-1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("empty import pattern", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "IMPORT", "EMPTY", NULL);
return TCL_ERROR;
}
@@ -1663,11 +1663,11 @@ DoImport(
ImportRef *refPtr;
Tcl_DStringInit(&ds);
Tcl_DStringAppend(&ds, nsPtr->fullName, -1);
Tcl_DStringAppend(&ds, nsPtr->fullName, TCL_NOSIZE);
if (nsPtr != ((Interp *) interp)->globalNsPtr) {
TclDStringAppendLiteral(&ds, "::");
}
Tcl_DStringAppend(&ds, cmdName, -1);
Tcl_DStringAppend(&ds, cmdName, TCL_NOSIZE);
/*
* Check whether creating the new imported command in the current
@@ -2913,11 +2913,11 @@ NamespaceChildrenCmd(
if ((*name == ':') && (*(name+1) == ':')) {
pattern = name;
} else {
Tcl_DStringAppend(&buffer, nsPtr->fullName, -1);
Tcl_DStringAppend(&buffer, nsPtr->fullName, TCL_NOSIZE);
if (nsPtr != globalNsPtr) {
TclDStringAppendLiteral(&buffer, "::");
}
Tcl_DStringAppend(&buffer, name, -1);
Tcl_DStringAppend(&buffer, name, TCL_NOSIZE);
pattern = Tcl_DStringValue(&buffer);
}
}
@@ -2943,7 +2943,7 @@ NamespaceChildrenCmd(
#endif
) {
Tcl_ListObjAppendElement(interp, listPtr,
Tcl_NewStringObj(pattern, -1));
Tcl_NewStringObj(pattern, TCL_NOSIZE));
}
goto searchDone;
}
@@ -2959,7 +2959,7 @@ NamespaceChildrenCmd(
childNsPtr = Tcl_GetHashValue(entryPtr);
if ((pattern == NULL)
|| Tcl_StringMatch(childNsPtr->fullName, pattern)) {
elemPtr = Tcl_NewStringObj(childNsPtr->fullName, -1);
elemPtr = Tcl_NewStringObj(childNsPtr->fullName, TCL_NOSIZE);
Tcl_ListObjAppendElement(interp, listPtr, elemPtr);
}
entryPtr = Tcl_NextHashEntry(&search);
@@ -3049,7 +3049,7 @@ NamespaceCodeCmd(
if (currNsPtr == (Namespace *) TclGetGlobalNamespace(interp)) {
TclNewLiteralStringObj(objPtr, "::");
} else {
objPtr = Tcl_NewStringObj(currNsPtr->fullName, -1);
objPtr = Tcl_NewStringObj(currNsPtr->fullName, TCL_NOSIZE);
}
Tcl_ListObjAppendElement(interp, listPtr, objPtr);
@@ -3107,7 +3107,7 @@ NamespaceCurrentCmd(
if (currNsPtr == (Namespace *) TclGetGlobalNamespace(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("::", 2));
} else {
Tcl_SetObjResult(interp, Tcl_NewStringObj(currNsPtr->fullName, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(currNsPtr->fullName, TCL_NOSIZE));
}
return TCL_OK;
}
@@ -3640,7 +3640,7 @@ NamespaceImportCmd(
if (cmdPtr->deleteProc == DeleteImportedCmd) {
Tcl_ListObjAppendElement(NULL, listPtr, Tcl_NewStringObj(
Tcl_GetHashKey(&nsPtr->cmdTable, hPtr) ,-1));
Tcl_GetHashKey(&nsPtr->cmdTable, hPtr), TCL_NOSIZE));
}
}
Tcl_SetObjResult(interp, listPtr);
@@ -3904,7 +3904,7 @@ NamespaceParentCmd(
if (nsPtr->parentPtr != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
nsPtr->parentPtr->fullName, -1));
nsPtr->parentPtr->fullName, TCL_NOSIZE));
}
return TCL_OK;
}
@@ -3963,7 +3963,7 @@ NamespacePathCmd(
for (i=0 ; i<nsPtr->commandPathLength ; i++) {
if (nsPtr->commandPathArray[i].nsPtr != NULL) {
Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
nsPtr->commandPathArray[i].nsPtr->fullName, -1));
nsPtr->commandPathArray[i].nsPtr->fullName, TCL_NOSIZE));
}
}
Tcl_SetObjResult(interp, resultObj);
@@ -4447,7 +4447,7 @@ NamespaceTailCmd(
}
if (p >= name) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(p, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(p, TCL_NOSIZE));
}
return TCL_OK;
}
+9 -9
View File
@@ -359,14 +359,14 @@ InitFoundation(
Tcl_DStringInit(&buffer);
for (i=0 ; defineCmds[i].name ; i++) {
TclDStringAppendLiteral(&buffer, "::oo::define::");
Tcl_DStringAppend(&buffer, defineCmds[i].name, -1);
Tcl_DStringAppend(&buffer, defineCmds[i].name, TCL_NOSIZE);
Tcl_CreateObjCommand(interp, Tcl_DStringValue(&buffer),
defineCmds[i].objProc, INT2PTR(defineCmds[i].flag), NULL);
Tcl_DStringFree(&buffer);
}
for (i=0 ; objdefCmds[i].name ; i++) {
TclDStringAppendLiteral(&buffer, "::oo::objdefine::");
Tcl_DStringAppend(&buffer, objdefCmds[i].name, -1);
Tcl_DStringAppend(&buffer, objdefCmds[i].name, TCL_NOSIZE);
Tcl_CreateObjCommand(interp, Tcl_DStringValue(&buffer),
objdefCmds[i].objProc, INT2PTR(objdefCmds[i].flag), NULL);
Tcl_DStringFree(&buffer);
@@ -415,7 +415,7 @@ InitFoundation(
TclNewLiteralStringObj(argsPtr, "originObject");
Tcl_IncrRefCount(argsPtr);
bodyPtr = Tcl_NewStringObj(clonedBody, -1);
bodyPtr = Tcl_NewStringObj(clonedBody, TCL_NOSIZE);
TclOONewProcMethod(interp, fPtr->objectCls, 0, fPtr->clonedName, argsPtr,
bodyPtr, NULL);
TclDecrRefCount(argsPtr);
@@ -659,9 +659,9 @@ AllocObject(
Tcl_DStringInit(&buffer);
Tcl_DStringAppend(&buffer,
Tcl_GetCurrentNamespace(interp)->fullName, -1);
Tcl_GetCurrentNamespace(interp)->fullName, TCL_NOSIZE);
TclDStringAppendLiteral(&buffer, "::");
Tcl_DStringAppend(&buffer, nameStr, -1);
Tcl_DStringAppend(&buffer, nameStr, TCL_NOSIZE);
oPtr->command = Tcl_CreateObjCommand(interp,
Tcl_DStringValue(&buffer), PublicObjectCmd, oPtr, NULL);
Tcl_DStringFree(&buffer);
@@ -1653,7 +1653,7 @@ Tcl_NewObjectInstance(
if (result != TCL_ERROR && Deleted(oPtr)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"object deleted in constructor", -1));
"object deleted in constructor", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "STILLBORN", NULL);
result = TCL_ERROR;
}
@@ -1799,7 +1799,7 @@ FinalizeAlloc(
if (result != TCL_ERROR && Deleted(oPtr)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"object deleted in constructor", -1));
"object deleted in constructor", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "STILLBORN", NULL);
result = TCL_ERROR;
}
@@ -1857,7 +1857,7 @@ Tcl_CopyObjectInstance(
if (IsRootClass(oPtr)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may not clone the class of classes", -1));
"may not clone the class of classes", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "CLONING_CLASS", NULL);
return NULL;
}
@@ -2565,7 +2565,7 @@ TclOOObjectCmdCore(
}
if (contextPtr->index >= contextPtr->callPtr->numChain) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"no valid method implementation", -1));
"no valid method implementation", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
TclGetString(methodNamePtr), NULL);
TclOODeleteContext(contextPtr);
+20 -20
View File
@@ -187,7 +187,7 @@ TclOO_Class_Create(
objv[Tcl_ObjectContextSkippedArgs(context)], &len);
if (len == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"object name must not be empty", -1));
"object name must not be empty", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "EMPTY_NAME", NULL);
return TCL_ERROR;
}
@@ -252,7 +252,7 @@ TclOO_Class_CreateNs(
objv[Tcl_ObjectContextSkippedArgs(context)], &len);
if (len == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"object name must not be empty", -1));
"object name must not be empty", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "EMPTY_NAME", NULL);
return TCL_ERROR;
}
@@ -260,7 +260,7 @@ TclOO_Class_CreateNs(
objv[Tcl_ObjectContextSkippedArgs(context)+1], &len);
if (len == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"namespace name must not be empty", -1));
"namespace name must not be empty", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "EMPTY_NAME", NULL);
return TCL_ERROR;
}
@@ -551,14 +551,14 @@ TclOO_Object_Unknown(
TclGetString(objv[skip]));
for (i=0 ; i<numMethodNames-1 ; i++) {
if (i) {
Tcl_AppendToObj(errorMsg, ", ", -1);
Tcl_AppendToObj(errorMsg, ", ", TCL_NOSIZE);
}
Tcl_AppendToObj(errorMsg, methodNames[i], -1);
Tcl_AppendToObj(errorMsg, methodNames[i], TCL_NOSIZE);
}
if (i) {
Tcl_AppendToObj(errorMsg, " or ", -1);
Tcl_AppendToObj(errorMsg, " or ", TCL_NOSIZE);
}
Tcl_AppendToObj(errorMsg, methodNames[i], -1);
Tcl_AppendToObj(errorMsg, methodNames[i], TCL_NOSIZE);
ckfree(methodNames);
Tcl_SetObjResult(interp, errorMsg);
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
@@ -748,9 +748,9 @@ TclOO_Object_VarName(
&search);
while (hPtr != NULL) {
if (varPtr == Tcl_GetHashValue(hPtr)) {
Tcl_AppendToObj(varNamePtr, "(", -1);
Tcl_AppendToObj(varNamePtr, "(", TCL_NOSIZE);
Tcl_AppendObjToObj(varNamePtr, hPtr->key.objPtr);
Tcl_AppendToObj(varNamePtr, ")", -1);
Tcl_AppendToObj(varNamePtr, ")", TCL_NOSIZE);
break;
}
hPtr = Tcl_NextHashEntry(&search);
@@ -990,14 +990,14 @@ TclOOSelfObjCmd(
return TCL_OK;
case SELF_NS:
Tcl_SetObjResult(interp, Tcl_NewStringObj(
contextPtr->oPtr->namespacePtr->fullName,-1));
contextPtr->oPtr->namespacePtr->fullName, TCL_NOSIZE));
return TCL_OK;
case SELF_CLASS: {
Class *clsPtr = CurrentlyInvoked(contextPtr).mPtr->declaringClassPtr;
if (clsPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"method not defined by a class", -1));
"method not defined by a class", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "UNMATCHED_CONTEXT", NULL);
return TCL_ERROR;
}
@@ -1018,7 +1018,7 @@ TclOOSelfObjCmd(
case SELF_FILTER:
if (!CurrentlyInvoked(contextPtr).isFilter) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"not inside a filtering context", -1));
"not inside a filtering context", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "UNMATCHED_CONTEXT", NULL);
return TCL_ERROR;
} else {
@@ -1035,7 +1035,7 @@ TclOOSelfObjCmd(
}
result[0] = TclOOObjectName(interp, oPtr);
result[1] = Tcl_NewStringObj(type, -1);
result[1] = Tcl_NewStringObj(type, TCL_NOSIZE);
result[2] = miPtr->mPtr->namePtr;
Tcl_SetObjResult(interp, Tcl_NewListObj(3, result));
return TCL_OK;
@@ -1044,7 +1044,7 @@ TclOOSelfObjCmd(
if ((framePtr->callerVarPtr == NULL) ||
!(framePtr->callerVarPtr->isProcCallFrame & FRAME_IS_METHOD)){
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"caller is not an object", -1));
"caller is not an object", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "CONTEXT_REQUIRED", NULL);
return TCL_ERROR;
} else {
@@ -1062,7 +1062,7 @@ TclOOSelfObjCmd(
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"method without declarer!", -1));
"method without declarer!", TCL_NOSIZE));
return TCL_ERROR;
}
@@ -1094,7 +1094,7 @@ TclOOSelfObjCmd(
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"method without declarer!", -1));
"method without declarer!", TCL_NOSIZE));
return TCL_ERROR;
}
@@ -1112,7 +1112,7 @@ TclOOSelfObjCmd(
case SELF_TARGET:
if (!CurrentlyInvoked(contextPtr).isFilter) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"not inside a filtering context", -1));
"not inside a filtering context", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "UNMATCHED_CONTEXT", NULL);
return TCL_ERROR;
} else {
@@ -1139,7 +1139,7 @@ TclOOSelfObjCmd(
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"method without declarer!", -1));
"method without declarer!", TCL_NOSIZE));
return TCL_ERROR;
}
result[0] = TclOOObjectName(interp, declarerPtr);
@@ -1208,10 +1208,10 @@ TclOOCopyObjectCmd(
if (iPtr->varFramePtr != NULL) {
Tcl_DStringAppend(&buffer,
iPtr->varFramePtr->nsPtr->fullName, -1);
iPtr->varFramePtr->nsPtr->fullName, TCL_NOSIZE);
}
TclDStringAppendLiteral(&buffer, "::");
Tcl_DStringAppend(&buffer, name, -1);
Tcl_DStringAppend(&buffer, name, TCL_NOSIZE);
name = Tcl_DStringValue(&buffer);
}
o2Ptr = Tcl_CopyObjectInstance(interp, oPtr, name, NULL);
+4 -4
View File
@@ -1427,11 +1427,11 @@ TclOORenderCallChain(
* Allocate the literals (potentially) used in our description.
*/
filterLiteral = Tcl_NewStringObj("filter", -1);
filterLiteral = Tcl_NewStringObj("filter", TCL_NOSIZE);
Tcl_IncrRefCount(filterLiteral);
methodLiteral = Tcl_NewStringObj("method", -1);
methodLiteral = Tcl_NewStringObj("method", TCL_NOSIZE);
Tcl_IncrRefCount(methodLiteral);
objectLiteral = Tcl_NewStringObj("object", -1);
objectLiteral = Tcl_NewStringObj("object", TCL_NOSIZE);
Tcl_IncrRefCount(objectLiteral);
/*
@@ -1464,7 +1464,7 @@ TclOORenderCallChain(
? Tcl_GetObjectName(interp,
(Tcl_Object) miPtr->mPtr->declaringClassPtr->thisPtr)
: objectLiteral;
descObjs[3] = Tcl_NewStringObj(miPtr->mPtr->typePtr->name, -1);
descObjs[3] = Tcl_NewStringObj(miPtr->mPtr->typePtr->name, TCL_NOSIZE);
objv[i] = Tcl_NewListObj(4, descObjs);
}
+31 -31
View File
@@ -439,7 +439,7 @@ RenameDeleteMethod(
if (hPtr == newHPtr) {
renameToSelf:
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot rename method to itself", -1));
"cannot rename method to itself", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "RENAME_TO_SELF", NULL);
return TCL_ERROR;
} else if (!isNew) {
@@ -515,7 +515,7 @@ TclOOUnknownDefinition(
if (objc < 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad call of unknown handler", -1));
"bad call of unknown handler", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "BAD_UNKNOWN", NULL);
return TCL_ERROR;
}
@@ -548,7 +548,7 @@ TclOOUnknownDefinition(
Tcl_Obj **newObjv = TclStackAlloc(interp, sizeof(Tcl_Obj*)*(objc-1));
int result;
newObjv[0] = Tcl_NewStringObj(matchedStr, -1);
newObjv[0] = Tcl_NewStringObj(matchedStr, TCL_NOSIZE);
Tcl_IncrRefCount(newObjv[0]);
if (objc > 2) {
memcpy(newObjv+1, objv+2, sizeof(Tcl_Obj *) * (objc-2));
@@ -651,7 +651,7 @@ InitDefineContext(
if (namespacePtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot process definitions; support namespace deleted",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -691,7 +691,7 @@ TclOOGetDefineCmdContext(
|| (iPtr->varFramePtr->isProcCallFrame != FRAME_IS_OO_DEFINE)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"this command may only be called from within the context of"
" an ::oo::define or ::oo::objdefine command", -1));
" an ::oo::define or ::oo::objdefine command", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return NULL;
}
@@ -699,7 +699,7 @@ TclOOGetDefineCmdContext(
if (Tcl_ObjectDeleted(object)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"this command cannot be called when the object has been"
" deleted", -1));
" deleted", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return NULL;
}
@@ -740,7 +740,7 @@ GetClassInOuterContext(
return NULL;
}
if (oPtr->classPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "CLASS",
TclGetString(className), NULL);
return NULL;
@@ -1166,13 +1166,13 @@ TclOODefineClassObjCmd(
}
if (oPtr->flags & ROOT_OBJECT) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may not modify the class of the root object class", -1));
"may not modify the class of the root object class", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
if (oPtr->flags & ROOT_CLASS) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may not modify the class of the class of classes", -1));
"may not modify the class of the class of classes", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1323,7 +1323,7 @@ TclOODefineDeleteMethodObjCmd(
}
if (!isInstanceDeleteMethod && !oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1447,7 +1447,7 @@ TclOODefineExportObjCmd(
clsPtr = oPtr->classPtr;
if (!isInstanceExport && !clsPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1539,7 +1539,7 @@ TclOODefineForwardObjCmd(
}
if (!isInstanceForward && !oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1597,7 +1597,7 @@ TclOODefineMethodObjCmd(
}
if (!isInstanceMethod && !oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1649,7 +1649,7 @@ TclOODefineMixinObjCmd(
}
if (!isInstanceMixin && !oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1664,7 +1664,7 @@ TclOODefineMixinObjCmd(
}
if (!isInstanceMixin && TclOOIsReachable(oPtr->classPtr, clsPtr)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may not mix a class into itself", -1));
"may not mix a class into itself", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "SELF_MIXIN", NULL);
goto freeAndError;
}
@@ -1716,7 +1716,7 @@ TclOODefineRenameMethodObjCmd(
}
if (!isInstanceRenameMethod && !oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1777,7 +1777,7 @@ TclOODefineUnexportObjCmd(
clsPtr = oPtr->classPtr;
if (!isInstanceUnexport && !clsPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1904,8 +1904,8 @@ TclOODefineSlots(
Foundation *fPtr)
{
const struct DeclaredSlot *slotInfoPtr;
Tcl_Obj *getName = Tcl_NewStringObj("Get", -1);
Tcl_Obj *setName = Tcl_NewStringObj("Set", -1);
Tcl_Obj *getName = Tcl_NewStringObj("Get", TCL_NOSIZE);
Tcl_Obj *setName = Tcl_NewStringObj("Set", TCL_NOSIZE);
Class *slotCls;
slotCls = ((Object *) Tcl_NewObjectInstance(fPtr->interp, (Tcl_Class)
@@ -1963,7 +1963,7 @@ ClassFilterGet(
return TCL_ERROR;
} else if (!oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -1999,7 +1999,7 @@ ClassFilterSet(
return TCL_ERROR;
} else if (!oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
} else if (Tcl_ListObjGetElements(interp, objv[0], &filterc,
@@ -2043,7 +2043,7 @@ ClassMixinGet(
return TCL_ERROR;
} else if (!oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -2082,7 +2082,7 @@ ClassMixinSet(
return TCL_ERROR;
} else if (!oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
} else if (Tcl_ListObjGetElements(interp, objv[0], &mixinc,
@@ -2100,7 +2100,7 @@ ClassMixinSet(
}
if (TclOOIsReachable(oPtr->classPtr, mixins[i])) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may not mix a class into itself", -1));
"may not mix a class into itself", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "SELF_MIXIN", NULL);
goto freeAndError;
}
@@ -2147,7 +2147,7 @@ ClassSuperGet(
return TCL_ERROR;
} else if (!oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -2185,12 +2185,12 @@ ClassSuperSet(
return TCL_ERROR;
} else if (!oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
} else if (oPtr == oPtr->fPtr->objectCls->thisPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may not modify the superclass of the root object", -1));
"may not modify the superclass of the root object", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
} else if (Tcl_ListObjGetElements(interp, objv[0], &superc,
@@ -2217,14 +2217,14 @@ ClassSuperSet(
for (j=0 ; j<i ; j++) {
if (superclasses[j] == superclasses[i]) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"class should only be a direct superclass once", -1));
"class should only be a direct superclass once", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "REPETITIOUS", NULL);
goto failedAfterAlloc;
}
}
if (TclOOIsReachable(oPtr->classPtr, superclasses[i])) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to form circular dependency graph", -1));
"attempt to form circular dependency graph", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "CIRCULARITY", NULL);
failedAfterAlloc:
ckfree((char *) superclasses);
@@ -2286,7 +2286,7 @@ ClassVarsGet(
return TCL_ERROR;
} else if (!oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
}
@@ -2323,7 +2323,7 @@ ClassVarsSet(
return TCL_ERROR;
} else if (!oPtr->classPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"attempt to misuse API", -1));
"attempt to misuse API", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
return TCL_ERROR;
} else if (Tcl_ListObjGetElements(interp, objv[0], &varc,
+22 -22
View File
@@ -118,15 +118,15 @@ TclOOInitInfo(
Tcl_GetEnsembleMappingDict(NULL, infoCmd, &mapDict);
if (mapDict != NULL) {
objectObj = Tcl_NewStringObj("object", -1);
classObj = Tcl_NewStringObj("class", -1);
objectObj = Tcl_NewStringObj("object", TCL_NOSIZE);
classObj = Tcl_NewStringObj("class", TCL_NOSIZE);
Tcl_IncrRefCount(objectObj);
Tcl_IncrRefCount(classObj);
Tcl_DictObjPut(NULL, mapDict, objectObj,
Tcl_NewStringObj("::oo::InfoObject", -1));
Tcl_NewStringObj("::oo::InfoObject", TCL_NOSIZE));
Tcl_DictObjPut(NULL, mapDict, classObj,
Tcl_NewStringObj("::oo::InfoClass", -1));
Tcl_NewStringObj("::oo::InfoClass", TCL_NOSIZE));
Tcl_DecrRefCount(objectObj);
Tcl_DecrRefCount(classObj);
Tcl_SetEnsembleMappingDict(interp, infoCmd, mapDict);
@@ -267,7 +267,7 @@ InfoObjectDefnCmd(
procPtr = TclOOGetProcFromMethod(Tcl_GetHashValue(hPtr));
if (procPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"definition not available for this kind of method", -1));
"definition not available for this kind of method", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
TclGetString(objv[2]), NULL);
return TCL_ERROR;
@@ -281,7 +281,7 @@ InfoObjectDefnCmd(
argObj = Tcl_NewObj();
Tcl_ListObjAppendElement(NULL, argObj,
Tcl_NewStringObj(localPtr->name, -1));
Tcl_NewStringObj(localPtr->name, TCL_NOSIZE));
if (localPtr->defValuePtr != NULL) {
Tcl_ListObjAppendElement(NULL, argObj, localPtr->defValuePtr);
}
@@ -379,7 +379,7 @@ InfoObjectForwardCmd(
if (prefixObj == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"prefix argument list not available for this kind of method",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
TclGetString(objv[2]), NULL);
return TCL_ERROR;
@@ -471,7 +471,7 @@ InfoObjectIsACmd(
}
if (o2Ptr->classPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"non-classes cannot be mixins", -1));
"non-classes cannot be mixins", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "NONCLASS", NULL);
return TCL_ERROR;
} else {
@@ -497,7 +497,7 @@ InfoObjectIsACmd(
}
if (o2Ptr->classPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"non-classes cannot be types", -1));
"non-classes cannot be types", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "NONCLASS", NULL);
return TCL_ERROR;
}
@@ -579,7 +579,7 @@ InfoObjectMethodsCmd(
for (i=0 ; i<numNames ; i++) {
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(names[i], -1));
Tcl_NewStringObj(names[i], TCL_NOSIZE));
}
if (numNames > 0) {
ckfree(names);
@@ -648,7 +648,7 @@ InfoObjectMethodTypeCmd(
goto unknownMethod;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(mPtr->typePtr->name, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(mPtr->typePtr->name, TCL_NOSIZE));
return TCL_OK;
}
@@ -721,7 +721,7 @@ InfoObjectNsCmd(
}
Tcl_SetObjResult(interp,
Tcl_NewStringObj(oPtr->namespacePtr->fullName, -1));
Tcl_NewStringObj(oPtr->namespacePtr->fullName, TCL_NOSIZE));
return TCL_OK;
}
@@ -860,7 +860,7 @@ InfoClassConstrCmd(
procPtr = TclOOGetProcFromMethod(clsPtr->constructorPtr);
if (procPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"definition not available for this kind of method", -1));
"definition not available for this kind of method", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "METHOD_TYPE", NULL);
return TCL_ERROR;
}
@@ -873,7 +873,7 @@ InfoClassConstrCmd(
argObj = Tcl_NewObj();
Tcl_ListObjAppendElement(NULL, argObj,
Tcl_NewStringObj(localPtr->name, -1));
Tcl_NewStringObj(localPtr->name, TCL_NOSIZE));
if (localPtr->defValuePtr != NULL) {
Tcl_ListObjAppendElement(NULL, argObj, localPtr->defValuePtr);
}
@@ -927,7 +927,7 @@ InfoClassDefnCmd(
procPtr = TclOOGetProcFromMethod(Tcl_GetHashValue(hPtr));
if (procPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"definition not available for this kind of method", -1));
"definition not available for this kind of method", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
TclGetString(objv[2]), NULL);
return TCL_ERROR;
@@ -941,7 +941,7 @@ InfoClassDefnCmd(
argObj = Tcl_NewObj();
Tcl_ListObjAppendElement(NULL, argObj,
Tcl_NewStringObj(localPtr->name, -1));
Tcl_NewStringObj(localPtr->name, TCL_NOSIZE));
if (localPtr->defValuePtr != NULL) {
Tcl_ListObjAppendElement(NULL, argObj, localPtr->defValuePtr);
}
@@ -988,7 +988,7 @@ InfoClassDestrCmd(
procPtr = TclOOGetProcFromMethod(clsPtr->destructorPtr);
if (procPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"definition not available for this kind of method", -1));
"definition not available for this kind of method", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "METHOD_TYPE", NULL);
return TCL_ERROR;
}
@@ -1076,7 +1076,7 @@ InfoClassForwardCmd(
if (prefixObj == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"prefix argument list not available for this kind of method",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
TclGetString(objv[2]), NULL);
return TCL_ERROR;
@@ -1199,7 +1199,7 @@ InfoClassMethodsCmd(
for (i=0 ; i<numNames ; i++) {
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(names[i], -1));
Tcl_NewStringObj(names[i], TCL_NOSIZE));
}
if (numNames > 0) {
ckfree(names);
@@ -1265,7 +1265,7 @@ InfoClassMethodTypeCmd(
goto unknownMethod;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(mPtr->typePtr->name, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(mPtr->typePtr->name, TCL_NOSIZE));
return TCL_OK;
}
@@ -1476,7 +1476,7 @@ InfoObjectCallCmd(
contextPtr = TclOOGetCallContext(oPtr, objv[2], PUBLIC_METHOD, NULL);
if (contextPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot construct any call chain", -1));
"cannot construct any call chain", TCL_NOSIZE));
return TCL_ERROR;
}
Tcl_SetObjResult(interp,
@@ -1521,7 +1521,7 @@ InfoClassCallCmd(
callPtr = TclOOGetStereotypeCallChain(clsPtr, objv[2], PUBLIC_METHOD);
if (callPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot construct any call chain", -1));
"cannot construct any call chain", TCL_NOSIZE));
return TCL_ERROR;
}
Tcl_SetObjResult(interp, TclOORenderCallChain(interp, callPtr));
+3 -3
View File
@@ -303,7 +303,7 @@ TclOONewBasicMethod(
/* Name of the method, whether it is public,
* and the function to implement it. */
{
Tcl_Obj *namePtr = Tcl_NewStringObj(dcm->name, -1);
Tcl_Obj *namePtr = Tcl_NewStringObj(dcm->name, TCL_NOSIZE);
Tcl_IncrRefCount(namePtr);
Tcl_NewMethod(interp, (Tcl_Class) clsPtr, namePtr,
@@ -1330,7 +1330,7 @@ TclOONewForwardInstanceMethod(
}
if (prefixLen < 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"method forward prefix must be non-empty", -1));
"method forward prefix must be non-empty", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "BAD_FORWARD", NULL);
return NULL;
}
@@ -1372,7 +1372,7 @@ TclOONewForwardMethod(
}
if (prefixLen < 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"method forward prefix must be non-empty", -1));
"method forward prefix must be non-empty", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OO", "BAD_FORWARD", NULL);
return NULL;
}
+15 -15
View File
@@ -930,7 +930,7 @@ Tcl_AppendAllObjTypes(
for (hPtr = Tcl_FirstHashEntry(&typeTable, &search);
hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
Tcl_ListObjAppendElement(NULL, objPtr,
Tcl_NewStringObj(Tcl_GetHashKey(&typeTable, hPtr), -1));
Tcl_NewStringObj(Tcl_GetHashKey(&typeTable, hPtr), TCL_NOSIZE));
}
Tcl_MutexUnlock(&tableMutex);
return TCL_OK;
@@ -1904,7 +1904,7 @@ Tcl_GetBooleanFromObj(
}
#endif
} while ((ParseBoolean(objPtr) == TCL_OK) || (TCL_OK ==
TclParseNumber(interp, objPtr, "boolean value", NULL,-1,NULL,0)));
TclParseNumber(interp, objPtr, "boolean value", NULL, TCL_NOSIZE,NULL,0)));
return TCL_ERROR;
}
@@ -1975,7 +1975,7 @@ SetBooleanFromAny(
TclNewLiteralStringObj(msg, "expected boolean value but got \"");
Tcl_AppendLimitedToObj(msg, str, length, 50, "");
Tcl_AppendToObj(msg, "\"", -1);
Tcl_AppendToObj(msg, "\"", TCL_NOSIZE);
Tcl_SetObjResult(interp, msg);
Tcl_SetErrorCode(interp, "TCL", "VALUE", "BOOLEAN", NULL);
}
@@ -2264,7 +2264,7 @@ Tcl_GetDoubleFromObj(
if (TclIsNaN(objPtr->internalRep.doubleValue)) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"floating point value is Not a Number", -1));
"floating point value is Not a Number", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "DOUBLE", "NAN",
NULL);
}
@@ -2319,7 +2319,7 @@ SetDoubleFromAny(
Tcl_Interp *interp, /* Used for error reporting if not NULL. */
register Tcl_Obj *objPtr) /* The object to convert. */
{
return TclParseNumber(interp, objPtr, "floating-point number", NULL, -1,
return TclParseNumber(interp, objPtr, "floating-point number", NULL, TCL_NOSIZE,
NULL, 0);
}
@@ -2486,7 +2486,7 @@ Tcl_GetIntFromObj(
if (interp != NULL) {
const char *s =
"integer value too large to represent as non-long integer";
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
}
return TCL_ERROR;
@@ -2804,14 +2804,14 @@ Tcl_GetLongFromObj(
#endif
if (interp != NULL) {
const char *s = "integer value too large to represent";
Tcl_Obj *msg = Tcl_NewStringObj(s, -1);
Tcl_Obj *msg = Tcl_NewStringObj(s, TCL_NOSIZE);
Tcl_SetObjResult(interp, msg);
Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
}
return TCL_ERROR;
}
} while (TclParseNumber(interp, objPtr, "integer", NULL, -1, NULL,
} while (TclParseNumber(interp, objPtr, "integer", NULL, TCL_NOSIZE, NULL,
TCL_PARSE_INTEGER_ONLY)==TCL_OK);
return TCL_ERROR;
}
@@ -3101,14 +3101,14 @@ Tcl_GetWideIntFromObj(
}
if (interp != NULL) {
const char *s = "integer value too large to represent";
Tcl_Obj *msg = Tcl_NewStringObj(s, -1);
Tcl_Obj *msg = Tcl_NewStringObj(s, TCL_NOSIZE);
Tcl_SetObjResult(interp, msg);
Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
}
return TCL_ERROR;
}
} while (TclParseNumber(interp, objPtr, "integer", NULL, -1, NULL,
} while (TclParseNumber(interp, objPtr, "integer", NULL, TCL_NOSIZE, NULL,
TCL_PARSE_INTEGER_ONLY)==TCL_OK);
return TCL_ERROR;
}
@@ -3402,7 +3402,7 @@ GetBignumFromObj(
}
return TCL_ERROR;
}
} while (TclParseNumber(interp, objPtr, "integer", NULL, -1, NULL,
} while (TclParseNumber(interp, objPtr, "integer", NULL, TCL_NOSIZE, NULL,
TCL_PARSE_INTEGER_ONLY)==TCL_OK);
return TCL_ERROR;
}
@@ -3655,7 +3655,7 @@ TclGetNumberFromObj(
return TCL_OK;
}
} while (TCL_OK ==
TclParseNumber(interp, objPtr, "number", NULL, -1, NULL, 0));
TclParseNumber(interp, objPtr, "number", NULL, TCL_NOSIZE, NULL, 0));
return TCL_ERROR;
}
@@ -4491,12 +4491,12 @@ Tcl_RepresentationCmd(
}
if (objv[1]->bytes) {
Tcl_AppendToObj(descObj, ", string representation \"", -1);
Tcl_AppendToObj(descObj, ", string representation \"", TCL_NOSIZE);
Tcl_AppendLimitedToObj(descObj, objv[1]->bytes, objv[1]->length,
16, "...");
Tcl_AppendToObj(descObj, "\"", -1);
Tcl_AppendToObj(descObj, "\"", TCL_NOSIZE);
} else {
Tcl_AppendToObj(descObj, ", no string representation", -1);
Tcl_AppendToObj(descObj, ", no string representation", TCL_NOSIZE);
}
Tcl_SetObjResult(interp, descObj);
+9 -9
View File
@@ -259,7 +259,7 @@ Tcl_ParseCommand(
if ((start == NULL) && (numBytes != 0)) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't parse a NULL pointer", -1));
"can't parse a NULL pointer", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -570,13 +570,13 @@ Tcl_ParseCommand(
if (src[-1] == '"') {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"extra characters after close-quote", -1));
"extra characters after close-quote", TCL_NOSIZE));
}
parsePtr->errorType = TCL_PARSE_QUOTE_EXTRA;
} else {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"extra characters after close-brace", -1));
"extra characters after close-brace", TCL_NOSIZE));
}
parsePtr->errorType = TCL_PARSE_BRACE_EXTRA;
}
@@ -1177,7 +1177,7 @@ ParseTokens(
if (numBytes == 0) {
if (parsePtr->interp != NULL) {
Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
"missing close-bracket", -1));
"missing close-bracket", TCL_NOSIZE));
}
parsePtr->errorType = TCL_PARSE_MISSING_BRACKET;
parsePtr->term = tokenPtr->start;
@@ -1413,7 +1413,7 @@ Tcl_ParseVarName(
if (numBytes == 0) {
if (parsePtr->interp != NULL) {
Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
"missing close-brace for variable name", -1));
"missing close-brace for variable name", TCL_NOSIZE));
}
parsePtr->errorType = TCL_PARSE_MISSING_VAR_BRACE;
parsePtr->term = tokenPtr->start-1;
@@ -1481,7 +1481,7 @@ Tcl_ParseVarName(
if ((parsePtr->term == src+numBytes) || (*parsePtr->term != ')')){
if (parsePtr->interp != NULL) {
Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
"missing )", -1));
"missing )", TCL_NOSIZE));
}
parsePtr->errorType = TCL_PARSE_MISSING_PAREN;
parsePtr->term = src;
@@ -1757,7 +1757,7 @@ Tcl_ParseBraces(
}
Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
"missing close-brace", -1));
"missing close-brace", TCL_NOSIZE));
/*
* Guess if the problem is due to comments by searching the source string
@@ -1780,7 +1780,7 @@ Tcl_ParseBraces(
case '#' :
if (openBrace && TclIsSpaceProc(src[-1])) {
Tcl_AppendToObj(Tcl_GetObjResult(parsePtr->interp),
": possible unbalanced brace in comment", -1);
": possible unbalanced brace in comment", TCL_NOSIZE);
goto error;
}
break;
@@ -1860,7 +1860,7 @@ Tcl_ParseQuotedString(
if (*parsePtr->term != '"') {
if (parsePtr->interp != NULL) {
Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
"missing \"", -1));
"missing \"", TCL_NOSIZE));
}
parsePtr->errorType = TCL_PARSE_MISSING_QUOTE;
parsePtr->term = start;
+4 -4
View File
@@ -782,7 +782,7 @@ GetExtension(
if (extension == NULL) {
ret = Tcl_NewObj();
} else {
ret = Tcl_NewStringObj(extension, -1);
ret = Tcl_NewStringObj(extension, TCL_NOSIZE);
}
Tcl_IncrRefCount(ret);
return ret;
@@ -1493,7 +1493,7 @@ MakePathFromNormalized(
if (pathPtr->typePtr->updateStringProc == NULL) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't find object string representation", -1));
"can't find object string representation", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH", "WTF",
NULL);
}
@@ -2374,7 +2374,7 @@ SetFsPathFromAny(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"couldn't find HOME environment variable to"
" expand path", -1));
" expand path", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH",
"HOMELESS", NULL);
}
@@ -2444,7 +2444,7 @@ SetFsPathFromAny(
*/
Tcl_Obj *joined;
Tcl_Obj *rest = Tcl_NewStringObj(name+split+1, -1);
Tcl_Obj *rest = Tcl_NewStringObj(name+split+1, TCL_NOSIZE);
Tcl_IncrRefCount(transPtr);
joined = Tcl_FSJoinToPath(transPtr, 1, &rest);
+9 -9
View File
@@ -347,7 +347,7 @@ TclCleanupChildren(
"child suspended: %s\n", p));
} else {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"child wait status didn't make sense\n", -1));
"child wait status didn't make sense\n", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC",
"ODDWAITRESULT", msg1, NULL);
}
@@ -370,9 +370,9 @@ TclCleanupChildren(
int count;
Tcl_Obj *objPtr;
Tcl_Seek(errorChan, (Tcl_WideInt)0, SEEK_SET);
Tcl_Seek(errorChan, 0, SEEK_SET);
objPtr = Tcl_NewObj();
count = Tcl_ReadChars(errorChan, objPtr, -1, 0);
count = Tcl_ReadChars(errorChan, objPtr, TCL_NOSIZE, 0);
if (count < 0) {
result = TCL_ERROR;
Tcl_DecrRefCount(objPtr);
@@ -398,7 +398,7 @@ TclCleanupChildren(
if ((abnormalExit != 0) && (anyErrorInfo == 0) && (interp != NULL)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"child process exited abnormally", -1));
"child process exited abnormally", TCL_NOSIZE));
}
return result;
}
@@ -548,7 +548,7 @@ TclCreatePipeline(
if (*p == '\0') {
if ((i == (lastBar + 1)) || (i == (argc - 1))) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"illegal use of | or |& in command", -1));
"illegal use of | or |& in command", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC",
"PIPESYNTAX", NULL);
goto error;
@@ -730,7 +730,7 @@ TclCreatePipeline(
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"illegal use of | or |& in command", -1));
"illegal use of | or |& in command", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC", "PIPESYNTAX",
NULL);
goto error;
@@ -1083,7 +1083,7 @@ Tcl_OpenCommandChannel(
if ((flags & TCL_STDOUT) && (outPipe == NULL)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't read output from command:"
" standard output was redirected", -1));
" standard output was redirected", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC",
"BADREDIRECT", NULL);
goto error;
@@ -1091,7 +1091,7 @@ Tcl_OpenCommandChannel(
if ((flags & TCL_STDIN) && (inPipe == NULL)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't write input to command:"
" standard input was redirected", -1));
" standard input was redirected", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC",
"BADREDIRECT", NULL);
goto error;
@@ -1103,7 +1103,7 @@ Tcl_OpenCommandChannel(
if (channel == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"pipe for command could not be created", -1));
"pipe for command could not be created", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC", "NOPIPE", NULL);
goto error;
}
+11 -11
View File
@@ -303,7 +303,7 @@ Tcl_PkgRequireEx(
!= CheckVersionAndConvert(interp, version, NULL, NULL)) {
return NULL;
}
ov = Tcl_NewStringObj(version, -1);
ov = Tcl_NewStringObj(version, TCL_NOSIZE);
if (exact) {
Tcl_AppendStringsToObj(ov, "-", version, NULL);
}
@@ -332,7 +332,7 @@ Tcl_PkgRequireProc(
if (result == NULL) {
return TCL_ERROR;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(result, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(result, TCL_NOSIZE));
return TCL_OK;
}
@@ -488,7 +488,7 @@ PkgRequireCore(
pkgPtr->clientData = versionToProvide;
Tcl_Preserve(script);
Tcl_Preserve(versionToProvide);
code = Tcl_EvalEx(interp, script, -1, TCL_EVAL_GLOBAL);
code = Tcl_EvalEx(interp, script, TCL_NOSIZE, TCL_EVAL_GLOBAL);
Tcl_Release(script);
pkgPtr = FindPackage(interp, name);
@@ -584,7 +584,7 @@ PkgRequireCore(
script = ((Interp *) interp)->packageUnknown;
if (script != NULL) {
Tcl_DStringInit(&command);
Tcl_DStringAppend(&command, script, -1);
Tcl_DStringAppend(&command, script, TCL_NOSIZE);
Tcl_DStringAppendElement(&command, name);
AddRequirementsToDString(&command, reqc, reqv);
@@ -852,7 +852,7 @@ Tcl_PackageObjCmd(
if (objc == 4) {
ckfree(argv3i);
Tcl_SetObjResult(interp,
Tcl_NewStringObj(availPtr->script, -1));
Tcl_NewStringObj(availPtr->script, TCL_NOSIZE));
return TCL_OK;
}
Tcl_EventuallyFree(availPtr->script, TCL_DYNAMIC);
@@ -894,7 +894,7 @@ Tcl_PackageObjCmd(
pkgPtr = Tcl_GetHashValue(hPtr);
if ((pkgPtr->version != NULL) || (pkgPtr->availPtr != NULL)) {
Tcl_ListObjAppendElement(NULL,resultObj, Tcl_NewStringObj(
Tcl_GetHashKey(tablePtr, hPtr), -1));
Tcl_GetHashKey(tablePtr, hPtr), TCL_NOSIZE));
}
}
Tcl_SetObjResult(interp, resultObj);
@@ -958,7 +958,7 @@ Tcl_PackageObjCmd(
pkgPtr = Tcl_GetHashValue(hPtr);
if (pkgPtr->version != NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj(pkgPtr->version, -1));
Tcl_NewStringObj(pkgPtr->version, TCL_NOSIZE));
}
}
return TCL_OK;
@@ -998,7 +998,7 @@ Tcl_PackageObjCmd(
* Create a new-style requirement for the exact version.
*/
ov = Tcl_NewStringObj(version, -1);
ov = Tcl_NewStringObj(version, TCL_NOSIZE);
Tcl_AppendStringsToObj(ov, "-", version, NULL);
version = NULL;
argv3 = TclGetString(objv[3]);
@@ -1021,7 +1021,7 @@ Tcl_PackageObjCmd(
if (objc == 2) {
if (iPtr->packageUnknown != NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj(iPtr->packageUnknown, -1));
Tcl_NewStringObj(iPtr->packageUnknown, TCL_NOSIZE));
}
} else if (objc == 3) {
if (iPtr->packageUnknown != NULL) {
@@ -1073,7 +1073,7 @@ Tcl_PackageObjCmd(
*/
Tcl_SetObjResult(interp,
Tcl_NewStringObj(pkgPreferOptions[iPtr->packagePrefer], -1));
Tcl_NewStringObj(pkgPreferOptions[iPtr->packagePrefer], TCL_NOSIZE));
break;
}
case PKG_VCOMPARE:
@@ -1119,7 +1119,7 @@ Tcl_PackageObjCmd(
for (availPtr = pkgPtr->availPtr; availPtr != NULL;
availPtr = availPtr->nextPtr) {
Tcl_ListObjAppendElement(NULL, resultObj,
Tcl_NewStringObj(availPtr->version, -1));
Tcl_NewStringObj(availPtr->version, TCL_NOSIZE));
}
}
Tcl_SetObjResult(interp, resultObj);
+7 -7
View File
@@ -195,10 +195,10 @@ Tcl_ProcObjCmd(
Tcl_DStringInit(&ds);
if (nsPtr != iPtr->globalNsPtr) {
Tcl_DStringAppend(&ds, nsPtr->fullName, -1);
Tcl_DStringAppend(&ds, nsPtr->fullName, TCL_NOSIZE);
TclDStringAppendLiteral(&ds, "::");
}
Tcl_DStringAppend(&ds, procName, -1);
Tcl_DStringAppend(&ds, procName, TCL_NOSIZE);
cmd = Tcl_NRCreateCommand(interp, Tcl_DStringValue(&ds), TclObjInterpProc,
TclNRInterpProc, procPtr, TclProcDeleteProc);
@@ -530,7 +530,7 @@ TclCreateProc(
if ((fieldCount == 0) || (*fieldValues[0] == 0)) {
ckfree(fieldValues);
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"argument with no name", -1));
"argument with no name", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
"FORMALARGUMENTFORMAT", NULL);
goto procError;
@@ -1121,7 +1121,7 @@ ProcWrongNumArgs(
(int) sizeof(Tcl_Obj *) * (numArgs+1));
if (framePtr->isProcCallFrame & FRAME_IS_LAMBDA) {
desiredObjs[0] = Tcl_NewStringObj("lambdaExpr", -1);
desiredObjs[0] = Tcl_NewStringObj("lambdaExpr", TCL_NOSIZE);
} else {
((Interp *) interp)->ensembleRewrite.numInsertedObjs -= skip - 1;
@@ -2002,7 +2002,7 @@ TclProcCompileProc(
if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) {
if ((Interp *) *codePtr->interpHandle != iPtr) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"a precompiled script jumped interps", -1));
"a precompiled script jumped interps", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
"CROSSINTERPBYTECODE", NULL);
return TCL_ERROR;
@@ -3028,7 +3028,7 @@ Tcl_DisassembleObjCmd(
procPtr = TclOOGetProcFromMethod(Tcl_GetHashValue(hPtr));
if (procPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"body not available for this kind of method", -1));
"body not available for this kind of method", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
"METHODTYPE", NULL);
return TCL_ERROR;
@@ -3064,7 +3064,7 @@ Tcl_DisassembleObjCmd(
if (((ByteCode *) codeObjPtr->internalRep.otherValuePtr)->flags
& TCL_BYTECODE_PRECOMPILED) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"may not disassemble prebuilt bytecode", -1));
"may not disassemble prebuilt bytecode", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
"BYTECODE", NULL);
return TCL_ERROR;
+2 -2
View File
@@ -200,7 +200,7 @@ Tcl_RegExpExec(
*/
Tcl_DStringInit(&ds);
ustr = Tcl_UtfToUniCharDString(text, -1, &ds);
ustr = Tcl_UtfToUniCharDString(text, TCL_NOSIZE, &ds);
numChars = Tcl_DStringLength(&ds) / sizeof(Tcl_UniChar);
result = RegExpExecUniChar(interp, re, ustr, numChars, -1 /* nmatches */,
flags);
@@ -682,7 +682,7 @@ TclRegAbout(
for (inf=infonames ; inf->bit != 0 ; inf++) {
if (regexpPtr->re.re_info & inf->bit) {
Tcl_ListObjAppendElement(NULL, infoObj,
Tcl_NewStringObj(inf->text, -1));
Tcl_NewStringObj(inf->text, TCL_NOSIZE));
}
}
Tcl_ListObjAppendElement(NULL, resultObj, infoObj);
+2 -2
View File
@@ -1027,7 +1027,7 @@ Tcl_SetErrorCodeVA(
if (elem == NULL) {
break;
}
Tcl_ListObjAppendElement(NULL, errorObj, Tcl_NewStringObj(elem, -1));
Tcl_ListObjAppendElement(NULL, errorObj, Tcl_NewStringObj(elem, TCL_NOSIZE));
}
Tcl_SetObjErrorCode(interp, errorObj);
}
@@ -1587,7 +1587,7 @@ Tcl_GetReturnOptions(
}
if (result == TCL_ERROR) {
Tcl_AddObjErrorInfo(interp, "", -1);
Tcl_AddObjErrorInfo(interp, "", TCL_NOSIZE);
Tcl_DictObjPut(NULL, options, keys[KEY_ERRORSTACK], iPtr->errorStack);
}
if (iPtr->errorCode) {
+16 -16
View File
@@ -334,7 +334,7 @@ ValidateFormat(
mixedXPG:
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"cannot mix \"%\" and \"%n$\" conversion specifiers",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "MIXEDSPECTYPES", NULL);
goto error;
}
@@ -381,7 +381,7 @@ ValidateFormat(
if (flags & SCAN_WIDTH) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"field width may not be specified in %c conversion",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADWIDTH", NULL);
goto error;
}
@@ -394,9 +394,9 @@ ValidateFormat(
invalidFieldSize:
buf[Tcl_UniCharToUtf(ch, buf)] = '\0';
errorMsg = Tcl_NewStringObj(
"field size modifier may not be specified in %", -1);
Tcl_AppendToObj(errorMsg, buf, -1);
Tcl_AppendToObj(errorMsg, " conversion", -1);
"field size modifier may not be specified in %", TCL_NOSIZE);
Tcl_AppendToObj(errorMsg, buf, TCL_NOSIZE);
Tcl_AppendToObj(errorMsg, " conversion", TCL_NOSIZE);
Tcl_SetObjResult(interp, errorMsg);
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADSIZE", NULL);
goto error;
@@ -416,7 +416,7 @@ ValidateFormat(
case 'u':
if (flags & SCAN_BIG) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unsigned bignum scans are invalid", -1));
"unsigned bignum scans are invalid", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADUNSIGNED",NULL);
goto error;
}
@@ -453,15 +453,15 @@ ValidateFormat(
break;
badSet:
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched [ in format string", -1));
"unmatched [ in format string", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BRACKET", NULL);
goto error;
default:
buf[Tcl_UniCharToUtf(ch, buf)] = '\0';
errorMsg = Tcl_NewStringObj(
"bad scan conversion character \"", -1);
Tcl_AppendToObj(errorMsg, buf, -1);
Tcl_AppendToObj(errorMsg, "\"", -1);
"bad scan conversion character \"", TCL_NOSIZE);
Tcl_AppendToObj(errorMsg, buf, TCL_NOSIZE);
Tcl_AppendToObj(errorMsg, "\"", TCL_NOSIZE);
Tcl_SetObjResult(interp, errorMsg);
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADTYPE", NULL);
goto error;
@@ -509,7 +509,7 @@ ValidateFormat(
if (nassign[i] > 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"variable is assigned by multiple \"%n$\" conversion specifiers",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "POLYASSIGNED", NULL);
goto error;
} else if (!xpgSize && (nassign[i] == 0)) {
@@ -520,7 +520,7 @@ ValidateFormat(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"variable is not assigned by any conversion specifiers",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "UNASSIGNED", NULL);
goto error;
}
@@ -532,12 +532,12 @@ ValidateFormat(
badIndex:
if (gotXpg) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"%n$\" argument index out of range", -1));
"\"%n$\" argument index out of range", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "INDEXRANGE", NULL);
} else {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"different numbers of variable names and field specifiers",
-1));
TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", "FIELDVARMISMATCH", NULL);
}
@@ -926,7 +926,7 @@ Tcl_ScanObjCmd(
if ((flags & SCAN_UNSIGNED) && (wideValue < 0)) {
sprintf(buf, "%" TCL_LL_MODIFIER "u",
(Tcl_WideUInt)wideValue);
Tcl_SetStringObj(objPtr, buf, -1);
Tcl_SetStringObj(objPtr, buf, TCL_NOSIZE);
} else {
Tcl_SetWideIntObj(objPtr, wideValue);
}
@@ -940,7 +940,7 @@ Tcl_ScanObjCmd(
}
if ((flags & SCAN_UNSIGNED) && (value < 0)) {
sprintf(buf, "%lu", value); /* INTL: ISO digit */
Tcl_SetStringObj(objPtr, buf, -1);
Tcl_SetStringObj(objPtr, buf, TCL_NOSIZE);
} else {
Tcl_SetLongObj(objPtr, value);
}
+3 -3
View File
@@ -376,7 +376,7 @@ static Tcl_WideUInt Nokia770Twiddle(Tcl_WideUInt w);
* the first byte to be scanned. If bytes is NULL, then objPtr must be
* non-NULL, and the string representation of objPtr will be scanned
* (generated first, if necessary). The numBytes argument determines the
* number of bytes to be scanned. If numBytes is negative, the first NUL
* number of bytes to be scanned. If numBytes is TCL_NOSIZE, the first NUL
* byte encountered will terminate the scan. If numBytes is non-negative,
* then no more than numBytes bytes will be scanned.
*
@@ -1313,7 +1313,7 @@ TclParseNumber(
expected);
Tcl_AppendLimitedToObj(msg, bytes, numBytes, 50, "");
Tcl_AppendToObj(msg, "\"", -1);
Tcl_AppendToObj(msg, "\"", TCL_NOSIZE);
Tcl_SetObjResult(interp, msg);
Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
}
@@ -4440,7 +4440,7 @@ Tcl_InitBignumFromDouble(
if (interp != NULL) {
const char *s = "integer value too large to represent";
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
}
return TCL_ERROR;
+33 -50
View File
@@ -105,7 +105,7 @@ const Tcl_ObjType tclStringType = {
*/
typedef struct String {
int numChars; /* The number of chars in the string. -1 means
int numChars; /* The number of chars in the string. TCL_NOSIZE means
* this value has not been calculated. >= 0
* means that there is a valid Unicode rep, or
* that the number of UTF bytes == the number
@@ -127,7 +127,7 @@ typedef struct String {
#define STRING_SIZE(numChars) \
(sizeof(String) + ((numChars) * sizeof(Tcl_UniChar)))
#define stringCheckLimits(numChars) \
if ((numChars) < 0 || (numChars) > STRING_MAXCHARS) { \
if ((numChars) == TCL_NOSIZE || (numChars) > STRING_MAXCHARS) { \
Tcl_Panic("max length for a Tcl unicode value (%d chars) exceeded", \
STRING_MAXCHARS); \
}
@@ -334,7 +334,7 @@ Tcl_NewStringObj(
{
Tcl_Obj *objPtr;
if (length < 0) {
if (length == TCL_NOSIZE) {
length = (bytes? strlen(bytes) : 0);
}
TclNewStringObj(objPtr, bytes, length);
@@ -387,7 +387,7 @@ Tcl_DbNewStringObj(
{
Tcl_Obj *objPtr;
if (length < 0) {
if (length == TCL_NOSIZE) {
length = (bytes? strlen(bytes) : 0);
}
TclDbNewObj(objPtr, file, line);
@@ -495,7 +495,7 @@ Tcl_GetCharLength(
* If numChars is unknown, compute it.
*/
if (numChars == -1) {
if (numChars == TCL_NOSIZE) {
TclNumUtfChars(numChars, objPtr->bytes, objPtr->length);
stringPtr->numChars = numChars;
@@ -563,7 +563,7 @@ Tcl_GetUniChar(
* If numChars is unknown, compute it.
*/
if (stringPtr->numChars == -1) {
if (stringPtr->numChars == TCL_NOSIZE) {
TclNumUtfChars(stringPtr->numChars, objPtr->bytes, objPtr->length);
}
if (stringPtr->numChars == objPtr->length) {
@@ -697,7 +697,7 @@ Tcl_GetRange(
* If numChars is unknown, compute it.
*/
if (stringPtr->numChars == -1) {
if (stringPtr->numChars == TCL_NOSIZE) {
TclNumUtfChars(stringPtr->numChars, objPtr->bytes, objPtr->length);
}
if (stringPtr->numChars == objPtr->length) {
@@ -765,7 +765,7 @@ Tcl_SetStringObj(
*/
TclInvalidateStringRep(objPtr);
if (length < 0) {
if (length == TCL_NOSIZE) {
length = (bytes? strlen(bytes) : 0);
}
TclInitStringRep(objPtr, bytes, length);
@@ -804,15 +804,6 @@ Tcl_SetObjLength(
{
String *stringPtr;
if (length < 0) {
/*
* Setting to a negative length is nonsense. This is probably the
* result of overflowing the signed integer range.
*/
Tcl_Panic("Tcl_SetObjLength: negative length requested: "
"%d (integer overflow?)", length);
}
if (Tcl_IsShared(objPtr)) {
Tcl_Panic("%s called with shared object", "Tcl_SetObjLength");
}
@@ -847,7 +838,7 @@ Tcl_SetObjLength(
* Invalidate the unicode data.
*/
stringPtr->numChars = -1;
stringPtr->numChars = TCL_NOSIZE;
stringPtr->hasUnicode = 0;
} else {
/*
@@ -909,14 +900,6 @@ Tcl_AttemptSetObjLength(
{
String *stringPtr;
if (length < 0) {
/*
* Setting to a negative length is nonsense. This is probably the
* result of overflowing the signed integer range.
*/
return 0;
}
if (Tcl_IsShared(objPtr)) {
Tcl_Panic("%s called with shared object", "Tcl_AttemptSetObjLength");
}
@@ -957,7 +940,7 @@ Tcl_AttemptSetObjLength(
* Invalidate the unicode data.
*/
stringPtr->numChars = -1;
stringPtr->numChars = TCL_NOSIZE;
stringPtr->hasUnicode = 0;
} else {
/*
@@ -1048,7 +1031,7 @@ SetUnicodeObj(
{
String *stringPtr;
if (numChars < 0) {
if (numChars == TCL_NOSIZE) {
numChars = UnicodeLength(unicode);
}
@@ -1095,7 +1078,7 @@ Tcl_AppendLimitedToObj(
const char *bytes, /* Points to the bytes to append to the
* object. */
int length, /* The number of bytes available to be
* appended from "bytes". If < 0, then all
* appended from "bytes". If == TCL_NOSIZE, then all
* bytes up to a NUL byte are available. */
int limit, /* The maximum number of bytes to append to
* the object. */
@@ -1110,7 +1093,7 @@ Tcl_AppendLimitedToObj(
Tcl_Panic("%s called with shared object", "Tcl_AppendLimitedToObj");
}
if (length < 0) {
if (length == TCL_NOSIZE) {
length = (bytes ? strlen(bytes) : 0);
}
if (length == 0) {
@@ -1176,7 +1159,7 @@ Tcl_AppendToObj(
const char *bytes, /* Points to the bytes to append to the
* object. */
int length) /* The number of bytes to append from "bytes".
* If < 0, then append all bytes up to NUL
* If == TCL_NOSIZE, then append all bytes up to NUL
* byte. */
{
Tcl_AppendLimitedToObj(objPtr, bytes, length, INT_MAX, NULL);
@@ -1260,7 +1243,7 @@ Tcl_AppendObjToObj(
Tcl_Obj *appendObjPtr) /* Object to append. */
{
String *stringPtr;
int length, numChars, appendNumChars = -1;
int length, numChars, appendNumChars = TCL_NOSIZE;
const char *bytes;
/*
@@ -1385,7 +1368,7 @@ AppendUnicodeToUnicodeRep(
String *stringPtr;
int numChars;
if (appendNumChars < 0) {
if (appendNumChars == TCL_NOSIZE) {
appendNumChars = UnicodeLength(unicode);
}
if (appendNumChars == 0) {
@@ -1407,7 +1390,7 @@ AppendUnicodeToUnicodeRep(
stringCheckLimits(numChars);
if (numChars > stringPtr->maxChars) {
int offset = -1;
int offset = TCL_NOSIZE;
/*
* Protect against case where unicode points into the existing
@@ -1473,7 +1456,7 @@ AppendUnicodeToUtfRep(
numChars = ExtendStringRepWithUnicode(objPtr, unicode, numChars);
if (stringPtr->numChars != -1) {
if (stringPtr->numChars != TCL_NOSIZE) {
stringPtr->numChars += numChars;
}
@@ -1516,7 +1499,7 @@ AppendUtfToUnicodeRep(
return;
}
ExtendUnicodeRepWithString(objPtr, bytes, numBytes, -1);
ExtendUnicodeRepWithString(objPtr, bytes, numBytes, TCL_NOSIZE);
TclInvalidateStringRep(objPtr);
stringPtr = GET_STRING(objPtr);
stringPtr->allocated = 0;
@@ -1563,13 +1546,13 @@ AppendUtfToUtfRep(
}
oldLength = objPtr->length;
newLength = numBytes + oldLength;
if (newLength < 0) {
if (newLength < oldLength) {
Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
}
stringPtr = GET_STRING(objPtr);
if (newLength > stringPtr->allocated) {
int offset = -1;
int offset = TCL_NOSIZE;
/*
* Protect against case where unicode points into the existing
@@ -1602,7 +1585,7 @@ AppendUtfToUtfRep(
* Invalidate the unicode data.
*/
stringPtr->numChars = -1;
stringPtr->numChars = TCL_NOSIZE;
stringPtr->hasUnicode = 0;
memmove(objPtr->bytes + oldLength, bytes, numBytes);
@@ -1643,7 +1626,7 @@ Tcl_AppendStringsToObjVA(
if (bytes == NULL) {
break;
}
Tcl_AppendToObj(objPtr, bytes, -1);
Tcl_AppendToObj(objPtr, bytes, TCL_NOSIZE);
}
}
@@ -1933,7 +1916,7 @@ Tcl_AppendFormatToObj(
*/
segment = objv[objIndex];
numChars = -1;
numChars = TCL_NOSIZE;
if (ch == 'i') {
ch = 'd';
}
@@ -2395,7 +2378,7 @@ Tcl_AppendFormatToObj(
errorMsg:
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "FORMAT", errCode, NULL);
}
error:
@@ -2461,7 +2444,7 @@ AppendPrintfToObjVA(
Tcl_IncrRefCount(list);
while (*p != '\0') {
int size = 0, seekingConversion = 1, gotPrecision = 0;
int lastNum = -1;
int lastNum = TCL_NOSIZE;
if (*p++ != '%') {
continue;
@@ -2736,9 +2719,9 @@ TclStringObjReverse(
}
to = objPtr->bytes;
if (numChars < numBytes) {
if ((numChars == TCL_NOSIZE) || (numChars < numBytes)) {
/*
* Either numChars == -1 and we don't know how many chars are
* Either numChars == TCL_NOSIZE and we don't know how many chars are
* represented by objPtr->bytes and we need Pass 1 just in case,
* or numChars >= 0 and we know we have fewer chars than bytes,
* so we know there's a multibyte character needing Pass 1.
@@ -2816,7 +2799,7 @@ ExtendUnicodeRepWithString(
if (stringPtr->hasUnicode) {
numOrigChars = stringPtr->numChars;
}
if (numAppendChars == -1) {
if (numAppendChars == TCL_NOSIZE) {
TclNumUtfChars(numAppendChars, bytes, numBytes);
}
needed = numOrigChars + numAppendChars;
@@ -2864,7 +2847,7 @@ DupStringInternalRep(
String *copyStringPtr = NULL;
#if COMPAT==0
if (srcStringPtr->numChars == -1) {
if (srcStringPtr->numChars == TCL_NOSIZE) {
/*
* The String struct in the source value holds zero useful data. Don't
* bother copying it. Don't even bother allocating space in which to
@@ -2983,7 +2966,7 @@ SetStringFromAny(
* already in place at objPtr->bytes.
*/
stringPtr->numChars = -1;
stringPtr->numChars = TCL_NOSIZE;
stringPtr->allocated = objPtr->length;
stringPtr->maxChars = 0;
stringPtr->hasUnicode = 0;
@@ -3039,7 +3022,7 @@ ExtendStringRepWithUnicode(
char *dst, buf[TCL_UTF_MAX];
String *stringPtr = GET_STRING(objPtr);
if (numChars < 0) {
if (numChars == TCL_NOSIZE) {
numChars = UnicodeLength(unicode);
}
@@ -3064,7 +3047,7 @@ ExtendStringRepWithUnicode(
for (i = 0; i < numChars && size >= 0; i++) {
size += Tcl_UniCharToUtf((int) unicode[i], buf);
}
if (size < 0) {
if (size == TCL_NOSIZE) {
Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
}
+6 -6
View File
@@ -181,7 +181,7 @@ static const TclIntStubs tclIntStubs = {
TclCleanupChildren, /* 5 */
TclCleanupCommand, /* 6 */
TclCopyAndCollapse, /* 7 */
0, /* 8 */
TclCopyChannel, /* 8 */
TclCreatePipeline, /* 9 */
TclCreateProc, /* 10 */
TclDeleteCompiledLocalVars, /* 11 */
@@ -421,7 +421,7 @@ static const TclIntStubs tclIntStubs = {
TclGetNamespaceCommandTable, /* 245 */
TclInitRewriteEnsemble, /* 246 */
TclResetRewriteEnsemble, /* 247 */
TclCopyChannel, /* 248 */
TclCopyChannelOld, /* 248 */
TclDoubleDigits, /* 249 */
TclSetSlaveCancelFlags, /* 250 */
};
@@ -862,7 +862,7 @@ const TclStubs tclStubs = {
Tcl_ResetResult, /* 217 */
Tcl_ScanElement, /* 218 */
Tcl_ScanCountedElement, /* 219 */
0, /* 220 */
Tcl_Seek, /* 220 */
Tcl_ServiceAll, /* 221 */
Tcl_ServiceEvent, /* 222 */
Tcl_SetAssocData, /* 223 */
@@ -888,7 +888,7 @@ const TclStubs tclStubs = {
Tcl_SplitPath, /* 243 */
Tcl_StaticPackage, /* 244 */
Tcl_StringMatch, /* 245 */
0, /* 246 */
Tcl_Tell, /* 246 */
Tcl_TraceVar, /* 247 */
Tcl_TraceVar2, /* 248 */
Tcl_TranslateFileName, /* 249 */
@@ -1133,8 +1133,8 @@ const TclStubs tclStubs = {
Tcl_NewWideIntObj, /* 488 */
Tcl_SetWideIntObj, /* 489 */
Tcl_AllocStatBuf, /* 490 */
Tcl_Seek, /* 491 */
Tcl_Tell, /* 492 */
Tcl_SeekOld, /* 491 */
Tcl_TellOld, /* 492 */
Tcl_ChannelWideSeekProc, /* 493 */
Tcl_DictObjPut, /* 494 */
Tcl_DictObjGet, /* 495 */
+37 -37
View File
@@ -857,7 +857,7 @@ TestasyncCmd(
break;
}
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(argv[3], -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(argv[3], TCL_NOSIZE));
Tcl_MutexUnlock(&asyncTestMutex);
return code;
#ifdef TCL_THREADS
@@ -1099,8 +1099,8 @@ CmdDelProc1(
ClientData clientData) /* String to save. */
{
Tcl_DStringInit(&delString);
Tcl_DStringAppend(&delString, "CmdDelProc1 ", -1);
Tcl_DStringAppend(&delString, (char *) clientData, -1);
Tcl_DStringAppend(&delString, "CmdDelProc1 ", TCL_NOSIZE);
Tcl_DStringAppend(&delString, (char *) clientData, TCL_NOSIZE);
}
static void
@@ -1108,8 +1108,8 @@ CmdDelProc2(
ClientData clientData) /* String to save. */
{
Tcl_DStringInit(&delString);
Tcl_DStringAppend(&delString, "CmdDelProc2 ", -1);
Tcl_DStringAppend(&delString, (char *) clientData, -1);
Tcl_DStringAppend(&delString, "CmdDelProc2 ", TCL_NOSIZE);
Tcl_DStringAppend(&delString, (char *) clientData, TCL_NOSIZE);
}
/*
@@ -1345,7 +1345,7 @@ ObjTraceProc(
const char *word = Tcl_GetString(objv[0]);
if (!strcmp(word, "Error")) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(command, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(command, TCL_NOSIZE));
return TCL_ERROR;
} else if (!strcmp(word, "Break")) {
return TCL_BREAK;
@@ -1716,7 +1716,7 @@ TestdoubledigitsObjCmd(ClientData unused,
type = types[type];
if (objc > 4) {
if (strcmp(Tcl_GetString(objv[4]), "shorten")) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("bad flag", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("bad flag", TCL_NOSIZE));
return TCL_ERROR;
}
type |= TCL_DD_SHORTEN_FLAG;
@@ -1726,7 +1726,7 @@ TestdoubledigitsObjCmd(ClientData unused,
ckfree(str);
retval = Tcl_NewListObj(1, &strObj);
Tcl_ListObjAppendElement(NULL, retval, Tcl_NewIntObj(decpt));
strObj = Tcl_NewStringObj(signum ? "-" : "+", 1);
strObj = Tcl_NewStringObj(signum ? "-" : "+", TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, retval, strObj);
Tcl_SetObjResult(interp, retval);
return TCL_OK;
@@ -3032,7 +3032,7 @@ TestlinkCmd(
}
}
if (argv[6][0] != 0) {
tmp = Tcl_NewStringObj(argv[6], -1);
tmp = Tcl_NewStringObj(argv[6], TCL_NOSIZE);
if (Tcl_GetWideIntFromObj(interp, tmp, &wideVar) != TCL_OK) {
Tcl_DecrRefCount(tmp);
return TCL_ERROR;
@@ -3090,7 +3090,7 @@ TestlinkCmd(
}
if (argv[15][0]) {
Tcl_WideInt w;
tmp = Tcl_NewStringObj(argv[15], -1);
tmp = Tcl_NewStringObj(argv[15], TCL_NOSIZE);
if (Tcl_GetWideIntFromObj(interp, tmp, &w) != TCL_OK) {
Tcl_DecrRefCount(tmp);
return TCL_ERROR;
@@ -3140,7 +3140,7 @@ TestlinkCmd(
Tcl_UpdateLinkedVar(interp, "string");
}
if (argv[6][0] != 0) {
tmp = Tcl_NewStringObj(argv[6], -1);
tmp = Tcl_NewStringObj(argv[6], TCL_NOSIZE);
if (Tcl_GetWideIntFromObj(interp, tmp, &wideVar) != TCL_OK) {
Tcl_DecrRefCount(tmp);
return TCL_ERROR;
@@ -3207,7 +3207,7 @@ TestlinkCmd(
}
if (argv[15][0]) {
Tcl_WideInt w;
tmp = Tcl_NewStringObj(argv[15], -1);
tmp = Tcl_NewStringObj(argv[15], TCL_NOSIZE);
if (Tcl_GetWideIntFromObj(interp, tmp, &w) != TCL_OK) {
Tcl_DecrRefCount(tmp);
return TCL_ERROR;
@@ -3281,7 +3281,7 @@ TestlocaleCmd(
}
locale = setlocale(lcTypes[index], locale);
if (locale) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), locale, -1);
Tcl_SetStringObj(Tcl_GetObjResult(interp), locale, TCL_NOSIZE);
}
return TCL_OK;
}
@@ -3503,7 +3503,7 @@ PrintParse(
break;
}
Tcl_ListObjAppendElement(NULL, objPtr,
Tcl_NewStringObj(typeString, -1));
Tcl_NewStringObj(typeString, TCL_NOSIZE));
Tcl_ListObjAppendElement(NULL, objPtr,
Tcl_NewStringObj(tokenPtr->start, tokenPtr->size));
Tcl_ListObjAppendElement(NULL, objPtr,
@@ -3511,7 +3511,7 @@ PrintParse(
}
Tcl_ListObjAppendElement(NULL, objPtr,
Tcl_NewStringObj(parsePtr->commandStart + parsePtr->commandSize,
-1));
TCL_NOSIZE));
}
/*
@@ -4624,7 +4624,7 @@ GetTimesCmd(
/* TclGetString 100000 times */
fprintf(stderr, "TclGetStringFromObj of \"12345\" 100000 times\n");
objPtr = Tcl_NewStringObj("12345", -1);
objPtr = Tcl_NewStringObj("12345", TCL_NOSIZE);
Tcl_GetTime(&start);
for (i = 0; i < 100000; i++) {
(void) TclGetString(objPtr);
@@ -4923,7 +4923,7 @@ TestsaveresultCmd(
Tcl_SetResult(interp, (char *)"dynamic result", TestsaveresultFree);
break;
case RESULT_OBJECT:
objPtr = Tcl_NewStringObj("object result", -1);
objPtr = Tcl_NewStringObj("object result", TCL_NOSIZE);
Tcl_SetObjResult(interp, objPtr);
break;
}
@@ -5190,7 +5190,7 @@ TestChannelCmd(
if ((cmdName[0] == 's') && (strncmp(cmdName, "setchannelerror", len) == 0)) {
Tcl_Obj *msg = Tcl_NewStringObj(argv[3],-1);
Tcl_Obj *msg = Tcl_NewStringObj(argv[3], TCL_NOSIZE);
Tcl_IncrRefCount(msg);
Tcl_SetChannelError(chan, msg);
@@ -5203,7 +5203,7 @@ TestChannelCmd(
}
if ((cmdName[0] == 's') && (strncmp(cmdName, "setchannelerrorinterp", len) == 0)) {
Tcl_Obj *msg = Tcl_NewStringObj(argv[3],-1);
Tcl_Obj *msg = Tcl_NewStringObj(argv[3], TCL_NOSIZE);
Tcl_IncrRefCount(msg);
Tcl_SetChannelErrorInterp(interp, msg);
@@ -5551,7 +5551,7 @@ TestChannelCmd(
}
return TclChannelTransform(interp, chan,
Tcl_NewStringObj(argv[4], -1));
Tcl_NewStringObj(argv[4], TCL_NOSIZE));
}
if ((cmdName[0] == 'u') && (strncmp(cmdName, "unstack", len) == 0)) {
@@ -5643,7 +5643,7 @@ TestChannelEventCmd(
esPtr->chanPtr = chanPtr;
esPtr->interp = interp;
esPtr->mask = mask;
esPtr->scriptPtr = Tcl_NewStringObj(argv[4], -1);
esPtr->scriptPtr = Tcl_NewStringObj(argv[4], TCL_NOSIZE);
Tcl_IncrRefCount(esPtr->scriptPtr);
Tcl_CreateChannelHandler((Tcl_Channel) chanPtr, mask,
@@ -5710,10 +5710,10 @@ TestChannelEventCmd(
esPtr = esPtr->nextPtr) {
if (esPtr->mask) {
Tcl_ListObjAppendElement(interp, resultListPtr, Tcl_NewStringObj(
(esPtr->mask == TCL_READABLE) ? "readable" : "writable", -1));
(esPtr->mask == TCL_READABLE) ? "readable" : "writable", TCL_NOSIZE));
} else {
Tcl_ListObjAppendElement(interp, resultListPtr,
Tcl_NewStringObj("none", -1));
Tcl_NewStringObj("none", TCL_NOSIZE));
}
Tcl_ListObjAppendElement(interp, resultListPtr, esPtr->scriptPtr);
}
@@ -5936,7 +5936,7 @@ TestFilesystemObjCmd(
res = Tcl_FSUnregister(&testReportingFilesystem);
msg = (res == TCL_OK) ? "unregistered" : "failed";
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg , -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg , TCL_NOSIZE));
return res;
}
@@ -6023,7 +6023,7 @@ TestReport(
Tcl_DString ds;
Tcl_DStringInit(&ds);
Tcl_DStringAppend(&ds, "lappend filesystemReport ", -1);
Tcl_DStringAppend(&ds, "lappend filesystemReport ", TCL_NOSIZE);
Tcl_DStringStartSublist(&ds);
Tcl_DStringAppendElement(&ds, cmd);
if (path != NULL) {
@@ -6308,7 +6308,7 @@ TestSimpleFilesystemObjCmd(
res = Tcl_FSUnregister(&simpleFilesystem);
msg = (res == TCL_OK) ? "unregistered" : "failed";
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg , -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg , TCL_NOSIZE));
return res;
}
@@ -6335,7 +6335,7 @@ SimpleRedirect(
Tcl_IncrRefCount(pathPtr);
return pathPtr;
}
origPtr = Tcl_NewStringObj(str+10,-1);
origPtr = Tcl_NewStringObj(str+10, TCL_NOSIZE);
Tcl_IncrRefCount(origPtr);
return origPtr;
}
@@ -6372,7 +6372,7 @@ SimpleMatchInDirectory(
for (j = 0; j < gLength; j++) {
Tcl_Obj *gElt, *nElt;
Tcl_ListObjIndex(NULL, resPtr, j, &gElt);
nElt = Tcl_NewStringObj("simplefs:/",10);
nElt = Tcl_NewStringObj("simplefs:/", TCL_NOSIZE);
Tcl_AppendObjToObj(nElt, gElt);
Tcl_ListObjAppendElement(NULL, resultPtr, nElt);
}
@@ -6435,7 +6435,7 @@ SimpleListVolumes(void)
/* Add one new volume */
Tcl_Obj *retVal;
retVal = Tcl_NewStringObj("simplefs:/", -1);
retVal = Tcl_NewStringObj("simplefs:/", TCL_NOSIZE);
Tcl_IncrRefCount(retVal);
return retVal;
}
@@ -6508,7 +6508,7 @@ TestcpuidCmd(
status = TclWinCPUID((unsigned) index, regs);
if (status != TCL_OK) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("operation not available", -1));
Tcl_NewStringObj("operation not available", TCL_NOSIZE));
return status;
}
for (i=0 ; i<4 ; ++i) {
@@ -6554,7 +6554,7 @@ TestHashSystemHashCmd(
hPtr = Tcl_CreateHashEntry(&hash, INT2PTR(i), &isNew);
if (!isNew) {
Tcl_SetObjResult(interp, Tcl_NewIntObj(i));
Tcl_AppendToObj(Tcl_GetObjResult(interp)," creation problem",-1);
Tcl_AppendToObj(Tcl_GetObjResult(interp)," creation problem", TCL_NOSIZE);
Tcl_DeleteHashTable(&hash);
return TCL_ERROR;
}
@@ -6571,13 +6571,13 @@ TestHashSystemHashCmd(
hPtr = Tcl_FindHashEntry(&hash, (char *) INT2PTR(i));
if (hPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewIntObj(i));
Tcl_AppendToObj(Tcl_GetObjResult(interp)," lookup problem",-1);
Tcl_AppendToObj(Tcl_GetObjResult(interp)," lookup problem", TCL_NOSIZE);
Tcl_DeleteHashTable(&hash);
return TCL_ERROR;
}
if (PTR2INT(Tcl_GetHashValue(hPtr)) != i+42) {
Tcl_SetObjResult(interp, Tcl_NewIntObj(i));
Tcl_AppendToObj(Tcl_GetObjResult(interp)," value problem",-1);
Tcl_AppendToObj(Tcl_GetObjResult(interp)," value problem", TCL_NOSIZE);
Tcl_DeleteHashTable(&hash);
return TCL_ERROR;
}
@@ -6696,18 +6696,18 @@ TestconcatobjCmd(
*/
Tcl_SetObjResult(interp,
Tcl_NewStringObj("Tcl_ConcatObj is unsafe:", -1));
Tcl_NewStringObj("Tcl_ConcatObj is unsafe:", TCL_NOSIZE));
emptyPtr = Tcl_NewObj();
list1Ptr = Tcl_NewStringObj("foo bar sum", -1);
list1Ptr = Tcl_NewStringObj("foo bar sum", TCL_NOSIZE);
Tcl_ListObjLength(NULL, list1Ptr, &len);
if (list1Ptr->bytes != NULL) {
ckfree(list1Ptr->bytes);
list1Ptr->bytes = NULL;
}
list2Ptr = Tcl_NewStringObj("eeny meeny", -1);
list2Ptr = Tcl_NewStringObj("eeny meeny", TCL_NOSIZE);
Tcl_ListObjLength(NULL, list2Ptr, &len);
if (list2Ptr->bytes != NULL) {
ckfree(list2Ptr->bytes);
@@ -7154,7 +7154,7 @@ InterpCompiledVarResolver(
resVarInfo->vInfo.fetchProc = MyCompiledVarFetch;
resVarInfo->vInfo.deleteProc = MyCompiledVarFree;
resVarInfo->var = NULL;
resVarInfo->nameObj = Tcl_NewStringObj(name, -1);
resVarInfo->nameObj = Tcl_NewStringObj(name, TCL_NOSIZE);
Tcl_IncrRefCount(resVarInfo->nameObj);
*rPtr = &resVarInfo->vInfo;
return TCL_OK;
+19 -19
View File
@@ -191,13 +191,13 @@ TestbignumobjCmd(
string = Tcl_GetString(objv[3]);
if (mp_init(&bignumValue) != MP_OKAY) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("error in mp_init", -1));
Tcl_NewStringObj("error in mp_init", TCL_NOSIZE));
return TCL_ERROR;
}
if (mp_read_radix(&bignumValue, string, 10) != MP_OKAY) {
mp_clear(&bignumValue);
Tcl_SetObjResult(interp,
Tcl_NewStringObj("error in mp_read_radix", -1));
Tcl_NewStringObj("error in mp_read_radix", TCL_NOSIZE));
return TCL_ERROR;
}
@@ -243,7 +243,7 @@ TestbignumobjCmd(
mp_clear(&bignumValue);
mp_clear(&newValue);
Tcl_SetObjResult(interp,
Tcl_NewStringObj("error in mp_mul_d", -1));
Tcl_NewStringObj("error in mp_mul_d", TCL_NOSIZE));
return TCL_ERROR;
}
mp_clear(&bignumValue);
@@ -271,7 +271,7 @@ TestbignumobjCmd(
mp_clear(&bignumValue);
mp_clear(&newValue);
Tcl_SetObjResult(interp,
Tcl_NewStringObj("error in mp_div_d", -1));
Tcl_NewStringObj("error in mp_div_d", TCL_NOSIZE));
return TCL_ERROR;
}
mp_clear(&bignumValue);
@@ -566,7 +566,7 @@ TestindexobjCmd(
}
if (objc < 5) {
Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", TCL_NOSIZE);
return TCL_ERROR;
}
@@ -724,7 +724,7 @@ TestintobjCmd(
return TCL_ERROR;
}
Tcl_AppendToObj(Tcl_GetObjResult(interp),
((longValue == LONG_MAX)? "1" : "0"), -1);
((longValue == LONG_MAX)? "1" : "0"), TCL_NOSIZE);
} else if (strcmp(subCmd, "get") == 0) {
if (objc != 3) {
goto wrongNumArgs;
@@ -741,7 +741,7 @@ TestintobjCmd(
return TCL_ERROR;
}
string = Tcl_GetString(varPtr[varIndex]);
Tcl_AppendToObj(Tcl_GetObjResult(interp), string, -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), string, TCL_NOSIZE);
} else if (strcmp(subCmd, "inttoobigtest") == 0) {
/*
* If long ints have more bits than ints on this platform, verify that
@@ -754,7 +754,7 @@ TestintobjCmd(
goto wrongNumArgs;
}
#if (INT_MAX == LONG_MAX) /* int is same size as long int */
Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", TCL_NOSIZE);
#else
if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
Tcl_SetLongObj(varPtr[varIndex], LONG_MAX);
@@ -763,10 +763,10 @@ TestintobjCmd(
}
if (Tcl_GetIntFromObj(interp, varPtr[varIndex], &i) != TCL_OK) {
Tcl_ResetResult(interp);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", TCL_NOSIZE);
return TCL_OK;
}
Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", TCL_NOSIZE);
#endif
} else if (strcmp(subCmd, "mult10") == 0) {
if (objc != 3) {
@@ -1049,10 +1049,10 @@ TestobjCmd(
goto wrongNumArgs;
}
if (objv[2]->typePtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("none", TCL_NOSIZE));
} else {
typeName = objv[2]->typePtr->name;
Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, TCL_NOSIZE));
}
} else if (strcmp(subCmd, "refcount") == 0) {
if (objc != 3) {
@@ -1078,10 +1078,10 @@ TestobjCmd(
return TCL_ERROR;
}
if (varPtr[varIndex]->typePtr == NULL) { /* a string! */
Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", TCL_NOSIZE);
} else {
Tcl_AppendToObj(Tcl_GetObjResult(interp),
varPtr[varIndex]->typePtr->name, -1);
varPtr[varIndex]->typePtr->name, TCL_NOSIZE);
}
} else if (strcmp(subCmd, "types") == 0) {
if (objc != 2) {
@@ -1223,7 +1223,7 @@ TeststringobjCmd(
return TCL_ERROR;
}
string = Tcl_GetString(varPtr[varIndex]);
Tcl_AppendToObj(Tcl_GetObjResult(interp), string, -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), string, TCL_NOSIZE);
break;
case 4: /* length */
if (objc != 3) {
@@ -1330,7 +1330,7 @@ TeststringobjCmd(
}
if ((i < 0) || (i > length)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"index value out of range", -1));
"index value out of range", TCL_NOSIZE));
return TCL_ERROR;
}
@@ -1361,7 +1361,7 @@ TeststringobjCmd(
}
if ((i < 0) || (i > length)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"index value out of range", -1));
"index value out of range", TCL_NOSIZE));
return TCL_ERROR;
}
@@ -1438,7 +1438,7 @@ GetVariableIndex(
}
if (index < 0 || index >= NUMBER_OF_OBJECT_VARS) {
Tcl_ResetResult(interp);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", TCL_NOSIZE);
return TCL_ERROR;
}
@@ -1475,7 +1475,7 @@ CheckIfVarUnset(
sprintf(buf, "variable %d is unset (NULL)", varIndex);
Tcl_ResetResult(interp);
Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, TCL_NOSIZE);
return 1;
}
return 0;
+4 -4
View File
@@ -661,10 +661,10 @@ ThreadErrorProc(
errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
if (errorProcString == NULL) {
errChannel = Tcl_GetStdChannel(TCL_STDERR);
Tcl_WriteChars(errChannel, "Error from thread ", -1);
Tcl_WriteChars(errChannel, buf, -1);
Tcl_WriteChars(errChannel, "Error from thread ", TCL_NOSIZE);
Tcl_WriteChars(errChannel, buf, TCL_NOSIZE);
Tcl_WriteChars(errChannel, "\n", 1);
Tcl_WriteChars(errChannel, errorInfo, -1);
Tcl_WriteChars(errChannel, errorInfo, TCL_NOSIZE);
Tcl_WriteChars(errChannel, "\n", 1);
} else {
argv[0] = errorProcString;
@@ -989,7 +989,7 @@ ThreadCancel(
Tcl_MutexUnlock(&threadMutex);
Tcl_ResetResult(interp);
return Tcl_CancelEval(tsdPtr->interp,
(result != NULL) ? Tcl_NewStringObj(result, -1) : NULL, 0, flags);
(result != NULL) ? Tcl_NewStringObj(result, TCL_NOSIZE) : NULL, 0, flags);
}
/*
+1 -1
View File
@@ -979,7 +979,7 @@ Tcl_AfterObjCmd(
Tcl_ListObjAppendElement(interp, resultListPtr,
afterPtr->commandPtr);
Tcl_ListObjAppendElement(interp, resultListPtr, Tcl_NewStringObj(
(afterPtr->token == NULL) ? "idle" : "timer", -1));
(afterPtr->token == NULL) ? "idle" : "timer", TCL_NOSIZE));
Tcl_SetObjResult(interp, resultListPtr);
}
break;
+9 -9
View File
@@ -352,9 +352,9 @@ Tcl_TraceObjCmd(
* result object list.
*/
elemObjPtr = Tcl_NewStringObj(ops, -1);
elemObjPtr = Tcl_NewStringObj(ops, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, pairObjPtr, elemObjPtr);
elemObjPtr = Tcl_NewStringObj(tvarPtr->command, -1);
elemObjPtr = Tcl_NewStringObj(tvarPtr->command, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, pairObjPtr, elemObjPtr);
Tcl_ListObjAppendElement(interp, resultListPtr, pairObjPtr);
}
@@ -437,7 +437,7 @@ TraceExecutionObjCmd(
if (listLen == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad operation list \"\": must be one or more of"
" enter, leave, enterstep, or leavestep", -1));
" enter, leave, enterstep, or leavestep", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS",
NULL);
return TCL_ERROR;
@@ -613,7 +613,7 @@ TraceExecutionObjCmd(
elemObjPtr = NULL;
Tcl_ListObjAppendElement(NULL, eachTraceObjPtr,
Tcl_NewStringObj(tcmdPtr->command, -1));
Tcl_NewStringObj(tcmdPtr->command, TCL_NOSIZE));
Tcl_ListObjAppendElement(interp, resultListPtr, eachTraceObjPtr);
}
Tcl_SetObjResult(interp, resultListPtr);
@@ -680,7 +680,7 @@ TraceCommandObjCmd(
if (listLen == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad operation list \"\": must be one or more of"
" delete or rename", -1));
" delete or rename", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS",
NULL);
return TCL_ERROR;
@@ -806,7 +806,7 @@ TraceCommandObjCmd(
Tcl_ListObjAppendElement(NULL, eachTraceObjPtr, elemObjPtr);
Tcl_DecrRefCount(elemObjPtr);
elemObjPtr = Tcl_NewStringObj(tcmdPtr->command, -1);
elemObjPtr = Tcl_NewStringObj(tcmdPtr->command, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, eachTraceObjPtr, elemObjPtr);
Tcl_ListObjAppendElement(interp, resultListPtr, eachTraceObjPtr);
}
@@ -879,7 +879,7 @@ TraceVariableObjCmd(
if (listLen == 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad operation list \"\": must be one or more of"
" array, read, unset, or write", -1));
" array, read, unset, or write", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "NOOPS",
NULL);
return TCL_ERROR;
@@ -991,7 +991,7 @@ TraceVariableObjCmd(
eachTraceObjPtr = Tcl_NewListObj(0, NULL);
Tcl_ListObjAppendElement(NULL, eachTraceObjPtr, elemObjPtr);
elemObjPtr = Tcl_NewStringObj(tvarPtr->command, -1);
elemObjPtr = Tcl_NewStringObj(tvarPtr->command, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, eachTraceObjPtr, elemObjPtr);
Tcl_ListObjAppendElement(interp, resultListPtr,
eachTraceObjPtr);
@@ -2719,7 +2719,7 @@ TclCallVarTraces(
Tcl_SetObjResult((Tcl_Interp *)iPtr, (Tcl_Obj *) result);
} else {
Tcl_SetObjResult((Tcl_Interp *)iPtr,
Tcl_NewStringObj(result, -1));
Tcl_NewStringObj(result, TCL_NOSIZE));
}
Tcl_AddErrorInfo((Tcl_Interp *)iPtr, "");
+6 -6
View File
@@ -670,7 +670,7 @@ TclFindElement(
if (openBraces != 0) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched open brace in list", -1));
"unmatched open brace in list", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "LIST", "BRACE",
NULL);
}
@@ -678,7 +678,7 @@ TclFindElement(
} else if (inQuotes) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched open quote in list", -1));
"unmatched open quote in list", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "LIST", "QUOTE",
NULL);
}
@@ -825,7 +825,7 @@ Tcl_SplitList(
ckfree(argv);
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"internal error in Tcl_SplitList", -1));
"internal error in Tcl_SplitList", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "INTERNAL", "Tcl_SplitList",
NULL);
}
@@ -2523,7 +2523,7 @@ Tcl_DStringInit(
* The return value is a pointer to the dynamic string's new value.
*
* Side effects:
* Length bytes from "bytes" (or all of "bytes" if length is less than
* Length bytes from "bytes" (or all of "bytes" if length is TCL_NOSIZE than
* zero) are added to the current value of the string. Memory gets
* reallocated if needed to accomodate the string's new size.
*
@@ -2541,7 +2541,7 @@ Tcl_DStringAppend(
{
int newSize;
if (length < 0) {
if (length == TCL_NOSIZE) {
length = strlen(bytes);
}
newSize = length + dsPtr->length;
@@ -4270,7 +4270,7 @@ TclReToGlob(
invalidGlob:
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "RE2GLOB", code, NULL);
}
Tcl_DStringFree(dsPtr);
+40 -40
View File
@@ -254,7 +254,7 @@ TclVarHashCreateVar(
Tcl_Obj *keyPtr;
Var *varPtr;
keyPtr = Tcl_NewStringObj(key, -1);
keyPtr = Tcl_NewStringObj(key, TCL_NOSIZE);
Tcl_IncrRefCount(keyPtr);
varPtr = VarHashCreateVar(tablePtr, keyPtr, newPtr);
Tcl_DecrRefCount(keyPtr);
@@ -386,7 +386,7 @@ TclLookupVar(
Tcl_Obj *part1Ptr;
Var *varPtr;
part1Ptr = Tcl_NewStringObj(part1, -1);
part1Ptr = Tcl_NewStringObj(part1, TCL_NOSIZE);
Tcl_IncrRefCount(part1Ptr);
varPtr = TclObjLookupVar(interp, part1Ptr, part2, flags, msg,
@@ -464,7 +464,7 @@ TclObjLookupVar(
Var *resPtr;
if (part2) {
part2Ptr = Tcl_NewStringObj(part2, -1);
part2Ptr = Tcl_NewStringObj(part2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
} else {
part2Ptr = NULL;
@@ -619,7 +619,7 @@ TclObjLookupVarEx(
}
part2 = newPart2 = part1Ptr->internalRep.twoPtrValue.ptr2;
if (newPart2) {
part2Ptr = Tcl_NewStringObj(newPart2, -1);
part2Ptr = Tcl_NewStringObj(newPart2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
}
part1Ptr = part1Ptr->internalRep.twoPtrValue.ptr1;
@@ -665,7 +665,7 @@ TclObjLookupVarEx(
memcpy(newPart2, part2, (unsigned) len2);
*(newPart2+len2) = '\0';
part2 = newPart2;
part2Ptr = Tcl_NewStringObj(newPart2, -1);
part2Ptr = Tcl_NewStringObj(newPart2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
/*
@@ -981,7 +981,7 @@ TclLookupSimpleVar(
return NULL;
}
if (tail != varName) {
tailPtr = Tcl_NewStringObj(tail, -1);
tailPtr = Tcl_NewStringObj(tail, TCL_NOSIZE);
} else {
tailPtr = varNamePtr;
}
@@ -1211,7 +1211,7 @@ Tcl_GetVar(
{
Tcl_Obj *varNamePtr, *resultPtr;
varNamePtr = Tcl_NewStringObj(varName, -1);
varNamePtr = Tcl_NewStringObj(varName, TCL_NOSIZE);
Tcl_IncrRefCount(varNamePtr);
resultPtr = Tcl_ObjGetVar2(interp, varNamePtr, NULL, flags);
TclDecrRefCount(varNamePtr);
@@ -1259,10 +1259,10 @@ Tcl_GetVar2(
{
Tcl_Obj *resultPtr, *part1Ptr, *part2Ptr;
part1Ptr = Tcl_NewStringObj(part1, -1);
part1Ptr = Tcl_NewStringObj(part1, TCL_NOSIZE);
Tcl_IncrRefCount(part1Ptr);
if (part2) {
part2Ptr = Tcl_NewStringObj(part2, -1);
part2Ptr = Tcl_NewStringObj(part2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
} else {
part2Ptr = NULL;
@@ -1316,10 +1316,10 @@ Tcl_GetVar2Ex(
{
Tcl_Obj *part1Ptr, *part2Ptr, *resPtr;
part1Ptr = Tcl_NewStringObj(part1, -1);
part1Ptr = Tcl_NewStringObj(part1, TCL_NOSIZE);
Tcl_IncrRefCount(part1Ptr);
if (part2) {
part2Ptr = Tcl_NewStringObj(part2, -1);
part2Ptr = Tcl_NewStringObj(part2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
} else {
part2Ptr = NULL;
@@ -1562,9 +1562,9 @@ Tcl_SetVar(
{
Tcl_Obj *valuePtr, *varNamePtr, *varValuePtr;
varNamePtr = Tcl_NewStringObj(varName, -1);
varNamePtr = Tcl_NewStringObj(varName, TCL_NOSIZE);
Tcl_IncrRefCount(varNamePtr);
valuePtr = Tcl_NewStringObj(newValue, -1);
valuePtr = Tcl_NewStringObj(newValue, TCL_NOSIZE);
Tcl_IncrRefCount(valuePtr);
varValuePtr = Tcl_ObjSetVar2(interp, varNamePtr, NULL, valuePtr, flags);
@@ -1621,15 +1621,15 @@ Tcl_SetVar2(
Tcl_Obj *valuePtr, *part1Ptr, *part2Ptr;
Tcl_Obj *varValuePtr;
part1Ptr = Tcl_NewStringObj(part1, -1);
part1Ptr = Tcl_NewStringObj(part1, TCL_NOSIZE);
Tcl_IncrRefCount(part1Ptr);
if (part2 != NULL) {
part2Ptr = Tcl_NewStringObj(part2, -1);
part2Ptr = Tcl_NewStringObj(part2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
} else {
part2Ptr = NULL;
}
valuePtr = Tcl_NewStringObj(newValue, -1);
valuePtr = Tcl_NewStringObj(newValue, TCL_NOSIZE);
Tcl_IncrRefCount(valuePtr);
varValuePtr = Tcl_ObjSetVar2(interp, part1Ptr, part2Ptr, valuePtr, flags);
@@ -1699,10 +1699,10 @@ Tcl_SetVar2Ex(
{
Tcl_Obj *part1Ptr, *part2Ptr, *resPtr;
part1Ptr = Tcl_NewStringObj(part1, -1);
part1Ptr = Tcl_NewStringObj(part1, TCL_NOSIZE);
Tcl_IncrRefCount(part1Ptr);
if (part2) {
part2Ptr = Tcl_NewStringObj(part2, -1);
part2Ptr = Tcl_NewStringObj(part2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
} else {
part2Ptr = NULL;
@@ -2053,7 +2053,7 @@ TclIncrObjVar2(
1, 1, &arrayPtr);
if (varPtr == NULL) {
Tcl_AddObjErrorInfo(interp,
"\n (reading value of variable to increment)", -1);
"\n (reading value of variable to increment)", TCL_NOSIZE);
return NULL;
}
return TclPtrIncrObjVar(interp, varPtr, arrayPtr, part1Ptr, part2Ptr,
@@ -2173,7 +2173,7 @@ Tcl_UnsetVar(
int result;
Tcl_Obj *varNamePtr;
varNamePtr = Tcl_NewStringObj(varName, -1);
varNamePtr = Tcl_NewStringObj(varName, TCL_NOSIZE);
Tcl_IncrRefCount(varNamePtr);
/*
@@ -2221,10 +2221,10 @@ Tcl_UnsetVar2(
int result;
Tcl_Obj *part1Ptr, *part2Ptr = NULL;
part1Ptr = Tcl_NewStringObj(part1, -1);
part1Ptr = Tcl_NewStringObj(part1, TCL_NOSIZE);
Tcl_IncrRefCount(part1Ptr);
if (part2) {
part2Ptr = Tcl_NewStringObj(part2, -1);
part2Ptr = Tcl_NewStringObj(part2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
}
@@ -2934,7 +2934,7 @@ TclArraySet(
}
if (elemLen & 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"list must have an even number of elements", -1));
"list must have an even number of elements", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "FORMAT", NULL);
return TCL_ERROR;
}
@@ -4030,10 +4030,10 @@ ArrayStatsCmd(
stats = Tcl_HashStats((Tcl_HashTable *) varPtr->value.tablePtr);
if (stats == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"error reading array statistics", -1));
"error reading array statistics", TCL_NOSIZE));
return TCL_ERROR;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(stats, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(stats, TCL_NOSIZE));
ckfree(stats);
return TCL_OK;
}
@@ -4367,7 +4367,7 @@ TclPtrMakeUpvar(
int result;
if (myName) {
myNamePtr = Tcl_NewStringObj(myName, -1);
myNamePtr = Tcl_NewStringObj(myName, TCL_NOSIZE);
Tcl_IncrRefCount(myNamePtr);
} else {
myNamePtr = NULL;
@@ -4451,7 +4451,7 @@ TclPtrObjMakeUpvar(
if (varPtr == otherPtr) {
Tcl_SetObjResult((Tcl_Interp *) iPtr, Tcl_NewStringObj(
"can't upvar from variable to itself", -1));
"can't upvar from variable to itself", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "UPVAR", "SELF", NULL);
return TCL_ERROR;
}
@@ -4539,9 +4539,9 @@ Tcl_UpVar(
return TCL_ERROR;
}
varNamePtr = Tcl_NewStringObj(varName, -1);
varNamePtr = Tcl_NewStringObj(varName, TCL_NOSIZE);
Tcl_IncrRefCount(varNamePtr);
localNamePtr = Tcl_NewStringObj(localNameStr, -1);
localNamePtr = Tcl_NewStringObj(localNameStr, TCL_NOSIZE);
Tcl_IncrRefCount(localNamePtr);
result = ObjMakeUpvar(interp, framePtr, varNamePtr, NULL, 0,
@@ -4593,9 +4593,9 @@ Tcl_UpVar2(
return TCL_ERROR;
}
part1Ptr = Tcl_NewStringObj(part1, -1);
part1Ptr = Tcl_NewStringObj(part1, TCL_NOSIZE);
Tcl_IncrRefCount(part1Ptr);
localNamePtr = Tcl_NewStringObj(localNameStr, -1);
localNamePtr = Tcl_NewStringObj(localNameStr, TCL_NOSIZE);
Tcl_IncrRefCount(localNamePtr);
result = ObjMakeUpvar(interp, framePtr, part1Ptr, part2, 0,
@@ -4648,7 +4648,7 @@ Tcl_GetVariableFullName(
nsPtr = TclGetVarNsPtr(varPtr);
if (nsPtr) {
Tcl_AppendToObj(objPtr, nsPtr->fullName, -1);
Tcl_AppendToObj(objPtr, nsPtr->fullName, TCL_NOSIZE);
if (nsPtr != iPtr->globalNsPtr) {
Tcl_AppendToObj(objPtr, "::", 2);
}
@@ -4733,7 +4733,7 @@ Tcl_GlobalObjCmd(
if (tail == varName) {
tailPtr = objPtr;
} else {
tailPtr = Tcl_NewStringObj(tail, -1);
tailPtr = Tcl_NewStringObj(tail, TCL_NOSIZE);
Tcl_IncrRefCount(tailPtr);
}
@@ -4884,7 +4884,7 @@ Tcl_VariableObjCmd(
if (tail == varName) {
tailPtr = varNamePtr;
} else {
tailPtr = Tcl_NewStringObj(tail, -1);
tailPtr = Tcl_NewStringObj(tail, TCL_NOSIZE);
Tcl_IncrRefCount(tailPtr);
}
@@ -5509,10 +5509,10 @@ TclVarErrMsg(
{
Tcl_Obj *part1Ptr = NULL, *part2Ptr = NULL;
part1Ptr = Tcl_NewStringObj(part1, -1);
part1Ptr = Tcl_NewStringObj(part1, TCL_NOSIZE);
Tcl_IncrRefCount(part1Ptr);
if (part2) {
part2Ptr = Tcl_NewStringObj(part2, -1);
part2Ptr = Tcl_NewStringObj(part2, TCL_NOSIZE);
Tcl_IncrRefCount(part2Ptr);
} else {
part2 = NULL;
@@ -5785,7 +5785,7 @@ Tcl_FindNamespaceVar(
* and TCL_NAMESPACE_ONLY are given,
* TCL_GLOBAL_ONLY is ignored. */
{
Tcl_Obj *namePtr = Tcl_NewStringObj(name, -1);
Tcl_Obj *namePtr = Tcl_NewStringObj(name, TCL_NOSIZE);
Tcl_Var var;
Tcl_IncrRefCount(namePtr);
@@ -5882,7 +5882,7 @@ ObjFindNamespaceVar(
varPtr = NULL;
if (simpleName != name) {
simpleNamePtr = Tcl_NewStringObj(simpleName, -1);
simpleNamePtr = Tcl_NewStringObj(simpleName, TCL_NOSIZE);
Tcl_IncrRefCount(simpleNamePtr);
} else {
simpleNamePtr = namePtr;
@@ -5976,7 +5976,7 @@ TclInfoVarsCmd(
if (simplePattern == pattern) {
simplePatternPtr = objv[1];
} else {
simplePatternPtr = Tcl_NewStringObj(simplePattern, -1);
simplePatternPtr = Tcl_NewStringObj(simplePattern, TCL_NOSIZE);
}
Tcl_IncrRefCount(simplePatternPtr);
}
@@ -6161,7 +6161,7 @@ TclInfoGlobalsCmd(
if (pattern == TclGetString(objv[1])) {
patternPtr = objv[1];
} else {
patternPtr = Tcl_NewStringObj(pattern, -1);
patternPtr = Tcl_NewStringObj(pattern, TCL_NOSIZE);
}
Tcl_IncrRefCount(patternPtr);
+33 -33
View File
@@ -259,7 +259,7 @@ ConvertError(
*/
case Z_ERRNO:
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_PosixError(interp),-1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_PosixError(interp),TCL_NOSIZE));
return;
/*
@@ -310,7 +310,7 @@ ConvertError(
sprintf(codeStrBuf, "%d", code);
break;
}
Tcl_SetObjResult(interp, Tcl_NewStringObj(zError(code), -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(zError(code), TCL_NOSIZE));
/*
* Tricky point! We might pass NULL twice here (and will when the error
@@ -347,7 +347,7 @@ ConvertErrorToList(
return Tcl_NewListObj(3, objv);
case Z_ERRNO:
TclNewLiteralStringObj(objv[2], "POSIX");
objv[3] = Tcl_NewStringObj(Tcl_ErrnoId(), -1);
objv[3] = Tcl_NewStringObj(Tcl_ErrnoId(), TCL_NOSIZE);
return Tcl_NewListObj(4, objv);
case Z_NEED_DICT:
TclNewLiteralStringObj(objv[2], "NEED_DICT");
@@ -402,7 +402,7 @@ GetValue(
const char *nameStr,
Tcl_Obj **valuePtrPtr)
{
Tcl_Obj *name = Tcl_NewStringObj(nameStr, -1);
Tcl_Obj *name = Tcl_NewStringObj(nameStr, TCL_NOSIZE);
int result = Tcl_DictObjGet(interp, dictObj, name, valuePtrPtr);
TclDecrRefCount(name);
@@ -524,7 +524,7 @@ SetValue(
const char *key,
Tcl_Obj *value)
{
Tcl_Obj *keyObj = Tcl_NewStringObj(key, -1);
Tcl_Obj *keyObj = Tcl_NewStringObj(key, TCL_NOSIZE);
Tcl_IncrRefCount(keyObj);
Tcl_DictObjPut(NULL, dictObj, keyObj, value);
@@ -551,7 +551,7 @@ ExtractHeader(
}
}
Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, -1,
Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, TCL_NOSIZE,
&tmp);
SetValue(dictObj, "comment", TclDStringToObj(&tmp));
}
@@ -568,7 +568,7 @@ ExtractHeader(
}
}
Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, -1,
Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, TCL_NOSIZE,
&tmp);
SetValue(dictObj, "filename", TclDStringToObj(&tmp));
}
@@ -580,7 +580,7 @@ ExtractHeader(
}
if (headerPtr->text != Z_UNKNOWN) {
SetValue(dictObj, "type",
Tcl_NewStringObj(headerPtr->text ? "text" : "binary", -1));
Tcl_NewStringObj(headerPtr->text ? "text" : "binary", TCL_NOSIZE));
}
if (latin1enc != NULL) {
@@ -782,7 +782,7 @@ Tcl_ZlibStreamInit(
if (Tcl_GetCommandInfo(interp, Tcl_DStringValue(&cmdname),
&cmdinfo) == 1) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"BUG: Stream command name already exists", -1));
"BUG: Stream command name already exists", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "BUG", "EXISTING_CMD", NULL);
Tcl_DStringFree(&cmdname);
goto error;
@@ -1165,7 +1165,7 @@ Tcl_ZlibStreamPut(
if (zshPtr->streamEnd) {
if (zshPtr->interp) {
Tcl_SetObjResult(zshPtr->interp, Tcl_NewStringObj(
"already past compressed stream end", -1));
"already past compressed stream end", TCL_NOSIZE));
Tcl_SetErrorCode(zshPtr->interp, "TCL", "ZIP", "CLOSED", NULL);
}
return TCL_ERROR;
@@ -1391,7 +1391,7 @@ Tcl_ZlibStreamGet(
if (zshPtr->interp) {
Tcl_SetObjResult(zshPtr->interp, Tcl_NewStringObj(
"unexpected zlib internal state during"
" decompression", -1));
" decompression", TCL_NOSIZE));
Tcl_SetErrorCode(zshPtr->interp, "TCL", "ZIP", "STATE",
NULL);
}
@@ -2138,7 +2138,7 @@ ZlibCmd(
return TCL_ERROR;
badLevel:
Tcl_SetObjResult(interp, Tcl_NewStringObj("level must be 0 to 9", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("level must be 0 to 9", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMPRESSIONLEVEL", NULL);
if (extraInfoStr) {
Tcl_AddErrorInfo(interp, extraInfoStr);
@@ -2281,7 +2281,7 @@ ZlibStreamSubcmd(
} else if (Tcl_GetIntFromObj(interp, levelObj, &level) != TCL_OK) {
return TCL_ERROR;
} else if (level < 0 || level > 9) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("level must be 0 to 9",-1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("level must be 0 to 9", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMPRESSIONLEVEL", NULL);
Tcl_AddErrorInfo(interp, "\n (in -level option)");
return TCL_ERROR;
@@ -2390,13 +2390,13 @@ ZlibPushSubcmd(
if (mode == TCL_ZLIB_STREAM_DEFLATE && !(chanMode & TCL_WRITABLE)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"compression may only be applied to writable channels", -1));
"compression may only be applied to writable channels", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "UNWRITABLE", NULL);
return TCL_ERROR;
}
if (mode == TCL_ZLIB_STREAM_INFLATE && !(chanMode & TCL_READABLE)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"decompression may only be applied to readable channels",-1));
"decompression may only be applied to readable channels", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "UNREADABLE", NULL);
return TCL_ERROR;
}
@@ -2430,7 +2430,7 @@ ZlibPushSubcmd(
}
if (level < 0 || level > 9) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"level must be 0 to 9", -1));
"level must be 0 to 9", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMPRESSIONLEVEL",
NULL);
goto genericOptionError;
@@ -2452,7 +2452,7 @@ ZlibPushSubcmd(
if (format == TCL_ZLIB_FORMAT_GZIP) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"a compression dictionary may not be set in the "
"gzip format", -1));
"gzip format", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "BADOPT", NULL);
goto genericOptionError;
}
@@ -2660,7 +2660,7 @@ ZlibStreamAddCmd(
if (i == objc-2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-buffer\" option must be followed by integer "
"decompression buffersize", -1));
"decompression buffersize", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
return TCL_ERROR;
}
@@ -2679,7 +2679,7 @@ ZlibStreamAddCmd(
if (i == objc-2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-dictionary\" option must be followed by"
" compression dictionary bytes", -1));
" compression dictionary bytes", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
return TCL_ERROR;
}
@@ -2690,7 +2690,7 @@ ZlibStreamAddCmd(
if (flush == -2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-flush\", \"-fullflush\" and \"-finalize\" options"
" are mutually exclusive", -1));
" are mutually exclusive", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "EXCLUSIVE", NULL);
return TCL_ERROR;
}
@@ -2784,7 +2784,7 @@ ZlibStreamPutCmd(
if (i == objc-2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-dictionary\" option must be followed by"
" compression dictionary bytes", -1));
" compression dictionary bytes", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
return TCL_ERROR;
}
@@ -2794,7 +2794,7 @@ ZlibStreamPutCmd(
if (flush == -2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-flush\", \"-fullflush\" and \"-finalize\" options"
" are mutually exclusive", -1));
" are mutually exclusive", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "EXCLUSIVE", NULL);
return TCL_ERROR;
}
@@ -2840,7 +2840,7 @@ ZlibStreamHeaderCmd(
} else if (zshPtr->mode != TCL_ZLIB_STREAM_INFLATE
|| zshPtr->format != TCL_ZLIB_FORMAT_GZIP) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"only gunzip streams can produce header information", -1));
"only gunzip streams can produce header information", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "ZIP", "BADOP", NULL);
return TCL_ERROR;
}
@@ -3133,11 +3133,11 @@ ZlibTransformOutput(
}
errObj = Tcl_NewListObj(0, NULL);
Tcl_ListObjAppendElement(NULL, errObj, Tcl_NewStringObj("-errorcode",-1));
Tcl_ListObjAppendElement(NULL, errObj, Tcl_NewStringObj("-errorcode", TCL_NOSIZE));
Tcl_ListObjAppendElement(NULL, errObj,
ConvertErrorToList(e, cd->outStream.adler));
Tcl_ListObjAppendElement(NULL, errObj,
Tcl_NewStringObj(cd->outStream.msg, -1));
Tcl_NewStringObj(cd->outStream.msg, TCL_NOSIZE));
Tcl_SetChannelError(cd->parent, errObj);
*errorCodePtr = EINVAL;
return -1;
@@ -3253,7 +3253,7 @@ ZlibTransformSetOption( /* not used */
return TCL_ERROR;
} else if (newLimit < 1 || newLimit > MAX_BUFFER_SIZE) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-limit must be between 1 and 65536", -1));
"-limit must be between 1 and 65536", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "READLIMIT", NULL);
return TCL_ERROR;
}
@@ -3327,7 +3327,7 @@ ZlibTransformGetOption(
Tcl_DStringAppendElement(dsPtr, "-checksum");
Tcl_DStringAppendElement(dsPtr, buf);
} else {
Tcl_DStringAppend(dsPtr, buf, -1);
Tcl_DStringAppend(dsPtr, buf, TCL_NOSIZE);
return TCL_OK;
}
}
@@ -3657,7 +3657,7 @@ ZlibStackChannelTransform(
}
cd->chan = chan;
cd->parent = Tcl_GetStackedChannel(chan);
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), TCL_NOSIZE));
return chan;
error:
@@ -3828,11 +3828,11 @@ ResultGenerate(
handleError:
errObj = Tcl_NewListObj(0, NULL);
Tcl_ListObjAppendElement(NULL, errObj, Tcl_NewStringObj("-errorcode",-1));
Tcl_ListObjAppendElement(NULL, errObj, Tcl_NewStringObj("-errorcode", TCL_NOSIZE));
Tcl_ListObjAppendElement(NULL, errObj,
ConvertErrorToList(e, cd->inStream.adler));
Tcl_ListObjAppendElement(NULL, errObj,
Tcl_NewStringObj(cd->inStream.msg, -1));
Tcl_NewStringObj(cd->inStream.msg, TCL_NOSIZE));
Tcl_SetChannelError(cd->parent, errObj);
*errorCodePtr = EINVAL;
return TCL_ERROR;
@@ -3900,7 +3900,7 @@ Tcl_ZlibStreamInit(
Tcl_Obj *dictObj,
Tcl_ZlibStream *zshandle)
{
Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
return TCL_ERROR;
}
@@ -3966,7 +3966,7 @@ Tcl_ZlibDeflate(
int level,
Tcl_Obj *gzipHeaderDictObj)
{
Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
return TCL_ERROR;
}
@@ -3979,7 +3979,7 @@ Tcl_ZlibInflate(
int bufferSize,
Tcl_Obj *gzipHeaderDictObj)
{
Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
return TCL_ERROR;
}
+10 -10
View File
@@ -202,7 +202,7 @@ TclMacOSXGetFileAttribute(
return TCL_OK;
#else
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"Mac OS X file attributes not supported", -1));
"Mac OS X file attributes not supported", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "UNSUPPORTED", NULL);
return TCL_ERROR;
#endif /* HAVE_GETATTRLIST */
@@ -334,7 +334,7 @@ TclMacOSXSetFileAttribute(
if (newRsrcForkSize != 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"setting nonzero rsrclength not supported", -1));
"setting nonzero rsrclength not supported", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "UNSUPPORTED", NULL);
return TCL_ERROR;
}
@@ -344,8 +344,8 @@ TclMacOSXSetFileAttribute(
*/
Tcl_DStringInit(&ds);
Tcl_DStringAppend(&ds, native, -1);
Tcl_DStringAppend(&ds, _PATH_RSRCFORKSPEC, -1);
Tcl_DStringAppend(&ds, native, TCL_NOSIZE);
Tcl_DStringAppend(&ds, _PATH_RSRCFORKSPEC, TCL_NOSIZE);
result = truncate(Tcl_DStringValue(&ds), (off_t)0);
if (result != 0) {
@@ -375,7 +375,7 @@ TclMacOSXSetFileAttribute(
return TCL_OK;
#else
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"Mac OS X file attributes not supported", -1));
"Mac OS X file attributes not supported", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "UNSUPPORTED", NULL);
return TCL_ERROR;
#endif
@@ -459,11 +459,11 @@ TclMacOSXCopyFileAttributes(
*/
Tcl_DStringInit(&srcBuf);
Tcl_DStringAppend(&srcBuf, src, -1);
Tcl_DStringAppend(&srcBuf, _PATH_RSRCFORKSPEC, -1);
Tcl_DStringAppend(&srcBuf, src, TCL_NOSIZE);
Tcl_DStringAppend(&srcBuf, _PATH_RSRCFORKSPEC, TCL_NOSIZE);
Tcl_DStringInit(&dstBuf);
Tcl_DStringAppend(&dstBuf, dst, -1);
Tcl_DStringAppend(&dstBuf, _PATH_RSRCFORKSPEC, -1);
Tcl_DStringAppend(&dstBuf, dst, TCL_NOSIZE);
Tcl_DStringAppend(&dstBuf, _PATH_RSRCFORKSPEC, TCL_NOSIZE);
/*
* Do the copy.
@@ -703,7 +703,7 @@ UpdateStringOfOSType(
string[2] = (char) (osType >> 8);
string[3] = (char) (osType);
string[4] = '\0';
Tcl_ExternalToUtfDString(encoding, string, -1, &ds);
Tcl_ExternalToUtfDString(encoding, string, TCL_NOSIZE, &ds);
len = (unsigned) Tcl_DStringLength(&ds) + 1;
objPtr->bytes = ckalloc(len);
memcpy(objPtr->bytes, Tcl_DStringValue(&ds), len);
+3 -3
View File
@@ -108,7 +108,7 @@ TclpDlopen(
Tcl_DString ds;
const char *fileName = Tcl_GetString(pathPtr);
native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, fileName, TCL_NOSIZE, &ds);
/*
* Use (RTLD_NOW|RTLD_LOCAL) as default, see [Bug #3216070]
*/
@@ -177,12 +177,12 @@ FindSymbol(
* the underscore.
*/
native = Tcl_UtfToExternalDString(NULL, symbol, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, symbol, TCL_NOSIZE, &ds);
proc = dlsym(handle, native); /* INTL: Native. */
if (proc == NULL) {
Tcl_DStringInit(&newName);
TclDStringAppendLiteral(&newName, "_");
native = Tcl_DStringAppend(&newName, native, -1);
native = Tcl_DStringAppend(&newName, native, TCL_NOSIZE);
proc = dlsym(handle, native); /* INTL: Native. */
Tcl_DStringFree(&newName);
}
+4 -4
View File
@@ -292,7 +292,7 @@ TclpDlopen(
Tcl_Obj *errObj = Tcl_NewObj();
if (errMsg != NULL) {
Tcl_AppendToObj(errObj, errMsg, -1);
Tcl_AppendToObj(errObj, errMsg, TCL_NOSIZE);
}
#if TCL_DYLD_USE_NSMODULE
if (objFileImageErrMsg) {
@@ -337,7 +337,7 @@ FindSymbol(
Tcl_DString ds;
const char *native;
native = Tcl_UtfToExternalDString(NULL, symbol, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, symbol, TCL_NOSIZE, &ds);
if (dyldLoadHandle->dlHandle) {
#if TCL_DYLD_USE_DLFCN
proc = dlsym(dyldLoadHandle->dlHandle, native);
@@ -356,7 +356,7 @@ FindSymbol(
Tcl_DStringInit(&newName);
TclDStringAppendLiteral(&newName, "_");
native = Tcl_DStringAppend(&newName, native, -1);
native = Tcl_DStringAppend(&newName, native, TCL_NOSIZE);
if (dyldLoadHandle->dyldLibHeader) {
nsSymbol = NSLookupSymbolInImage(dyldLoadHandle->dyldLibHeader,
native, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW |
@@ -682,7 +682,7 @@ TclpLoadMemory(
const char *errorName, *errMsg;
NSLinkEditError(&editError, &errorNumber, &errorName, &errMsg);
Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, -1));
Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, TCL_NOSIZE));
return TCL_ERROR;
}
+1 -1
View File
@@ -83,7 +83,7 @@ TclpDlopen(
Tcl_DString ds;
native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, fileName, TCL_NOSIZE, &ds);
files = {native,NULL};
result = rld_load(errorStream, &header, files, NULL);
Tcl_DStringFree(&ds);
+1 -1
View File
@@ -100,7 +100,7 @@ TclpDlopen(
Tcl_DString ds;
native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, fileName, TCL_NOSIZE, &ds);
lm = (Tcl_PackageInitProc *) load(native, LDR_NOFLAGS);
Tcl_DStringFree(&ds);
}
+2 -2
View File
@@ -95,7 +95,7 @@ TclpDlopen(
Tcl_DString ds;
native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, fileName, TCL_NOSIZE, &ds);
handle = shl_load(native, BIND_DEFERRED|BIND_VERBOSE|DYNAMIC_PATH, 0L);
Tcl_DStringFree(&ds);
}
@@ -149,7 +149,7 @@ FindSymbol(
(void *) &proc) != 0) {
Tcl_DStringInit(&newName);
TclDStringAppendLiteral(&newName, "_");
Tcl_DStringAppend(&newName, symbol, -1);
Tcl_DStringAppend(&newName, symbol, TCL_NOSIZE);
if (shl_findsym(&handle, Tcl_DStringValue(&newName),
(short) TYPE_PROCEDURE, (void *) &proc) != 0) {
proc = NULL;
+5 -5
View File
@@ -699,7 +699,7 @@ TtySetOptionProc(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -handshake: must be one of"
" xonxoff, rtscts, dtrdsr or none", -1));
" xonxoff, rtscts, dtrdsr or none", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "FCONFIGURE",
"VALUE", NULL);
}
@@ -722,7 +722,7 @@ TtySetOptionProc(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -xchar: should be a list of"
" two elements", -1));
" two elements", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "FCONFIGURE",
"VALUE", NULL);
}
@@ -732,11 +732,11 @@ TtySetOptionProc(
GETIOSTATE(fsPtr->fd, &iostate);
Tcl_UtfToExternalDString(NULL, argv[0], -1, &ds);
Tcl_UtfToExternalDString(NULL, argv[0], TCL_NOSIZE, &ds);
iostate.c_cc[VSTART] = *(const cc_t *) Tcl_DStringValue(&ds);
TclDStringClear(&ds);
Tcl_UtfToExternalDString(NULL, argv[1], -1, &ds);
Tcl_UtfToExternalDString(NULL, argv[1], TCL_NOSIZE, &ds);
iostate.c_cc[VSTOP] = *(const cc_t *) Tcl_DStringValue(&ds);
Tcl_DStringFree(&ds);
ckfree(argv);
@@ -776,7 +776,7 @@ TtySetOptionProc(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -ttycontrol: should be a list of"
" signal,value pairs", -1));
" signal,value pairs", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "FCONFIGURE",
"VALUE", NULL);
}
+11 -11
View File
@@ -760,7 +760,7 @@ TclpObjCopyDirectory(
Tcl_DStringFree(&dstString);
if (ret != TCL_OK) {
*errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
*errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), TCL_NOSIZE);
Tcl_DStringFree(&ds);
Tcl_IncrRefCount(*errorPtr);
}
@@ -814,7 +814,7 @@ TclpObjRemoveDirectory(
Tcl_DStringFree(&pathString);
if (ret != TCL_OK) {
*errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
*errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), TCL_NOSIZE);
Tcl_DStringFree(&ds);
Tcl_IncrRefCount(*errorPtr);
}
@@ -864,7 +864,7 @@ DoRemoveDirectory(
result = TCL_OK;
if ((errno != EEXIST) || (recursive == 0)) {
if (errorPtr != NULL) {
Tcl_ExternalToUtfDString(NULL, path, -1, errorPtr);
Tcl_ExternalToUtfDString(NULL, path, TCL_NOSIZE, errorPtr);
}
result = TCL_ERROR;
}
@@ -996,9 +996,9 @@ TraverseUnixTree(
* Append name after slash, and recurse on the file.
*/
Tcl_DStringAppend(sourcePtr, dirEntPtr->d_name, -1);
Tcl_DStringAppend(sourcePtr, dirEntPtr->d_name, TCL_NOSIZE);
if (targetPtr != NULL) {
Tcl_DStringAppend(targetPtr, dirEntPtr->d_name, -1);
Tcl_DStringAppend(targetPtr, dirEntPtr->d_name, TCL_NOSIZE);
}
result = TraverseUnixTree(traverseProc, sourcePtr, targetPtr,
errorPtr, doRewind);
@@ -1113,7 +1113,7 @@ TraverseUnixTree(
end:
if (errfile != NULL) {
if (errorPtr != NULL) {
Tcl_ExternalToUtfDString(NULL, errfile, -1, errorPtr);
Tcl_ExternalToUtfDString(NULL, errfile, TCL_NOSIZE, errorPtr);
}
result = TCL_ERROR;
}
@@ -1345,8 +1345,8 @@ GetGroupAttribute(
Tcl_DString ds;
const char *utf;
utf = Tcl_ExternalToUtfDString(NULL, groupPtr->gr_name, -1, &ds);
*attributePtrPtr = Tcl_NewStringObj(utf, -1);
utf = Tcl_ExternalToUtfDString(NULL, groupPtr->gr_name, TCL_NOSIZE, &ds);
*attributePtrPtr = Tcl_NewStringObj(utf, TCL_NOSIZE);
Tcl_DStringFree(&ds);
}
return TCL_OK;
@@ -1398,7 +1398,7 @@ GetOwnerAttribute(
} else {
Tcl_DString ds;
(void) Tcl_ExternalToUtfDString(NULL, pwPtr->pw_name, -1, &ds);
(void) Tcl_ExternalToUtfDString(NULL, pwPtr->pw_name, TCL_NOSIZE, &ds);
*attributePtrPtr = TclDStringToObj(&ds);
}
return TCL_OK;
@@ -1622,7 +1622,7 @@ SetPermissionsAttribute(
Tcl_Obj *modeObj;
TclNewLiteralStringObj(modeObj, "0o");
Tcl_AppendToObj(modeObj, modeStringPtr+scanned+1, -1);
Tcl_AppendToObj(modeObj, modeStringPtr+scanned+1, TCL_NOSIZE);
result = Tcl_GetLongFromObj(NULL, modeObj, &mode);
Tcl_DecrRefCount(modeObj);
}
@@ -2159,7 +2159,7 @@ TclUnixOpenTemporaryFile(
Tcl_UtfToExternalDString(NULL, string, len, &template);
} else {
Tcl_DStringInit(&template);
Tcl_DStringAppend(&template, DefaultTempDir(), -1); /* INTL: native */
Tcl_DStringAppend(&template, DefaultTempDir(), TCL_NOSIZE); /* INTL: native */
}
TclDStringAppendLiteral(&template, "/");
+13 -13
View File
@@ -148,9 +148,9 @@ TclpFindExecutable(
#endif
{
encoding = Tcl_GetEncoding(NULL, NULL);
Tcl_ExternalToUtfDString(encoding, name, -1, &utfName);
Tcl_ExternalToUtfDString(encoding, name, TCL_NOSIZE, &utfName);
TclSetObjNameOfExecutable(
Tcl_NewStringObj(Tcl_DStringValue(&utfName), -1), encoding);
Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_NOSIZE), encoding);
Tcl_DStringFree(&utfName);
goto done;
}
@@ -166,7 +166,7 @@ TclpFindExecutable(
}
Tcl_DStringInit(&nameString);
Tcl_DStringAppend(&nameString, name, -1);
Tcl_DStringAppend(&nameString, name, TCL_NOSIZE);
TclpGetCwd(NULL, &cwd);
@@ -181,10 +181,10 @@ TclpFindExecutable(
Tcl_DStringFree(&nameString);
encoding = Tcl_GetEncoding(NULL, NULL);
Tcl_ExternalToUtfDString(encoding, Tcl_DStringValue(&buffer), -1,
Tcl_ExternalToUtfDString(encoding, Tcl_DStringValue(&buffer), TCL_NOSIZE,
&utfName);
TclSetObjNameOfExecutable(
Tcl_NewStringObj(Tcl_DStringValue(&utfName), -1), encoding);
Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_NOSIZE), encoding);
Tcl_DStringFree(&utfName);
done:
@@ -296,7 +296,7 @@ TclpMatchInDirectory(
* Now open the directory for reading and iterate over the contents.
*/
native = Tcl_UtfToExternalDString(NULL, dirName, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, dirName, TCL_NOSIZE, &ds);
if ((TclOSstat(native, &statBuf) != 0) /* INTL: Native. */
|| !S_ISDIR(statBuf.st_mode)) {
@@ -360,14 +360,14 @@ TclpMatchInDirectory(
* and pattern. If so, add the file to the result.
*/
utfname = Tcl_ExternalToUtfDString(NULL, entryPtr->d_name, -1,
utfname = Tcl_ExternalToUtfDString(NULL, entryPtr->d_name, TCL_NOSIZE,
&utfDs);
if (Tcl_StringCaseMatch(utfname, pattern, 0)) {
int typeOk = 1;
if (types != NULL) {
Tcl_DStringSetLength(&ds, nativeDirLen);
native = Tcl_DStringAppend(&ds, entryPtr->d_name, -1);
native = Tcl_DStringAppend(&ds, entryPtr->d_name, TCL_NOSIZE);
matchResult = NativeMatchType(interp, native,
entryPtr->d_name, types);
typeOk = (matchResult == 1);
@@ -585,7 +585,7 @@ TclpGetUserHome(
{
struct passwd *pwPtr;
Tcl_DString ds;
const char *native = Tcl_UtfToExternalDString(NULL, name, -1, &ds);
const char *native = Tcl_UtfToExternalDString(NULL, name, TCL_NOSIZE, &ds);
pwPtr = TclpGetPwNam(native); /* INTL: Native. */
Tcl_DStringFree(&ds);
@@ -593,7 +593,7 @@ TclpGetUserHome(
if (pwPtr == NULL) {
return NULL;
}
Tcl_ExternalToUtfDString(NULL, pwPtr->pw_dir, -1, bufferPtr);
Tcl_ExternalToUtfDString(NULL, pwPtr->pw_dir, TCL_NOSIZE, bufferPtr);
return Tcl_DStringValue(bufferPtr);
}
@@ -772,7 +772,7 @@ TclpGetCwd(
}
return NULL;
}
return Tcl_ExternalToUtfDString(NULL, buffer, -1, bufferPtr);
return Tcl_ExternalToUtfDString(NULL, buffer, TCL_NOSIZE, bufferPtr);
}
/*
@@ -807,7 +807,7 @@ TclpReadlink(
const char *native;
Tcl_DString ds;
native = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, path, TCL_NOSIZE, &ds);
length = readlink(native, link, sizeof(link)); /* INTL: Native. */
Tcl_DStringFree(&ds);
@@ -1049,7 +1049,7 @@ TclpNativeToNormalized(
{
Tcl_DString ds;
Tcl_ExternalToUtfDString(NULL, (const char *) clientData, -1, &ds);
Tcl_ExternalToUtfDString(NULL, (const char *) clientData, TCL_NOSIZE, &ds);
return TclDStringToObj(&ds);
}
+15 -15
View File
@@ -476,7 +476,7 @@ TclpInitLibraryPath(
*/
str = getenv("TCL_LIBRARY"); /* INTL: Native. */
Tcl_ExternalToUtfDString(NULL, str, -1, &buffer);
Tcl_ExternalToUtfDString(NULL, str, TCL_NOSIZE, &buffer);
str = Tcl_DStringValue(&buffer);
if ((str != NULL) && (str[0] != '\0')) {
@@ -499,7 +499,7 @@ TclpInitLibraryPath(
* If TCL_LIBRARY is set, search there.
*/
Tcl_ListObjAppendElement(NULL, pathPtr, Tcl_NewStringObj(str, -1));
Tcl_ListObjAppendElement(NULL, pathPtr, Tcl_NewStringObj(str, TCL_NOSIZE));
Tcl_SplitPath(str, &pathc, &pathv);
if ((pathc > 0) && (strcasecmp(installLib + 4, pathv[pathc-1]) != 0)) {
@@ -540,7 +540,7 @@ TclpInitLibraryPath(
str = defaultLibraryDir;
}
if (str[0] != '\0') {
objPtr = Tcl_NewStringObj(str, -1);
objPtr = Tcl_NewStringObj(str, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
}
}
@@ -643,13 +643,13 @@ Tcl_GetEncodingNameFromEnvironment(
*/
Tcl_DStringInit(&ds);
encoding = Tcl_DStringAppend(&ds, nl_langinfo(CODESET), -1);
encoding = Tcl_DStringAppend(&ds, nl_langinfo(CODESET), TCL_NOSIZE);
Tcl_UtfToLower(Tcl_DStringValue(&ds));
knownEncoding = SearchKnownEncodings(encoding);
if (knownEncoding != NULL) {
Tcl_DStringAppend(bufPtr, knownEncoding, -1);
Tcl_DStringAppend(bufPtr, knownEncoding, TCL_NOSIZE);
} else if (NULL != Tcl_GetEncoding(NULL, encoding)) {
Tcl_DStringAppend(bufPtr, encoding, -1);
Tcl_DStringAppend(bufPtr, encoding, TCL_NOSIZE);
}
Tcl_DStringFree(&ds);
if (Tcl_DStringLength(bufPtr)) {
@@ -681,14 +681,14 @@ Tcl_GetEncodingNameFromEnvironment(
Tcl_DStringInit(&ds);
p = encoding;
encoding = Tcl_DStringAppend(&ds, p, -1);
encoding = Tcl_DStringAppend(&ds, p, TCL_NOSIZE);
Tcl_UtfToLower(Tcl_DStringValue(&ds));
knownEncoding = SearchKnownEncodings(encoding);
if (knownEncoding != NULL) {
Tcl_DStringAppend(bufPtr, knownEncoding, -1);
Tcl_DStringAppend(bufPtr, knownEncoding, TCL_NOSIZE);
} else if (NULL != Tcl_GetEncoding(NULL, encoding)) {
Tcl_DStringAppend(bufPtr, encoding, -1);
Tcl_DStringAppend(bufPtr, encoding, TCL_NOSIZE);
}
if (Tcl_DStringLength(bufPtr)) {
Tcl_DStringFree(&ds);
@@ -709,9 +709,9 @@ Tcl_GetEncodingNameFromEnvironment(
if (*p != '\0') {
knownEncoding = SearchKnownEncodings(p);
if (knownEncoding != NULL) {
Tcl_DStringAppend(bufPtr, knownEncoding, -1);
Tcl_DStringAppend(bufPtr, knownEncoding, TCL_NOSIZE);
} else if (NULL != Tcl_GetEncoding(NULL, p)) {
Tcl_DStringAppend(bufPtr, p, -1);
Tcl_DStringAppend(bufPtr, p, TCL_NOSIZE);
}
}
Tcl_DStringFree(&ds);
@@ -719,7 +719,7 @@ Tcl_GetEncodingNameFromEnvironment(
return Tcl_DStringValue(bufPtr);
}
}
return Tcl_DStringAppend(bufPtr, TCL_DEFAULT_ENCODING, -1);
return Tcl_DStringAppend(bufPtr, TCL_DEFAULT_ENCODING, TCL_NOSIZE);
}
/*
@@ -882,7 +882,7 @@ TclpSetVariables(
unameOK = 1;
native = Tcl_ExternalToUtfDString(NULL, name.sysname, -1, &ds);
native = Tcl_ExternalToUtfDString(NULL, name.sysname, TCL_NOSIZE, &ds);
Tcl_SetVar2(interp, "tcl_platform", "os", native, TCL_GLOBAL_ONLY);
Tcl_DStringFree(&ds);
@@ -945,7 +945,7 @@ TclpSetVariables(
user = "";
Tcl_DStringInit(&ds); /* ensure cleanliness */
} else {
user = Tcl_ExternalToUtfDString(NULL, pwEnt->pw_name, -1, &ds);
user = Tcl_ExternalToUtfDString(NULL, pwEnt->pw_name, TCL_NOSIZE, &ds);
}
Tcl_SetVar2(interp, "tcl_platform", "user", user, TCL_GLOBAL_ONLY);
@@ -994,7 +994,7 @@ TclpFindVariable(
Tcl_DStringInit(&envString);
for (i = 0, env = environ[i]; env != NULL; i++, env = environ[i]) {
p1 = Tcl_ExternalToUtfDString(NULL, env, -1, &envString);
p1 = Tcl_ExternalToUtfDString(NULL, env, TCL_NOSIZE, &envString);
p2 = name;
for (; *p2 == *p1; p1++, p2++) {
+3 -3
View File
@@ -141,7 +141,7 @@ TclpOpenFile(
const char *native;
Tcl_DString ds;
native = Tcl_UtfToExternalDString(NULL, fname, -1, &ds);
native = Tcl_UtfToExternalDString(NULL, fname, TCL_NOSIZE, &ds);
fd = TclOSopen(native, mode, 0666); /* INTL: Native. */
Tcl_DStringFree(&ds);
if (fd != -1) {
@@ -198,7 +198,7 @@ TclpCreateTempFile(
Tcl_DString dstring;
char *native;
native = Tcl_UtfToExternalDString(NULL, contents, -1, &dstring);
native = Tcl_UtfToExternalDString(NULL, contents, TCL_NOSIZE, &dstring);
if (write(fd, native, Tcl_DStringLength(&dstring)) == -1) {
close(fd);
Tcl_DStringFree(&dstring);
@@ -434,7 +434,7 @@ TclpCreateProcess(
newArgv = TclStackAlloc(interp, (argc+1) * sizeof(char *));
newArgv[argc] = NULL;
for (i = 0; i < argc; i++) {
newArgv[i] = Tcl_UtfToExternalDString(NULL, argv[i], -1, &dsArray[i]);
newArgv[i] = Tcl_UtfToExternalDString(NULL, argv[i], TCL_NOSIZE, &dsArray[i]);
}
#ifdef USE_VFORK
+5 -5
View File
@@ -613,7 +613,7 @@ TcpClose2Proc(
default:
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"socket close2proc called bidirectionally", -1));
"socket close2proc called bidirectionally", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -681,7 +681,7 @@ TcpGetOptionProc(
statePtr->status = 0;
}
if (err != 0) {
Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(err), -1);
Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(err), TCL_NOSIZE);
}
return TCL_OK;
}
@@ -1397,13 +1397,13 @@ Tcl_OpenTcpServer(
return statePtr->channel;
}
if (interp != NULL) {
Tcl_Obj *errorObj = Tcl_NewStringObj("couldn't open socket: ", -1);
Tcl_Obj *errorObj = Tcl_NewStringObj("couldn't open socket: ", TCL_NOSIZE);
if (errorMsg == NULL) {
errno = my_errno;
Tcl_AppendToObj(errorObj, Tcl_PosixError(interp), -1);
Tcl_AppendToObj(errorObj, Tcl_PosixError(interp), TCL_NOSIZE);
} else {
Tcl_AppendToObj(errorObj, errorMsg, -1);
Tcl_AppendToObj(errorObj, errorMsg, TCL_NOSIZE);
}
Tcl_SetObjResult(interp, errorObj);
}
+13 -13
View File
@@ -347,8 +347,8 @@ DoRenameFile(
CharLower(nativeSrcPath);
CharLower(nativeDstPath);
src = Tcl_WinTCharToUtf(nativeSrcPath, -1, &srcString);
dst = Tcl_WinTCharToUtf(nativeDstPath, -1, &dstString);
src = Tcl_WinTCharToUtf(nativeSrcPath, TCL_NOSIZE, &srcString);
dst = Tcl_WinTCharToUtf(nativeDstPath, TCL_NOSIZE, &dstString);
/*
* Check whether the destination path is actually inside the
@@ -930,8 +930,8 @@ TclpObjCopyDirectory(
return TCL_ERROR;
}
Tcl_WinUtfToTChar(Tcl_GetString(normSrcPtr), -1, &srcString);
Tcl_WinUtfToTChar(Tcl_GetString(normDestPtr), -1, &dstString);
Tcl_WinUtfToTChar(Tcl_GetString(normSrcPtr), TCL_NOSIZE, &srcString);
Tcl_WinUtfToTChar(Tcl_GetString(normDestPtr), TCL_NOSIZE, &dstString);
ret = TraverseWinTree(TraversalCopy, &srcString, &dstString, &ds);
@@ -944,7 +944,7 @@ TclpObjCopyDirectory(
} else if (!strcmp(Tcl_DStringValue(&ds), TclGetString(normDestPtr))) {
*errorPtr = destPathPtr;
} else {
*errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
*errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), TCL_NOSIZE);
}
Tcl_DStringFree(&ds);
Tcl_IncrRefCount(*errorPtr);
@@ -1003,7 +1003,7 @@ TclpObjRemoveDirectory(
if (normPtr == NULL) {
return TCL_ERROR;
}
Tcl_WinUtfToTChar(Tcl_GetString(normPtr), -1, &native);
Tcl_WinUtfToTChar(Tcl_GetString(normPtr), TCL_NOSIZE, &native);
ret = DoRemoveDirectory(&native, recursive, &ds);
Tcl_DStringFree(&native);
} else {
@@ -1170,7 +1170,7 @@ DoRemoveJustDirectory(
end:
if (errorPtr != NULL) {
Tcl_WinTCharToUtf(nativePath, -1, errorPtr);
Tcl_WinTCharToUtf(nativePath, TCL_NOSIZE, errorPtr);
}
return TCL_ERROR;
@@ -1381,7 +1381,7 @@ TraverseWinTree(
if (nativeErrfile != NULL) {
TclWinConvertError(GetLastError());
if (errorPtr != NULL) {
Tcl_WinTCharToUtf(nativeErrfile, -1, errorPtr);
Tcl_WinTCharToUtf(nativeErrfile, TCL_NOSIZE, errorPtr);
}
result = TCL_ERROR;
}
@@ -1446,7 +1446,7 @@ TraversalCopy(
*/
if (errorPtr != NULL) {
Tcl_WinTCharToUtf(nativeDst, -1, errorPtr);
Tcl_WinTCharToUtf(nativeDst, TCL_NOSIZE, errorPtr);
}
return TCL_ERROR;
}
@@ -1501,7 +1501,7 @@ TraversalDelete(
}
if (errorPtr != NULL) {
Tcl_WinTCharToUtf(nativeSrc, -1, errorPtr);
Tcl_WinTCharToUtf(nativeSrc, TCL_NOSIZE, errorPtr);
}
return TCL_ERROR;
}
@@ -1760,7 +1760,7 @@ ConvertFileNameFormat(
*/
Tcl_DStringInit(&dsTemp);
Tcl_WinTCharToUtf(nativeName, -1, &dsTemp);
Tcl_WinTCharToUtf(nativeName, TCL_NOSIZE, &dsTemp);
Tcl_DStringFree(&ds);
/*
@@ -1999,14 +1999,14 @@ TclpObjListVolumes(void)
buf[0] = (char) ('a' + i);
if (GetVolumeInformationA(buf, NULL, 0, NULL, NULL, NULL, NULL, 0)
|| (GetLastError() == ERROR_NOT_READY)) {
elemPtr = Tcl_NewStringObj(buf, -1);
elemPtr = Tcl_NewStringObj(buf, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, resultPtr, elemPtr);
}
}
} else {
for (p = buf; *p != '\0'; p += 4) {
p[2] = '/';
elemPtr = Tcl_NewStringObj(p, -1);
elemPtr = Tcl_NewStringObj(p, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, resultPtr, elemPtr);
}
}
+14 -14
View File
@@ -878,7 +878,7 @@ TclpFindExecutable(
#endif
WideCharToMultiByte(CP_UTF8, 0, wName, -1, name, sizeof(name), NULL, NULL);
TclWinNoBackslash(name);
TclSetObjNameOfExecutable(Tcl_NewStringObj(name, -1), NULL);
TclSetObjNameOfExecutable(Tcl_NewStringObj(name, TCL_NOSIZE), NULL);
}
/*
@@ -1014,12 +1014,12 @@ TclpMatchInDirectory(
* pattern.
*/
dirName = Tcl_DStringAppend(&dsOrig, pattern, -1);
dirName = Tcl_DStringAppend(&dsOrig, pattern, TCL_NOSIZE);
} else {
dirName = TclDStringAppendLiteral(&dsOrig, "*.*");
}
native = Tcl_WinUtfToTChar(dirName, -1, &ds);
native = Tcl_WinUtfToTChar(dirName, TCL_NOSIZE, &ds);
if ((types == NULL) || (types->type != TCL_GLOB_TYPE_DIR)) {
handle = FindFirstFile(native, &data);
} else {
@@ -1092,7 +1092,7 @@ TclpMatchInDirectory(
native = data.cFileName;
attr = data.dwFileAttributes;
utfname = Tcl_WinTCharToUtf(native, -1, &ds);
utfname = Tcl_WinTCharToUtf(native, TCL_NOSIZE, &ds);
if (!matchSpecialDots) {
/*
@@ -1445,7 +1445,7 @@ TclpGetUserHome(
domain = strchr(name, '@');
if (domain != NULL) {
Tcl_DStringInit(&ds);
wName = Tcl_UtfToUniCharDString(domain + 1, -1, &ds);
wName = Tcl_UtfToUniCharDString(domain + 1, TCL_NOSIZE, &ds);
badDomain = NetGetDCName(NULL, wName, (LPBYTE *) wDomainPtr);
Tcl_DStringFree(&ds);
nameLen = domain - name;
@@ -1881,7 +1881,7 @@ TclpGetCwd(
&& (native[2] == '\\') && (native[3] == '\\')) {
native += 2;
}
Tcl_WinTCharToUtf((TCHAR *) native, -1, bufferPtr);
Tcl_WinTCharToUtf((TCHAR *) native, TCL_NOSIZE, bufferPtr);
/*
* Convert to forward slashes for easier use in scripts.
@@ -2060,7 +2060,7 @@ NativeDev(
const char *fullPath;
GetFullPathName(nativePath, MAX_PATH, nativeFullPath, &nativePart);
fullPath = Tcl_WinTCharToUtf(nativeFullPath, -1, &ds);
fullPath = Tcl_WinTCharToUtf(nativeFullPath, TCL_NOSIZE, &ds);
if ((fullPath[0] == '\\') && (fullPath[1] == '\\')) {
const char *p;
@@ -2361,7 +2361,7 @@ TclpFilesystemPathType(
} else {
Tcl_DString ds;
Tcl_WinTCharToUtf(volType, -1, &ds);
Tcl_WinTCharToUtf(volType, TCL_NOSIZE, &ds);
return TclDStringToObj(&ds);
}
#undef VOL_BUF_SIZE
@@ -2547,7 +2547,7 @@ TclpObjNormalizePath(
}
FindClose(handle);
TclDStringAppendLiteral(&dsNorm, "/");
Tcl_DStringAppend(&dsNorm, nativeName, -1);
Tcl_DStringAppend(&dsNorm, nativeName, TCL_NOSIZE);
}
}
}
@@ -2651,7 +2651,7 @@ TclpObjNormalizePath(
*/
nextCheckpoint = 0;
Tcl_AppendToObj(to, currentPathEndPosition, -1);
Tcl_AppendToObj(to, currentPathEndPosition, TCL_NOSIZE);
/*
* Convert link to forward slashes.
@@ -2826,7 +2826,7 @@ TclpObjNormalizePath(
tmpPathPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds),
nextCheckpoint);
Tcl_AppendToObj(tmpPathPtr, lastValidPathEnd, -1);
Tcl_AppendToObj(tmpPathPtr, lastValidPathEnd, TCL_NOSIZE);
path = Tcl_GetStringFromObj(tmpPathPtr, &len);
Tcl_SetStringObj(pathPtr, path, len);
Tcl_DecrRefCount(tmpPathPtr);
@@ -2899,7 +2899,7 @@ TclWinVolumeRelativeNormalize(
const char *drive = Tcl_GetString(useThisCwd);
absolutePath = Tcl_NewStringObj(drive,2);
Tcl_AppendToObj(absolutePath, path, -1);
Tcl_AppendToObj(absolutePath, path, TCL_NOSIZE);
Tcl_IncrRefCount(absolutePath);
/*
@@ -2953,7 +2953,7 @@ TclWinVolumeRelativeNormalize(
Tcl_AppendToObj(absolutePath, "/", 1);
}
Tcl_IncrRefCount(absolutePath);
Tcl_AppendToObj(absolutePath, path+2, -1);
Tcl_AppendToObj(absolutePath, path+2, TCL_NOSIZE);
}
*useThisCwdPtr = useThisCwd;
return absolutePath;
@@ -2989,7 +2989,7 @@ TclpNativeToNormalized(
int len;
char *copy, *p;
Tcl_WinTCharToUtf((const TCHAR *) clientData, -1, &ds);
Tcl_WinTCharToUtf((const TCHAR *) clientData, TCL_NOSIZE, &ds);
copy = Tcl_DStringValue(&ds);
len = Tcl_DStringLength(&ds);
+5 -5
View File
@@ -287,7 +287,7 @@ AppendEnvironment(
}
if (buf[0] != '\0') {
objPtr = Tcl_NewStringObj(buf, -1);
objPtr = Tcl_NewStringObj(buf, TCL_NOSIZE);
Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
TclWinNoBackslash(buf);
@@ -311,7 +311,7 @@ AppendEnvironment(
(void) Tcl_JoinPath(pathc, pathv, &ds);
objPtr = TclDStringToObj(&ds);
} else {
objPtr = Tcl_NewStringObj(buf, -1);
objPtr = Tcl_NewStringObj(buf, TCL_NOSIZE);
}
Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
ckfree(pathv);
@@ -587,11 +587,11 @@ TclpSetVariables(
if (ptr == NULL) {
ptr = Tcl_GetVar2(interp, "env", "HOMEDRIVE", TCL_GLOBAL_ONLY);
if (ptr != NULL) {
Tcl_DStringAppend(&ds, ptr, -1);
Tcl_DStringAppend(&ds, ptr, TCL_NOSIZE);
}
ptr = Tcl_GetVar2(interp, "env", "HOMEPATH", TCL_GLOBAL_ONLY);
if (ptr != NULL) {
Tcl_DStringAppend(&ds, ptr, -1);
Tcl_DStringAppend(&ds, ptr, TCL_NOSIZE);
}
if (Tcl_DStringLength(&ds) > 0) {
Tcl_SetVar2(interp, "env", "HOME", Tcl_DStringValue(&ds),
@@ -677,7 +677,7 @@ TclpFindVariable(
* after the equal sign.
*/
envUpper = Tcl_ExternalToUtfDString(NULL, env, -1, &envString);
envUpper = Tcl_ExternalToUtfDString(NULL, env, TCL_NOSIZE, &envString);
p1 = strchr(envUpper, '=');
if (p1 == NULL) {
continue;
+7 -7
View File
@@ -84,7 +84,7 @@ TclpDlopen(
Tcl_DString ds;
nativeName = Tcl_WinUtfToTChar(Tcl_GetString(pathPtr), -1, &ds);
nativeName = Tcl_WinUtfToTChar(Tcl_GetString(pathPtr), TCL_NOSIZE, &ds);
hInstance = LoadLibraryEx(nativeName, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
Tcl_DStringFree(&ds);
@@ -110,27 +110,27 @@ TclpDlopen(
Tcl_SetErrorCode(interp, "WIN_LOAD", "DLL_NOT_FOUND", NULL);
notFoundMsg:
Tcl_AppendToObj(errMsg, "this library or a dependent library"
" could not be found in library path", -1);
" could not be found in library path", TCL_NOSIZE);
break;
case ERROR_PROC_NOT_FOUND:
Tcl_SetErrorCode(interp, "WIN_LOAD", "PROC_NOT_FOUND", NULL);
Tcl_AppendToObj(errMsg, "A function specified in the import"
" table could not be resolved by the system. Windows"
" is not telling which one, I'm sorry.", -1);
" is not telling which one, I'm sorry.", TCL_NOSIZE);
break;
case ERROR_INVALID_DLL:
Tcl_SetErrorCode(interp, "WIN_LOAD", "INVALID_DLL", NULL);
Tcl_AppendToObj(errMsg, "this library or a dependent library"
" is damaged", -1);
" is damaged", TCL_NOSIZE);
break;
case ERROR_DLL_INIT_FAILED:
Tcl_SetErrorCode(interp, "WIN_LOAD", "DLL_INIT_FAILED", NULL);
Tcl_AppendToObj(errMsg, "the library initialization"
" routine failed", -1);
" routine failed", TCL_NOSIZE);
break;
default:
TclWinConvertError(lastError);
Tcl_AppendToObj(errMsg, Tcl_PosixError(interp), -1);
Tcl_AppendToObj(errMsg, Tcl_PosixError(interp), TCL_NOSIZE);
}
Tcl_SetObjResult(interp, errMsg);
return TCL_ERROR;
@@ -186,7 +186,7 @@ FindSymbol(
Tcl_DStringInit(&ds);
TclDStringAppendLiteral(&ds, "_");
sym2 = Tcl_DStringAppend(&ds, symbol, -1);
sym2 = Tcl_DStringAppend(&ds, symbol, TCL_NOSIZE);
proc = (Tcl_PackageInitProc *) GetProcAddress(hInstance, sym2);
Tcl_DStringFree(&ds);
}
+6 -6
View File
@@ -581,7 +581,7 @@ TclpOpenFile(
break;
}
nativePath = Tcl_WinUtfToTChar(path, -1, &ds);
nativePath = Tcl_WinUtfToTChar(path, TCL_NOSIZE, &ds);
/*
* If the file is not being created, use the existing file attributes.
@@ -682,7 +682,7 @@ TclpCreateTempFile(
* Convert the contents from UTF to native encoding
*/
native = Tcl_UtfToExternalDString(NULL, contents, -1, &dstring);
native = Tcl_UtfToExternalDString(NULL, contents, TCL_NOSIZE, &dstring);
toCopy = Tcl_DStringLength(&dstring);
for (p = native; toCopy > 0; p++, toCopy--) {
@@ -1312,12 +1312,12 @@ ApplicationType(
applType = APPL_NONE;
Tcl_DStringInit(&nameBuf);
Tcl_DStringAppend(&nameBuf, originalName, -1);
Tcl_DStringAppend(&nameBuf, originalName, TCL_NOSIZE);
nameLen = Tcl_DStringLength(&nameBuf);
for (i = 0; i < (int) (sizeof(extensions) / sizeof(extensions[0])); i++) {
Tcl_DStringSetLength(&nameBuf, nameLen);
Tcl_DStringAppend(&nameBuf, extensions[i], -1);
Tcl_DStringAppend(&nameBuf, extensions[i], TCL_NOSIZE);
nativeName = Tcl_WinUtfToTChar(Tcl_DStringValue(&nameBuf),
Tcl_DStringLength(&nameBuf), &ds);
found = SearchPath(NULL, nativeName, NULL, MAX_PATH,
@@ -1336,7 +1336,7 @@ ApplicationType(
if ((attr == 0xffffffff) || (attr & FILE_ATTRIBUTE_DIRECTORY)) {
continue;
}
strcpy(fullName, Tcl_WinTCharToUtf(nativeFullPath, -1, &ds));
strcpy(fullName, Tcl_WinTCharToUtf(nativeFullPath, TCL_NOSIZE, &ds));
Tcl_DStringFree(&ds);
ext = strrchr(fullName, '.');
@@ -1426,7 +1426,7 @@ ApplicationType(
*/
GetShortPathName(nativeFullPath, nativeFullPath, MAX_PATH);
strcpy(fullName, Tcl_WinTCharToUtf(nativeFullPath, -1, &ds));
strcpy(fullName, Tcl_WinTCharToUtf(nativeFullPath, TCL_NOSIZE, &ds));
Tcl_DStringFree(&ds);
}
return applType;
+5 -5
View File
@@ -1675,7 +1675,7 @@ SerialSetOptionProc(
if (!GetCommState(infoPtr->handle, &dcb)) {
goto getStateFailed;
}
native = Tcl_WinUtfToTChar(value, -1, &ds);
native = Tcl_WinUtfToTChar(value, TCL_NOSIZE, &ds);
result = BuildCommDCB(native, &dcb);
Tcl_DStringFree(&ds);
@@ -1776,7 +1776,7 @@ SerialSetOptionProc(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"bad value for -xchar: should be a list of"
" two elements with each a single character", -1));
" two elements with each a single character", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "XCHAR", NULL);
}
ckfree(argv);
@@ -1849,7 +1849,7 @@ SerialSetOptionProc(
(DWORD) (flag ? SETDTR : CLRDTR))) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't set DTR signal", -1));
"can't set DTR signal", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION",
"FCONFIGURE", "TTY_SIGNAL", NULL);
}
@@ -1861,7 +1861,7 @@ SerialSetOptionProc(
(DWORD) (flag ? SETRTS : CLRRTS))) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't set RTS signal", -1));
"can't set RTS signal", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION",
"FCONFIGURE", "TTY_SIGNAL", NULL);
}
@@ -1873,7 +1873,7 @@ SerialSetOptionProc(
(DWORD) (flag ? SETBREAK : CLRBREAK))) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't set BREAK signal", -1));
"can't set BREAK signal", TCL_NOSIZE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION",
"FCONFIGURE", "TTY_SIGNAL", NULL);
}
+7 -7
View File
@@ -558,7 +558,7 @@ TclpHasSockets(
}
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"sockets are not available on this system", -1));
"sockets are not available on this system", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -991,7 +991,7 @@ TcpClose2Proc(
default:
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"Socket close2proc called bidirectionally", -1));
"Socket close2proc called bidirectionally", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -1989,7 +1989,7 @@ TcpSetOptionProc(
if (!SocketsEnabled()) {
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"winsock is not initialized", -1));
"winsock is not initialized", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -2096,7 +2096,7 @@ TcpGetOptionProc(
if (!SocketsEnabled()) {
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"winsock is not initialized", -1));
"winsock is not initialized", TCL_NOSIZE));
}
return TCL_ERROR;
}
@@ -2120,7 +2120,7 @@ TcpGetOptionProc(
}
if (err) {
TclWinConvertError(err);
Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(Tcl_GetErrno()), -1);
Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(Tcl_GetErrno()), TCL_NOSIZE);
}
return TCL_OK;
}
@@ -2644,7 +2644,7 @@ InitializeHostName(
* Convert string from native to UTF then change to lowercase.
*/
Tcl_UtfToLower(Tcl_WinTCharToUtf(tbuf, -1, &ds));
Tcl_UtfToLower(Tcl_WinTCharToUtf(tbuf, TCL_NOSIZE, &ds));
} else {
Tcl_DStringInit(&ds);
@@ -2660,7 +2660,7 @@ InitializeHostName(
Tcl_DStringSetLength(&inDs, 256);
if (gethostname(Tcl_DStringValue(&inDs),
Tcl_DStringLength(&inDs)) == 0) {
Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&inDs), -1,
Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&inDs), TCL_NOSIZE,
&ds);
}
Tcl_DStringFree(&inDs);