diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-30 13:27:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-30 13:27:57 (GMT) |
| commit | 29b9dd2e6f727b0e941ebfb7137545d235f5d7ea (patch) | |
| tree | 8273c4a9b6d6e8e961792a8080f5f29a7cc5c171 /generic/tclIORTrans.c | |
| parent | 9d8c640e00e432782bc30d6dcbd78b83a959dfee (diff) | |
| parent | 64fdac4aec06a54d95bb8916c7a8e3cebf2cde20 (diff) | |
| download | tcl-29b9dd2e6f727b0e941ebfb7137545d235f5d7ea.zip tcl-29b9dd2e6f727b0e941ebfb7137545d235f5d7ea.tar.gz tcl-29b9dd2e6f727b0e941ebfb7137545d235f5d7ea.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclIORTrans.c')
| -rw-r--r-- | generic/tclIORTrans.c | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/generic/tclIORTrans.c b/generic/tclIORTrans.c index 5fbd511..ec18767 100644 --- a/generic/tclIORTrans.c +++ b/generic/tclIORTrans.c @@ -27,10 +27,6 @@ #define EOK 0 #endif -/* DUPLICATE of HaveVersion() in tclIO.c // TODO - MODULE_SCOPE */ -static int HaveVersion(const Tcl_ChannelType *typePtr, - Tcl_ChannelTypeVersion minimumVersion); - /* * Signatures of all functions used in the C layer of the reflection. */ @@ -1386,15 +1382,14 @@ ReflectSeekWide( * non-NULL... */ - if (HaveVersion(parent->typePtr, TCL_CHANNEL_VERSION_3) && - parent->typePtr->wideSeekProc != NULL) { - curPos = parent->typePtr->wideSeekProc(parent->instanceData, offset, + if (Tcl_ChannelWideSeekProc(parent->typePtr) != NULL) { + curPos = Tcl_ChannelWideSeekProc(parent->typePtr)(parent->instanceData, offset, seekMode, errorCodePtr); } else if (offset < LONG_MIN || offset > LONG_MAX) { *errorCodePtr = EOVERFLOW; curPos = -1; } else { - curPos = parent->typePtr->seekProc( + curPos = Tcl_ChannelSeekProc(parent->typePtr)( parent->instanceData, offset, seekMode, errorCodePtr); } @@ -3390,33 +3385,6 @@ TransformLimit( return 1; } -/* DUPLICATE of HaveVersion() in tclIO.c - *---------------------------------------------------------------------- - * - * HaveVersion -- - * - * Return whether a channel type is (at least) of a given version. - * - * Results: - * True if the minimum version is exceeded by the version actually - * present. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ - -static int -HaveVersion( - const Tcl_ChannelType *chanTypePtr, - Tcl_ChannelTypeVersion minimumVersion) -{ - Tcl_ChannelTypeVersion actualVersion = Tcl_ChannelVersion(chanTypePtr); - - return PTR2INT(actualVersion) >= PTR2INT(minimumVersion); -} - /* * Local Variables: * mode: c |