diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclDecls.h | 12 | ||||
| -rw-r--r-- | generic/tclIO.c | 4 | ||||
| -rw-r--r-- | generic/tclUtil.c | 6 |
3 files changed, 5 insertions, 17 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 20f6afb..f08b931 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3817,13 +3817,9 @@ extern const TclStubs *tclStubsPtr; #if defined(TCL_USE_INT_RETURN) && !defined(BUILD_tcl) # ifdef USE_TCL_STUBS -# undef Tcl_ConvertElement -# undef Tcl_ConvertCountedElement # undef Tcl_Gets # undef Tcl_GetsObj # undef Tcl_Read -# undef Tcl_ScanElement -# undef Tcl_ScanCountedElement # undef Tcl_Ungets # undef Tcl_Write # undef Tcl_ReadChars @@ -3831,13 +3827,9 @@ extern const TclStubs *tclStubsPtr; # undef Tcl_WriteObj # undef Tcl_ReadRaw # undef Tcl_WriteRaw -# define Tcl_ConvertElement(src, dst, flags) (((Tcl_WideInt)((tclStubsPtr->tcl_ConvertElement)(src, dst, flags)+1))-1) -# define Tcl_ConvertCountedElement(src, length, dst, flags) (((Tcl_WideInt)((tclStubsPtr->tcl_ConvertCountedElement)(src, length, dst, flags)+1))-1) # define Tcl_Gets(chan, dsPtr) (((Tcl_WideInt)((tclStubsPtr->tcl_Gets)(chan, dsPtr)+1))-1) # define Tcl_GetsObj(chan, objPtr) (((Tcl_WideInt)((tclStubsPtr->tcl_GetsObj)(chan, objPtr)+1))-1) # define Tcl_Read(chan, bufPtr, toRead) (((Tcl_WideInt)((tclStubsPtr->tcl_Read)(chan, bufPtr, toRead)+1))-1) -# define Tcl_ScanElement(src, flagPtr) (((Tcl_WideInt)((tclStubsPtr->tcl_ScanElement)(src, flagPtr)+1))-1) -# define Tcl_ScanCountedElement(src, length, flagPtr) (((Tcl_WideInt)((tclStubsPtr->tcl_ScanCountedElement)(src, length, flagPtr)+1))-1) # define Tcl_Ungets(chan, str, len, atHead) (((Tcl_WideInt)((tclStubsPtr->tcl_Ungets)(chan, str, len, atHead)+1))-1) # define Tcl_Write(chan, s, slen) (((Tcl_WideInt)((tclStubsPtr->tcl_Write)(chan, s, slen)+1))-1) # define Tcl_ReadChars(channel, objPtr, charsToRead, appendFlag) (((Tcl_WideInt)((tclStubsPtr->tcl_ReadChars)(channel, objPtr, charsToRead, appendFlag)+1))-1) @@ -3846,13 +3838,9 @@ extern const TclStubs *tclStubsPtr; # define Tcl_ReadRaw(chan, dst, bytesToRead) (((Tcl_WideInt)((tclStubsPtr->tcl_ReadRaw)(chan, dst, bytesToRead)+1))-1) # define Tcl_WriteRaw(chan, src, srcLen) (((Tcl_WideInt)((tclStubsPtr->tcl_WriteRaw()(chan, src, srcLen)+1))-1) # else -# define Tcl_ConvertElement(src, dst, flags) (((Tcl_WideInt)((Tcl_ConvertElement)(src, dst, flags)+1))-1) -# define Tcl_ConvertCountedElement(src, length, dst, flags) (((Tcl_WideInt)((Tcl_ConvertCountedElement)(src, length, dst, flags)+1))-1) # define Tcl_Gets(chan, dsPtr) (((Tcl_WideInt)((Tcl_Gets)(chan, dsPtr)+1))-1) # define Tcl_GetsObj(chan, objPtr) (((Tcl_WideInt)((Tcl_GetsObj)(chan, objPtr)+1))-1) # define Tcl_Read(chan, bufPtr, toRead) (((Tcl_WideInt)((Tcl_Read)(chan, bufPtr, toRead)+1))-1) -# define Tcl_ScanElement(src, flagPtr) (((Tcl_WideInt)((Tcl_ScanElement)(src, flagPtr)+1))-1) -# define Tcl_ScanCountedElement(src, length, flagPtr) (((Tcl_WideInt)((Tcl_ScanCountedElement)(src, length, flagPtr)+1))-1) # define Tcl_Ungets(chan, str, len, atHead) (((Tcl_WideInt)((Tcl_Ungets)(chan, str, len, atHead)+1))-1) # define Tcl_Write(chan, s, slen) (((Tcl_WideInt)((Tcl_Write)(chan, s, slen)+1))-1) # define Tcl_ReadChars(channel, objPtr, charsToRead, appendFlag) (((Tcl_WideInt)((Tcl_ReadChars)(channel, objPtr, charsToRead, appendFlag)+1))-1) diff --git a/generic/tclIO.c b/generic/tclIO.c index b1abc43..bf70476 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -4471,7 +4471,7 @@ Tcl_Gets( TclNewObj(objPtr); charsStored = Tcl_GetsObj(chan, objPtr); - if (charsStored > 0) { + if (charsStored + 1 > 1) { TclDStringAppendObj(lineRead, objPtr); } TclDecrRefCount(objPtr); @@ -4660,7 +4660,7 @@ Tcl_GetsObj( */ if (eol >= dstEnd) { - int offset; + size_t offset; if (eol != eof) { offset = eol - objPtr->bytes; diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 8313408..ca91275 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -1435,7 +1435,7 @@ TclConvertElement( } *p = '}'; p++; - return p - dst; + return (size_t)(p - dst); } /* conversion == CONVERT_ESCAPE or CONVERT_MASK */ @@ -1498,7 +1498,7 @@ TclConvertElement( continue; case '\0': if (length == (size_t)-1) { - return p - dst; + return (size_t)(p - dst); } /* @@ -1514,7 +1514,7 @@ TclConvertElement( *p = *src; p++; } - return p - dst; + return (size_t)(p - dst); } /* |