summaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2003-12-24 04:18:18 (GMT)
committerdavygrvy <davygrvy@pobox.com>2003-12-24 04:18:18 (GMT)
commit5d224fb11538aa654ba2028f75e5ffa06df2c579 (patch)
treeeff546c6e792fecd4310f81379419c1d68d63c28 /mac
parentbdb55bff6176c625c664d4ea5a4ec5187839d7a8 (diff)
downloadtcl-5d224fb11538aa654ba2028f75e5ffa06df2c579.zip
tcl-5d224fb11538aa654ba2028f75e5ffa06df2c579.tar.gz
tcl-5d224fb11538aa654ba2028f75e5ffa06df2c579.tar.bz2
All uses of 'panic' (the macro) changed
to 'Tcl_Panic' (the function). The #define of panic in tcl.h clearly states it is deprecated in the comments. [Patch 865264]
Diffstat (limited to 'mac')
-rw-r--r--mac/tclMacChan.c14
-rw-r--r--mac/tclMacOSA.c8
-rw-r--r--mac/tclMacResource.c16
-rw-r--r--mac/tclMacSock.c8
-rw-r--r--mac/tclMacThrd.c4
5 files changed, 25 insertions, 25 deletions
diff --git a/mac/tclMacChan.c b/mac/tclMacChan.c
index 555e333..8986e6c 100644
--- a/mac/tclMacChan.c
+++ b/mac/tclMacChan.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacChan.c,v 1.21 2003/03/03 20:22:42 das Exp $
+ * RCS: @(#) $Id: tclMacChan.c,v 1.22 2003/12/24 04:18:21 davygrvy Exp $
*/
#include "tclInt.h"
@@ -434,7 +434,7 @@ StdIOClose(
} else if (fd == 2) {
tsdPtr->stderrChannel = NULL;
} else {
- panic("recieved invalid std file");
+ Tcl_Panic("recieved invalid std file");
}
if (close(fd) < 0) {
@@ -696,7 +696,7 @@ TclpGetDefaultStdChannel(
bufMode = "none";
break;
default:
- panic("TclGetDefaultStdChannel: Unexpected channel type");
+ Tcl_Panic("TclGetDefaultStdChannel: Unexpected channel type");
break;
}
@@ -987,7 +987,7 @@ FileClose(
FlushVol(NULL, fileState->volumeRef);
if (err != noErr) {
errorCode = errno = TclMacOSErrorToPosixError(err);
- panic("error during file close");
+ Tcl_Panic("error during file close");
}
ckfree((char *) fileState);
@@ -1258,9 +1258,9 @@ TclpCutFileChannel(chan)
* local data in each thread.
*/
- if (!removed)
- panic("file info ptr not on thread channel list");
-
+ if (!removed) {
+ Tcl_Panic("file info ptr not on thread channel list");
+ }
}
/*
diff --git a/mac/tclMacOSA.c b/mac/tclMacOSA.c
index 0a38396..fdcd56e 100644
--- a/mac/tclMacOSA.c
+++ b/mac/tclMacOSA.c
@@ -12,7 +12,7 @@
* See the file "License Terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacOSA.c,v 1.10 2002/10/09 11:54:30 das Exp $
+ * RCS: @(#) $Id: tclMacOSA.c,v 1.11 2003/12/24 04:18:21 davygrvy Exp $
*/
#define MAC_TCL
@@ -222,7 +222,7 @@ Tclapplescript_Init(
LanguagesTable = (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
if (LanguagesTable == NULL) {
- panic("Memory Error Allocating Languages Hash Table");
+ Tcl_Panic("Memory Error Allocating Languages Hash Table");
}
Tcl_SetAssocData(interp, "OSAScript_LangTable", NULL, LanguagesTable);
@@ -300,7 +300,7 @@ Tclapplescript_Init(
ComponentTable = (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
if (ComponentTable == NULL) {
- panic("Memory Error Allocating Hash Table");
+ Tcl_Panic("Memory Error Allocating Hash Table");
}
Tcl_SetAssocData(interp, "OSAScript_CompTable", NULL, ComponentTable);
@@ -1860,7 +1860,7 @@ tclOSAClose(
"OSAScript_CompTable", (Tcl_InterpDeleteProc **) NULL);
if (ComponentTable == NULL) {
- panic("Error, could not get the Component Table from the Associated data.");
+ Tcl_Panic("Error, could not get the Component Table from the Associated data.");
}
hashEntry = Tcl_FindHashEntry(ComponentTable, theComponent->theName);
diff --git a/mac/tclMacResource.c b/mac/tclMacResource.c
index aff6bed..3d228d2 100644
--- a/mac/tclMacResource.c
+++ b/mac/tclMacResource.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacResource.c,v 1.19 2003/10/23 10:07:09 vincentdarley Exp $
+ * RCS: @(#) $Id: tclMacResource.c,v 1.20 2003/12/24 04:18:21 davygrvy Exp $
*/
#include <Errors.h>
@@ -547,7 +547,7 @@ resourceRef? resourceType");
macPermision = fsRdWrShPerm;
break;
default:
- panic("Tcl_ResourceObjCmd: invalid mode value");
+ Tcl_Panic("Tcl_ResourceObjCmd: invalid mode value");
break;
}
} else {
@@ -791,7 +791,7 @@ resourceRef? resourceType");
if (resource == NULL) {
resource = NewHandleSys(length);
if (resource == NULL) {
- panic("could not allocate memory to write resource");
+ Tcl_Panic("could not allocate memory to write resource");
}
}
HLock(resource);
@@ -862,7 +862,7 @@ resourceRef? resourceType");
SetHandleSize(resource, length);
if ( MemError() != noErr ) {
- panic("could not allocate memory to write resource");
+ Tcl_Panic("could not allocate memory to write resource");
}
HLock(resource);
@@ -916,7 +916,7 @@ resourceRef? resourceType");
return result;
default:
- panic("Tcl_GetIndexFromObj returned unrecognized option");
+ Tcl_Panic("Tcl_GetIndexFromObj returned unrecognized option");
return TCL_ERROR; /* Should never be reached. */
}
}
@@ -2042,7 +2042,7 @@ TclMacRegisterResourceFork(
nameHashPtr = Tcl_CreateHashEntry(&nameTable, resourceId, &new);
if (!new) {
- panic("resource id has repeated itself");
+ Tcl_Panic("resource id has repeated itself");
}
resourceRef = (OpenResourceFork *) ckalloc(sizeof(OpenResourceFork));
@@ -2145,7 +2145,7 @@ TclMacUnRegisterResourceFork(
}
}
if (!match) {
- panic("the resource Fork List is out of synch!");
+ Tcl_Panic("the resource Fork List is out of synch!");
}
Tcl_ListObjReplace(NULL, resourceForkList, index, 1, 0, NULL);
@@ -2153,7 +2153,7 @@ TclMacUnRegisterResourceFork(
resourceHashPtr = Tcl_FindHashEntry(&resourceTable, (char *) fileRef);
if (resourceHashPtr == NULL) {
- panic("Resource & Name tables are out of synch in resource command.");
+ Tcl_Panic("Resource & Name tables are out of synch in resource command.");
}
ckfree(Tcl_GetHashValue(resourceHashPtr));
Tcl_DeleteHashEntry(resourceHashPtr);
diff --git a/mac/tclMacSock.c b/mac/tclMacSock.c
index 32df000..4321ea3 100644
--- a/mac/tclMacSock.c
+++ b/mac/tclMacSock.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacSock.c,v 1.15 2003/04/22 23:20:43 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclMacSock.c,v 1.16 2003/12/24 04:18:21 davygrvy Exp $
*/
#include "tclInt.h"
@@ -737,7 +737,7 @@ TcpClose(
if (err != noErr) {
Debugger();
goto afterRelease;
- /* panic("error closing server socket"); */
+ /* Tcl_Panic("error closing server socket"); */
}
statePtr->flags |= TCP_RELEASE;
@@ -750,7 +750,7 @@ TcpClose(
statePtr->pb.tcpStream = statePtr->tcpStream;
err = PBControlSync((ParmBlkPtr) &statePtr->pb);
if (err != noErr) {
- panic("error releasing server socket");
+ Tcl_Panic("error releasing server socket");
}
/*
@@ -2839,7 +2839,7 @@ TclpCutSockChannel(chan)
*/
if (!removed)
- panic("file info ptr not on thread channel list");
+ Tcl_Panic("file info ptr not on thread channel list");
return;
}
diff --git a/mac/tclMacThrd.c b/mac/tclMacThrd.c
index dec4842..4d98d9c 100644
--- a/mac/tclMacThrd.c
+++ b/mac/tclMacThrd.c
@@ -710,7 +710,7 @@ GetThreadDataStruct(keyVal)
if ((int) keyVal <= 0) {
return NULL;
} else if ((int) keyVal > keyCounter) {
- panic("illegal data key value");
+ Tcl_Panic("illegal data key value");
}
GetCurrentThread(&curThread);
@@ -755,7 +755,7 @@ RemoveThreadDataStruct(keyVal)
if ((int) keyVal <= 0) {
return NULL;
} else if ((int) keyVal > keyCounter) {
- panic("illegal data key value");
+ Tcl_Panic("illegal data key value");
}
GetCurrentThread(&curThread);