diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-13 20:52:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-13 20:52:48 (GMT) |
| commit | 69eafefa7681f398b727edb23c3e44a43c40de3c (patch) | |
| tree | dc7133dc0cc04c964ccb13aaced1b77d74585728 /generic/tclIORTrans.c | |
| parent | 2154b6c5ba00cfe39c12276f046c9411383abf78 (diff) | |
| parent | 73e0989e22d41d6dd5e0122915888cd917acfa4a (diff) | |
| download | tcl-69eafefa7681f398b727edb23c3e44a43c40de3c.zip tcl-69eafefa7681f398b727edb23c3e44a43c40de3c.tar.gz tcl-69eafefa7681f398b727edb23c3e44a43c40de3c.tar.bz2 | |
merge trunk
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 75f6615..178db52 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); } |