<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/8d549503c2ad132a6a1f77367d236a1dc1cc875e">https://github.com/macports/macports-base/commit/8d549503c2ad132a6a1f77367d236a1dc1cc875e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8d549503c2ad132a6a1f77367d236a1dc1cc875e
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Mon Jun 22 00:30:24 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> tclx8.4: Use Tcl_Panic instead of deprecated / implicitly declared panic()
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 599111920090326d17a90853f9db5fd3c617b336)
</span>---
vendor/tclx8.4/generic/tclExtdInt.h | 2 +-
vendor/tclx8.4/generic/tclXdup.c | 2 +-
vendor/tclx8.4/generic/tclXfcntl.c | 4 ++--
vendor/tclx8.4/generic/tclXhandles.c | 2 +-
vendor/tclx8.4/generic/tclXprofile.c | 12 ++++++------
vendor/tclx8.4/generic/tclXsignal.c | 6 +++---
vendor/tclx8.4/generic/tclXstring.c | 2 +-
vendor/tclx8.4/generic/tclXutil.c | 10 +++++-----
8 files changed, 20 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx8.4/generic/tclExtdInt.h b/vendor/tclx8.4/generic/tclExtdInt.h
</span><span style='display:block; white-space:pre;color:#808080;'>index fd3812ff..ffa8b30a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx8.4/generic/tclExtdInt.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx8.4/generic/tclExtdInt.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@
</span> */
#ifdef TCLX_DEBUG
# define TclX_Assert(expr) ((expr) ? (void)0 : \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic("TclX assertion failure: %s:%d \"%s\"\n",\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic("TclX assertion failure: %s:%d \"%s\"\n",\
</span> __FILE__, __LINE__, "expr"))
#else
# define TclX_Assert(expr)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx8.4/generic/tclXdup.c b/vendor/tclx8.4/generic/tclXdup.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 41f3eec3..263e5d48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx8.4/generic/tclXdup.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx8.4/generic/tclXdup.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,7 @@ DupChannelOptions (interp, srcChannel, targetChannel)
</span> goto errorExit;
}
if ((optArgc % 2) != 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic("channel didn't return keyword/value pairs");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic("channel didn't return keyword/value pairs");
</span> }
for (idx = 0; idx < optArgc; idx += 2) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx8.4/generic/tclXfcntl.c b/vendor/tclx8.4/generic/tclXfcntl.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 43a26117..a83e8af1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx8.4/generic/tclXfcntl.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx8.4/generic/tclXfcntl.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,7 +211,7 @@ GetFcntlAttr (interp, channel, mode, attrib)
</span> return TCL_ERROR;
break;
default:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("bug in fcntl get attrib");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("bug in fcntl get attrib");
</span> }
Tcl_SetIntObj (Tcl_GetObjResult (interp), value != 0);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,7 +267,7 @@ SetFcntlAttrObj (interp, channel, attrib, valueObj)
</span> case ATTR_KEEPALIVE:
return TclXOSsetsockopt (interp, channel, SO_KEEPALIVE, value);
default:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("buf in fcntl set attrib");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("buf in fcntl set attrib");
</span> }
return TCL_ERROR; /* Should never be reached */
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx8.4/generic/tclXhandles.c b/vendor/tclx8.4/generic/tclXhandles.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 83159139..cc854367 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx8.4/generic/tclXhandles.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx8.4/generic/tclXhandles.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -567,7 +567,7 @@ TclX_HandleFree (headerPtr, entryPtr)
</span>
entryHdrPtr = HEADER_AREA (entryPtr);
if (entryHdrPtr->freeLink != ALLOCATED_IDX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
</span>
entryHdrPtr->freeLink = tblHdrPtr->freeHeadIdx;
tblHdrPtr->freeHeadIdx =
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx8.4/generic/tclXprofile.c b/vendor/tclx8.4/generic/tclXprofile.c
</span><span style='display:block; white-space:pre;color:#808080;'>index e45b7866..7444aa7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx8.4/generic/tclXprofile.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx8.4/generic/tclXprofile.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,7 +240,7 @@ PushEntry (infoPtr, cmdName, isProc, procLevel, scopeLevel, evalLevel)
</span> * Only global level can be NULL.
*/
if (scanPtr == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic (PROF_PANIC, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic (PROF_PANIC, 1);
</span> }
entryPtr->prevScopePtr = scanPtr;
infoPtr->scopeChainPtr = entryPtr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,7 +450,7 @@ ProfCommandEvalSetup (infoPtr, isProcPtr)
</span> UpdateTOSTimes (infoPtr);
while (infoPtr->stackPtr->procLevel > procLevel) {
if (infoPtr->stackPtr->evalLevel != UNKNOWN_LEVEL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic (PROF_PANIC, 2); /* Not an initial entry */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic (PROF_PANIC, 2); /* Not an initial entry */
</span> PopEntry (infoPtr);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -595,15 +595,15 @@ ProfTraceRoutine (clientData, interp, evalLevel, command, cmdProc,
</span> Tcl_Command cmd;
if (infoPtr->currentCmdPtr != NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic (PROF_PANIC, 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic (PROF_PANIC, 3);
</span>
cmd = Tcl_FindCommand (interp, argv [0], NULL, 0);
if (cmd == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic (PROF_PANIC, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic (PROF_PANIC, 4);
</span> cmdPtr = (Command *) cmd;
if ((cmdPtr->proc != cmdProc) || (cmdPtr->clientData != cmdClientData))
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic (PROF_PANIC, 5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic (PROF_PANIC, 5);
</span>
/*
* If command is to be compiled, we can't profile it.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -740,7 +740,7 @@ TurnOnProfiling (infoPtr, commandMode, evalMode)
</span> * Only global level can be NULL.
*/
if (scanPtr == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic (PROF_PANIC, 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic (PROF_PANIC, 6);
</span> }
infoPtr->scopeChainPtr = scanPtr;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx8.4/generic/tclXsignal.c b/vendor/tclx8.4/generic/tclXsignal.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 21c226cb..96942a5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx8.4/generic/tclXsignal.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx8.4/generic/tclXsignal.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -649,11 +649,11 @@ SignalTrap (signalNum)
</span> #ifdef SIGCHLD
if (signalNum != SIGCHLD) {
if (SetSignalState (signalNum, SignalTrap, FALSE) == TCL_ERROR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("SignalTrap bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("SignalTrap bug");
</span> }
#else
if (SetSignalState (signalNum, SignalTrap, FALSE) == TCL_ERROR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("SignalTrap bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("SignalTrap bug");
</span> #endif /* SIGCHLD */
#endif /* NO_SIGACTION */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1581,7 +1581,7 @@ SignalCmdCleanUp (clientData, interp)
</span> break;
}
if (idx == numInterps)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("signal interp lost");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("signal interp lost");
</span>
interpTable [idx] = interpTable [--numInterps];
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx8.4/generic/tclXstring.c b/vendor/tclx8.4/generic/tclXstring.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 93e8b1e3..761148fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx8.4/generic/tclXstring.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx8.4/generic/tclXstring.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -677,7 +677,7 @@ TclX_CtypeObjCmd (dummy, interp, objc, objv)
</span> #define IS_8BIT_UNICHAR(c) (c <= 255)
if (TCL_UTF_MAX > sizeof(number)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic("TclX_CtypeObjCmd: UTF character longer than a int");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic("TclX_CtypeObjCmd: UTF character longer than a int");
</span> }
/*FIX: Split into multiple procs */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx8.4/generic/tclXutil.c b/vendor/tclx8.4/generic/tclXutil.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 633e19ba..d0ed7a48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx8.4/generic/tclXutil.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx8.4/generic/tclXutil.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -503,7 +503,7 @@ ParseTranslationOption (strValue)
</span> } else if (STREQU (strValue, "platform")) {
return TCLX_TRANSLATE_PLATFORM;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("ParseTranslationOption bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("ParseTranslationOption bug");
</span> return TCL_ERROR; /* Not reached */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -535,7 +535,7 @@ FormatTranslationOption (value)
</span> case TCLX_TRANSLATE_PLATFORM:
return "platform";
default:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("FormatTranslationOption bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("FormatTranslationOption bug");
</span> }
return NULL; /* Not reached */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -649,7 +649,7 @@ TclX_GetChannelOption (interp, channel, option, valuePtr)
</span> return TCL_OK;
fatalError:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("TclX_GetChannelOption bug"); /* FIX: return error. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("TclX_GetChannelOption bug"); /* FIX: return error. */
</span> return 0; /* Not reached */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -745,7 +745,7 @@ TclX_SetChannelOption (interp, channel, option, value)
</span> return Tcl_SetChannelOption (interp, channel, strOption, strValue);
fatalError:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("TclX_SetChannelOption bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("TclX_SetChannelOption bug");
</span> return TCL_ERROR; /* Not reached */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -965,7 +965,7 @@ TclX_RestoreResultErrorInfo (interp, saveObjPtr)
</span> /*
* This should never happen
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- panic ("invalid TclX result save object");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Panic ("invalid TclX result save object");
</span> }
Tcl_SetVar2Ex(interp, ERRORCODE, NULL, saveObjv[2], TCL_GLOBAL_ONLY);
</pre><pre style='margin:0'>
</pre>