diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-19 12:36:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-19 12:36:57 (GMT) |
| commit | cb588d3c54594f7a36c89a55d6f2d5e8f39348c5 (patch) | |
| tree | e7b12c42a2501a8952f5abac5070d7bff30c735c | |
| parent | 072c5b11392289eeeb1813fa9deecd946db1e916 (diff) | |
| parent | c670267c5ecc42904d39383d08154bde04d021bd (diff) | |
| download | tcl-cb588d3c54594f7a36c89a55d6f2d5e8f39348c5.zip tcl-cb588d3c54594f7a36c89a55d6f2d5e8f39348c5.tar.gz tcl-cb588d3c54594f7a36c89a55d6f2d5e8f39348c5.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tcl.decls | 2 | ||||
| -rw-r--r-- | generic/tclDecls.h | 12 | ||||
| -rw-r--r-- | generic/tclIO.c | 9 | ||||
| -rw-r--r-- | generic/tclIORChan.c | 4 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 4 |
5 files changed, 18 insertions, 13 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 76a1d6b..3a135ed 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2508,7 +2508,7 @@ declare 687 { # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # -declare 688 { +declare 690 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 9ea6f0c..3e3cb85 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -2018,7 +2018,9 @@ EXTERN int TclUtfNcmp(const char *s1, const char *s2, size_t n); /* 687 */ EXTERN int TclUtfNcasecmp(const char *s1, const char *s2, size_t n); -/* 688 */ +/* Slot 688 is reserved */ +/* Slot 689 is reserved */ +/* 690 */ EXTERN void TclUnusedStubEntry(void); typedef struct { @@ -2743,7 +2745,9 @@ typedef struct TclStubs { Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */ int (*tclUtfNcmp) (const char *s1, const char *s2, size_t n); /* 686 */ int (*tclUtfNcasecmp) (const char *s1, const char *s2, size_t n); /* 687 */ - void (*tclUnusedStubEntry) (void); /* 688 */ + void (*reserved688)(void); + void (*reserved689)(void); + void (*tclUnusedStubEntry) (void); /* 690 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -4134,8 +4138,10 @@ extern const TclStubs *tclStubsPtr; (tclStubsPtr->tclUtfNcmp) /* 686 */ #define TclUtfNcasecmp \ (tclStubsPtr->tclUtfNcasecmp) /* 687 */ +/* Slot 688 is reserved */ +/* Slot 689 is reserved */ #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 688 */ + (tclStubsPtr->tclUnusedStubEntry) /* 690 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclIO.c b/generic/tclIO.c index 7ed6993..9cdf1aa 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -5044,8 +5044,7 @@ Tcl_GetsObj( done: assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); @@ -6173,8 +6172,7 @@ finish: */ assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); @@ -10406,8 +10404,7 @@ DoRead( } assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c index 383d74a..58850a2 100644 --- a/generic/tclIORChan.c +++ b/generic/tclIORChan.c @@ -1624,7 +1624,7 @@ ReflectSeekWide( goto invalid; } - if (Tcl_GetWideIntFromObj(rcPtr->interp, resObj, &newLoc) != TCL_OK) { + if (TclGetWideIntFromObj(rcPtr->interp, resObj, &newLoc) != TCL_OK) { Tcl_SetChannelError(rcPtr->chan, MarshallError(rcPtr->interp)); goto invalid; } @@ -3236,7 +3236,7 @@ ForwardProc( Tcl_WideInt newLoc; - if (Tcl_GetWideIntFromObj(interp, resObj, &newLoc) == TCL_OK) { + if (TclGetWideIntFromObj(interp, resObj, &newLoc) == TCL_OK) { if (newLoc < 0) { ForwardSetStaticError(paramPtr, msg_seek_beforestart); paramPtr->seek.offset = -1; diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index e05c5b2..f97f3bd 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1984,7 +1984,9 @@ const TclStubs tclStubs = { Tcl_DStringToObj, /* 685 */ TclUtfNcmp, /* 686 */ TclUtfNcasecmp, /* 687 */ - TclUnusedStubEntry, /* 688 */ + 0, /* 688 */ + 0, /* 689 */ + TclUnusedStubEntry, /* 690 */ }; /* !END!: Do not edit above this line. */ |