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]

4 files changed, 18 insertions, 17 deletions

diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 57a9e5d..3542ca8 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixChan.c,v 1.44 2003/11/18 23:13:33 davygrvy Exp $
+ * RCS: @(#) $Id: tclUnixChan.c,v 1.45 2003/12/24 04:18:22 davygrvy Exp $
  */
 
 #include "tclInt.h"	/* Internal definitions for Tcl. */
@@ -1777,7 +1777,7 @@ TclpOpenFileChannel(interp, pathPtr, mode, permissions)
 	    /*
 	     * This may occurr if modeString was "", for example.
 	     */
-	    panic("TclpOpenFileChannel: invalid mode value");
+	    Tcl_Panic("TclpOpenFileChannel: invalid mode value");
 	    return NULL;
     }
 
@@ -3002,7 +3002,7 @@ TclpGetDefaultStdChannel(type)
 	    bufMode = "none";
 	    break;
 	default:
-	    panic("TclGetDefaultStdChannel: Unexpected channel type");
+	    Tcl_Panic("TclGetDefaultStdChannel: Unexpected channel type");
 	    break;
     }
 
@@ -3194,7 +3194,7 @@ TclUnixWaitForFile(fd, mask, timeout)
      */
 
     if (fd >= FD_SETSIZE) {
-	panic("TclWaitForFile can't handle file id %d", fd);
+	Tcl_Panic("TclWaitForFile can't handle file id %d", fd);
     }
     memset((VOID *) readyMasks, 0, 3*MASK_SIZE*sizeof(fd_mask));
     index = fd/(NBBY*sizeof(fd_mask));
@@ -3323,8 +3323,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");
+    }
 
 #endif /* DEPRECATED */
 }
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 719442d..4e8bfb2 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.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: tclUnixNotfy.c,v 1.13 2003/07/16 22:10:37 hobbs Exp $
+ * RCS: @(#) $Id: tclUnixNotfy.c,v 1.14 2003/12/24 04:18:22 davygrvy Exp $
  */
 
 #include "tclInt.h"
@@ -210,7 +210,7 @@ Tcl_InitNotifier()
     if (notifierCount == 0) {
 	if (Tcl_CreateThread(&notifierThread, NotifierThreadProc, NULL,
 		     TCL_THREAD_STACK_DEFAULT, TCL_THREAD_NOFLAGS) != TCL_OK) {
-	    panic("Tcl_InitNotifier: unable to start notifier thread");
+	    Tcl_Panic("Tcl_InitNotifier: unable to start notifier thread");
 	}
     }
     notifierCount++;
@@ -263,7 +263,7 @@ Tcl_FinalizeNotifier(clientData)
 
     if (notifierCount == 0) {
 	if (triggerPipe < 0) {
-	    panic("Tcl_FinalizeNotifier: notifier pipe not initialized");
+	    Tcl_Panic("Tcl_FinalizeNotifier: notifier pipe not initialized");
 	}
 
         /*
@@ -869,7 +869,7 @@ NotifierThreadProc(clientData)
     char buf[2];
 
     if (pipe(fds) != 0) {
-	panic("NotifierThreadProc: could not create trigger pipe.");
+	Tcl_Panic("NotifierThreadProc: could not create trigger pipe.");
     }
 
     receivePipe = fds[0];
@@ -878,19 +878,19 @@ NotifierThreadProc(clientData)
     status = fcntl(receivePipe, F_GETFL);
     status |= O_NONBLOCK;
     if (fcntl(receivePipe, F_SETFL, status) < 0) {
-	panic("NotifierThreadProc: could not make receive pipe non blocking.");
+	Tcl_Panic("NotifierThreadProc: could not make receive pipe non blocking.");
     }
     status = fcntl(fds[1], F_GETFL);
     status |= O_NONBLOCK;
     if (fcntl(fds[1], F_SETFL, status) < 0) {
-	panic("NotifierThreadProc: could not make trigger pipe non blocking.");
+	Tcl_Panic("NotifierThreadProc: could not make trigger pipe non blocking.");
     }
 #else
     if (ioctl(receivePipe, (int) FIONBIO, &status) < 0) {
-	panic("NotifierThreadProc: could not make receive pipe non blocking.");
+	Tcl_Panic("NotifierThreadProc: could not make receive pipe non blocking.");
     }
     if (ioctl(fds[1], (int) FIONBIO, &status) < 0) {
-	panic("NotifierThreadProc: could not make trigger pipe non blocking.");
+	Tcl_Panic("NotifierThreadProc: could not make trigger pipe non blocking.");
     }
 #endif
 
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 515ef4f..98d1edc 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -916,7 +916,7 @@ TclpNewAllocMutex(void)
 
     lockPtr = malloc(sizeof(struct lock));
     if (lockPtr == NULL) {
-	panic("could not allocate lock");
+	Tcl_Panic("could not allocate lock");
     }
     lockPtr->tlock = (Tcl_Mutex) &lockPtr->plock;
     pthread_mutex_init(&lockPtr->plock, NULL);
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index 31157ff..5b186bd 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.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: tclXtNotify.c,v 1.4 1999/07/02 06:05:34 welch Exp $
+ * RCS: @(#) $Id: tclXtNotify.c,v 1.5 2003/12/24 04:18:22 davygrvy Exp $
  */
 
 #include <X11/Intrinsic.h>
@@ -135,7 +135,7 @@ TclSetAppContext(appContext)
              * after initialization, so we panic.
              */
         
-            panic("TclSetAppContext:  multiple application contexts");
+            Tcl_Panic("TclSetAppContext:  multiple application contexts");
 
         }
     } else {