summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-02-25 18:05:22 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-02-25 18:05:22 (GMT)
commit3113125de488bc505861db30785af63bae2e531c (patch)
tree991bbc90430b7520bec5edd2e54ef8fcff76ed47
parent35f12d416bc726f52f9114843e157ca9f85407ce (diff)
downloadtcl-3113125de488bc505861db30785af63bae2e531c.zip
tcl-3113125de488bc505861db30785af63bae2e531c.tar.gz
tcl-3113125de488bc505861db30785af63bae2e531c.tar.bz2
Repair linked list management in Tcl_DeleteCloseHandler().
CloseCallback struct is used only locally. Remove from tclIO.h.
-rw-r--r--generic/tclIO.c14
-rw-r--r--generic/tclIO.h16
2 files changed, 18 insertions, 12 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index eace472..ed08112 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -70,6 +70,18 @@ typedef struct ThreadSpecificData {
static Tcl_ThreadDataKey dataKey;
/*
+ * Structure to record a close callback. One such record exists for
+ * each close callback registered for a channel.
+ */
+
+typedef struct CloseCallback {
+ Tcl_CloseProc *proc; /* The procedure to call. */
+ ClientData clientData; /* Arbitrary one-word data to pass
+ * to the callback. */
+ struct CloseCallback *nextPtr; /* For chaining close callbacks. */
+} CloseCallback;
+
+/*
* Static functions in this file:
*/
@@ -504,6 +516,8 @@ Tcl_DeleteCloseHandler(chan, proc, clientData)
if ((cbPtr->proc == proc) && (cbPtr->clientData == clientData)) {
if (cbPrevPtr == (CloseCallback *) NULL) {
statePtr->closeCbPtr = cbPtr->nextPtr;
+ } else {
+ cbPrevPtr->nextPtr = cbPtr->nextPtr;
}
ckfree((char *) cbPtr);
break;
diff --git a/generic/tclIO.h b/generic/tclIO.h
index e9f6151..2c7978a 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -85,17 +85,8 @@ typedef struct ChannelBuffer {
#define CHANNELBUFFER_DEFAULT_SIZE (1024 * 4)
-/*
- * Structure to record a close callback. One such record exists for
- * each close callback registered for a channel.
- */
-
-typedef struct CloseCallback {
- Tcl_CloseProc *proc; /* The procedure to call. */
- ClientData clientData; /* Arbitrary one-word data to pass
- * to the callback. */
- struct CloseCallback *nextPtr; /* For chaining close callbacks. */
-} CloseCallback;
+/* Foward declaration */
+struct CloseCallback;
/*
* The following structure describes the information saved from a call to
@@ -197,7 +188,8 @@ typedef struct ChannelState {
int refCount; /* How many interpreters hold references to
* this IO channel? */
- CloseCallback *closeCbPtr; /* Callbacks registered to be called when the
+ struct CloseCallback *closeCbPtr;
+ /* Callbacks registered to be called when the
* channel is closed. */
char *outputStage; /* Temporary staging buffer used when
* translating EOL before converting from