rm tcl_encap_type_stderr

htfab · Jan 3, 2021 · abb0243 · abb0243
1 parent af887c3
commit abb0243
Showing 1 changed file with 1 addition and 36 deletions.
diff --git a/util/ReportTcl.cc b/util/ReportTcl.cc
@@ -37,11 +37,6 @@ encapOutputProc(ClientData instanceData,
                 int toWrite,
                 int *errorCodePtr);
 static int
-encapErrorOutputProc(ClientData instanceData,
-                     CONST84 char *buf,
-                     int toWrite,
-                     int *errorCodePtr);
-static int
 encapCloseProc(ClientData instanceData, Tcl_Interp *interp);
 static int
 encapSetOptionProc(ClientData instanceData,
@@ -93,26 +88,6 @@ Tcl_ChannelType tcl_encap_type_stdout = {
     nullptr   // truncateProc
 };
 
-Tcl_ChannelType tcl_encap_type_stderr = {
-    const_cast<char *>("file"),
-    TCL_CHANNEL_VERSION_4,
-    encapCloseProc,
-    encapInputProc,
-    encapErrorOutputProc,
-    encapSeekProc,
-    encapSetOptionProc,
-    encapGetOptionProc,
-    encapWatchProc,
-    encapGetHandleProc,
-    nullptr,  // close2Proc
-    encapBlockModeProc,
-    nullptr,  // flushProc
-    nullptr,  // handlerProc
-    nullptr,  // wideSeekProc
-    nullptr,  // threadActionProc
-    nullptr   // truncateProc
-};
-
 ////////////////////////////////////////////////////////////////
 
 ReportTcl::ReportTcl() :
@@ -144,7 +119,7 @@ ReportTcl::setTclInterp(Tcl_Interp *interp)
                                        TCL_WRITABLE,
                                        tcl_stdout_);
   tcl_encap_stderr_ = Tcl_StackChannel(interp,
-                                       &tcl_encap_type_stderr,
+                                       &tcl_encap_type_stdout,
                                        this,
                                        TCL_WRITABLE,
                                        tcl_stderr_);
@@ -244,16 +219,6 @@ encapOutputProc(ClientData instanceData,
   return report->printString(buf, toWrite);
 }
 
-static int
-encapErrorOutputProc(ClientData instanceData,
-                     CONST84 char *buf,
-                     int toWrite,
-                     int *)
-{
-  ReportTcl *report = reinterpret_cast<ReportTcl *>(instanceData);
-  return report->printString(buf, toWrite);
-}
-
 static int
 encapInputProc(ClientData,
                char *,