diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2018-09-21 09:29:24 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2018-09-21 09:29:24 (GMT) |
| commit | d025ae5c08c20fe811f1917da0408e1f23768786 (patch) | |
| tree | 66859d52f14255fb384c2699df0a8143a7b39b77 /generic/tclIORTrans.c | |
| parent | fbef9aa84089336e767f0dafe410df51b4f1d3b3 (diff) | |
| parent | bd42171094d5ada2e2e46978f2e842a66b6fa44e (diff) | |
| download | tcl-d025ae5c08c20fe811f1917da0408e1f23768786.zip tcl-d025ae5c08c20fe811f1917da0408e1f23768786.tar.gz tcl-d025ae5c08c20fe811f1917da0408e1f23768786.tar.bz2 | |
merge core-8-branch
Diffstat (limited to 'generic/tclIORTrans.c')
| -rw-r--r-- | generic/tclIORTrans.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/generic/tclIORTrans.c b/generic/tclIORTrans.c index 1a7b940..4841e39 100644 --- a/generic/tclIORTrans.c +++ b/generic/tclIORTrans.c @@ -1340,7 +1340,7 @@ ReflectSeekWide( if (seekProc == NULL) { Tcl_SetErrno(EINVAL); - return Tcl_LongAsWide(-1); + return -1; } /* @@ -1390,16 +1390,15 @@ ReflectSeekWide( parent->typePtr->wideSeekProc != NULL) { curPos = parent->typePtr->wideSeekProc(parent->instanceData, offset, seekMode, errorCodePtr); - } else if (offset < Tcl_LongAsWide(LONG_MIN) || - offset > Tcl_LongAsWide(LONG_MAX)) { + } else if (offset < LONG_MIN || offset > LONG_MAX) { *errorCodePtr = EOVERFLOW; - curPos = Tcl_LongAsWide(-1); + curPos = -1; } else { - curPos = Tcl_LongAsWide(parent->typePtr->seekProc( - parent->instanceData, Tcl_WideAsLong(offset), seekMode, - errorCodePtr)); + curPos = parent->typePtr->seekProc( + parent->instanceData, offset, seekMode, + errorCodePtr); } - if (curPos == Tcl_LongAsWide(-1)) { + if (curPos == -1) { Tcl_SetErrno(*errorCodePtr); } @@ -1422,7 +1421,7 @@ ReflectSeek( * routine. */ - return (int) ReflectSeekWide(clientData, Tcl_LongAsWide(offset), seekMode, + return ReflectSeekWide(clientData, offset, seekMode, errorCodePtr); } |