Simpler commenting of Tcl_ChannelType instances; make zip channel type const

5 files changed, 80 insertions, 80 deletions

diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 248ca5b..b81af7e 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -106,23 +106,23 @@ static Tcl_Channel	OpenFileChannel(HANDLE handle, char *channelName,
  */
 
 static const Tcl_ChannelType fileChannelType = {
-    "file",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,			/* Close proc. */
-    FileInputProc,		/* Input proc. */
-    FileOutputProc,		/* Output proc. */
-    NULL,
+    "file",
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    FileInputProc,
+    FileOutputProc,
+    NULL,			/* Deprecated. */
     NULL,			/* Set option proc. */
-    FileGetOptionProc,		/* Get option proc. */
-    FileWatchProc,		/* Set up the notifier to watch the channel. */
-    FileGetHandleProc,		/* Get an OS handle from channel. */
-    FileCloseProc,		/* close2proc. */
-    FileBlockProc,		/* Set blocking or non-blocking mode.*/
-    NULL,			/* flush proc. */
-    NULL,			/* handler proc. */
-    FileWideSeekProc,		/* Wide seek proc. */
-    FileThreadActionProc,	/* Thread action proc. */
-    FileTruncateProc		/* Truncate proc. */
+    FileGetOptionProc,
+    FileWatchProc,
+    FileGetHandleProc,
+    FileCloseProc,
+    FileBlockProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
+    FileWideSeekProc,
+    FileThreadActionProc,
+    FileTruncateProc
 };
 
 /*
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index a498200..ee04b05 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -298,23 +298,23 @@ static ConsoleChannelInfo *gWatchingChannelList;
  */
 
 static const Tcl_ChannelType consoleChannelType = {
-    "console",               /* Type name. */
-    TCL_CHANNEL_VERSION_5,   /* v5 channel */
-    NULL,                    /* Close proc. */
-    ConsoleInputProc,        /* Input proc. */
-    ConsoleOutputProc,       /* Output proc. */
-    NULL,                    /* Seek proc. */
-    ConsoleSetOptionProc,    /* Set option proc. */
-    ConsoleGetOptionProc,    /* Get option proc. */
-    ConsoleWatchProc,        /* Set up notifier to watch the channel. */
-    ConsoleGetHandleProc,    /* Get an OS handle from channel. */
-    ConsoleCloseProc,        /* close2proc. */
-    ConsoleBlockModeProc,    /* Set blocking or non-blocking mode. */
-    NULL,                    /* Flush proc. */
-    NULL,                    /* Handler proc. */
-    NULL,                    /* Wide seek proc. */
-    ConsoleThreadActionProc, /* Thread action proc. */
-    NULL                     /* Truncation proc. */
+    "console",
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    ConsoleInputProc,
+    ConsoleOutputProc,
+    NULL,			/* Deprecated. */
+    ConsoleSetOptionProc,
+    ConsoleGetOptionProc,
+    ConsoleWatchProc,
+    ConsoleGetHandleProc,
+    ConsoleCloseProc,
+    ConsoleBlockModeProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
+    NULL,			/* Seek proc. */
+    ConsoleThreadActionProc,
+    NULL			/* Truncation proc. */
 };
 
 /*
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index c4b60b9..eeb06f8 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -201,23 +201,23 @@ static void		PipeThreadActionProc(void *instanceData,
  */
 
 static const Tcl_ChannelType pipeChannelType = {
-    "pipe",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,		/* Close proc. */
-    PipeInputProc,		/* Input proc. */
-    PipeOutputProc,		/* Output proc. */
-    NULL,			/* Seek proc. */
+    "pipe",
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    PipeInputProc,
+    PipeOutputProc,
+    NULL,			/* Deprecated. */
     NULL,			/* Set option proc. */
     NULL,			/* Get option proc. */
-    PipeWatchProc,		/* Set up notifier to watch the channel. */
-    PipeGetHandleProc,		/* Get an OS handle from channel. */
-    PipeClose2Proc,		/* close2proc */
-    PipeBlockModeProc,		/* Set blocking or non-blocking mode.*/
-    NULL,			/* flush proc. */
-    NULL,			/* handler proc. */
-    NULL,			/* wide seek proc */
-    PipeThreadActionProc,	/* thread action proc */
-    NULL			/* truncate */
+    PipeWatchProc,
+    PipeGetHandleProc,
+    PipeClose2Proc,
+    PipeBlockModeProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
+    NULL,			/* Seek proc. */
+    PipeThreadActionProc,
+    NULL			/* Truncate proc. */
 };
 
 /*
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 2ce432c..fe35c36 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -202,23 +202,23 @@ static int		SerialBlockingWrite(SerialInfo *infoPtr, LPVOID buf,
  */
 
 static const Tcl_ChannelType serialChannelType = {
-    "serial",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,		/* Close proc. */
-    SerialInputProc,		/* Input proc. */
-    SerialOutputProc,		/* Output proc. */
+    "serial",
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    SerialInputProc,
+    SerialOutputProc,
+    NULL,			/* Deprecated. */
+    SerialSetOptionProc,
+    SerialGetOptionProc,
+    SerialWatchProc,
+    SerialGetHandleProc,
+    SerialCloseProc,
+    SerialBlockProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
     NULL,			/* Seek proc. */
-    SerialSetOptionProc,	/* Set option proc. */
-    SerialGetOptionProc,	/* Get option proc. */
-    SerialWatchProc,		/* Set up notifier to watch the channel. */
-    SerialGetHandleProc,	/* Get an OS handle from channel. */
-    SerialCloseProc,		/* close2proc. */
-    SerialBlockProc,		/* Set blocking or non-blocking mode.*/
-    NULL,			/* flush proc. */
-    NULL,			/* handler proc. */
-    NULL,			/* wide seek proc */
-    SerialThreadActionProc,	/* thread action proc */
-    NULL                       /* truncate */
+    SerialThreadActionProc,
+    NULL			/* Truncate proc. */
 };
 
 /*
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 5239cd3..11c43f0 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -270,23 +270,23 @@ static Tcl_DriverGetHandleProc	TcpGetHandleProc;
  */
 
 static const Tcl_ChannelType tcpChannelType = {
-    "tcp",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,			/* Old close proc. Deprecated. */
-    TcpInputProc,		/* Input proc. */
-    TcpOutputProc,		/* Output proc. */
+    "tcp",
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    TcpInputProc,
+    TcpOutputProc,
+    NULL,			/* Deprecated. */
+    TcpSetOptionProc,
+    TcpGetOptionProc,
+    TcpWatchProc,
+    TcpGetHandleProc,
+    TcpClose2Proc,
+    TcpBlockModeProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
     NULL,			/* Seek proc. */
-    TcpSetOptionProc,		/* Set option proc. */
-    TcpGetOptionProc,		/* Get option proc. */
-    TcpWatchProc,		/* Initialize notifier. */
-    TcpGetHandleProc,		/* Get OS handles out of channel. */
-    TcpClose2Proc,		/* New close2 proc. */
-    TcpBlockModeProc,		/* Set blocking or non-blocking mode.*/
-    NULL,			/* flush proc. */
-    NULL,			/* handler proc. */
-    NULL,			/* wide seek proc. */
-    TcpThreadActionProc,	/* thread action proc. */
-    NULL			/* truncate proc. */
+    TcpThreadActionProc,
+    NULL			/* Truncate proc. */
 };
 
 /*