diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-17 07:37:30 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-17 07:37:30 (GMT) |
commit | b4012447b017cbf05b19ee4d45eb25fc3750d75f (patch) | |
tree | eb65c0d3bbc41dc6414a8c2658726916995d5f79 /generic | |
parent | a2560488bfa084c00f4a27d363778bed1b19df92 (diff) | |
download | tcl-b4012447b017cbf05b19ee4d45eb25fc3750d75f.zip tcl-b4012447b017cbf05b19ee4d45eb25fc3750d75f.tar.gz tcl-b4012447b017cbf05b19ee4d45eb25fc3750d75f.tar.bz2 |
Rename (internal) TclSetSlaveCancelFlags() to TclSetChildCancelFlags(). Follow-up for [e5ea53f27a391285].
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tclBasic.c | 2 | ||||
-rw-r--r-- | generic/tclInt.decls | 2 | ||||
-rw-r--r-- | generic/tclIntDecls.h | 8 | ||||
-rw-r--r-- | generic/tclInterp.c | 8 | ||||
-rw-r--r-- | generic/tclStubInit.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 6c14f45..566b980 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -3796,7 +3796,7 @@ CancelEvalProc( * interpreters belonging to this one. */ - TclSetSlaveCancelFlags((Tcl_Interp *) iPtr, + TclSetChildCancelFlags((Tcl_Interp *) iPtr, cancelInfo->flags | CANCELED, 0); /* diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 8845359..0addf66 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -990,7 +990,7 @@ declare 249 { } # TIP #285: Script cancellation support. declare 250 { - void TclSetSlaveCancelFlags(Tcl_Interp *interp, int flags, int force) + void TclSetChildCancelFlags(Tcl_Interp *interp, int flags, int force) } # Allow extensions for optimization diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 2426326..b698c08 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -623,7 +623,7 @@ EXTERN int TclCopyChannel(Tcl_Interp *interp, EXTERN char * TclDoubleDigits(double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr); /* 250 */ -EXTERN void TclSetSlaveCancelFlags(Tcl_Interp *interp, int flags, +EXTERN void TclSetChildCancelFlags(Tcl_Interp *interp, int flags, int force); /* 251 */ EXTERN int TclRegisterLiteral(void *envPtr, const char *bytes, @@ -918,7 +918,7 @@ typedef struct TclIntStubs { void (*tclResetRewriteEnsemble) (Tcl_Interp *interp, int isRootEnsemble); /* 247 */ int (*tclCopyChannel) (Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, Tcl_WideInt toRead, Tcl_Obj *cmdPtr); /* 248 */ char * (*tclDoubleDigits) (double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr); /* 249 */ - void (*tclSetSlaveCancelFlags) (Tcl_Interp *interp, int flags, int force); /* 250 */ + void (*tclSetChildCancelFlags) (Tcl_Interp *interp, int flags, int force); /* 250 */ int (*tclRegisterLiteral) (void *envPtr, const char *bytes, int length, int flags); /* 251 */ Tcl_Obj * (*tclPtrGetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags); /* 252 */ Tcl_Obj * (*tclPtrSetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, const int flags); /* 253 */ @@ -1356,8 +1356,8 @@ extern const TclIntStubs *tclIntStubsPtr; (tclIntStubsPtr->tclCopyChannel) /* 248 */ #define TclDoubleDigits \ (tclIntStubsPtr->tclDoubleDigits) /* 249 */ -#define TclSetSlaveCancelFlags \ - (tclIntStubsPtr->tclSetSlaveCancelFlags) /* 250 */ +#define TclSetChildCancelFlags \ + (tclIntStubsPtr->tclSetChildCancelFlags) /* 250 */ #define TclRegisterLiteral \ (tclIntStubsPtr->tclRegisterLiteral) /* 251 */ #define TclPtrGetVar \ diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 1570837..4addffe 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -2161,7 +2161,7 @@ Tcl_GetMaster( /* *---------------------------------------------------------------------- * - * TclSetSlaveCancelFlags -- + * TclSetChildCancelFlags -- * * This function marks all slave interpreters belonging to a given * interpreter as being canceled or not canceled, depending on the @@ -2177,7 +2177,7 @@ Tcl_GetMaster( */ void -TclSetSlaveCancelFlags( +TclSetChildCancelFlags( Tcl_Interp *interp, /* Set cancel flags of this interpreter. */ int flags, /* Collection of OR-ed bits that control * the cancellation of the script. Only @@ -2220,7 +2220,7 @@ TclSetSlaveCancelFlags( * interpreter. */ - TclSetSlaveCancelFlags((Tcl_Interp *) iPtr, flags, force); + TclSetChildCancelFlags((Tcl_Interp *) iPtr, flags, force); } } @@ -2874,7 +2874,7 @@ SlaveEval( * function for that particular Tcl_Interp. */ - TclSetSlaveCancelFlags(slaveInterp, 0, 0); + TclSetChildCancelFlags(slaveInterp, 0, 0); Tcl_Preserve(slaveInterp); Tcl_AllowExceptions(slaveInterp); diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 2d2bc63..a4645b6 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -974,7 +974,7 @@ static const TclIntStubs tclIntStubs = { TclResetRewriteEnsemble, /* 247 */ TclCopyChannel, /* 248 */ TclDoubleDigits, /* 249 */ - TclSetSlaveCancelFlags, /* 250 */ + TclSetChildCancelFlags, /* 250 */ TclRegisterLiteral, /* 251 */ TclPtrGetVar, /* 252 */ TclPtrSetVar, /* 253 */ |