Revision: 76610
http://sourceforge.net/p/brlcad/code/76610
Author: starseeker
Date: 2020-07-31 14:50:16 +0000 (Fri, 31 Jul 2020)
Log Message:
-----------
Eliminate unused parameter
Modified Paths:
--------------
brlcad/branches/bioh/include/ged/defines.h
brlcad/branches/bioh/include/tclcad.h
brlcad/branches/bioh/src/libged/ged_util.c
brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c
brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
Modified: brlcad/branches/bioh/include/ged/defines.h
===================================================================
--- brlcad/branches/bioh/include/ged/defines.h 2020-07-31 02:40:14 UTC (rev
76609)
+++ brlcad/branches/bioh/include/ged/defines.h 2020-07-31 14:50:16 UTC (rev
76610)
@@ -252,7 +252,7 @@
/* Handler functions for I/O communication with asynchronous subprocess
commands */
int io_mode;
void (*ged_create_io_handler)(void **chan, struct bu_process *p, int fd,
int mode, void *data, ged_io_handler_callback_t callback);
- void (*ged_delete_io_handler)(void *interp, void *chan, struct bu_process
*p, int fd, void *data, ged_io_handler_callback_t callback);
+ void (*ged_delete_io_handler)(void *interp, void *chan, struct bu_process
*p, int fd, ged_io_handler_callback_t callback);
int ged_io_handler_callback_cnt;
// Other callbacks...
Modified: brlcad/branches/bioh/include/tclcad.h
===================================================================
--- brlcad/branches/bioh/include/tclcad.h 2020-07-31 02:40:14 UTC (rev
76609)
+++ brlcad/branches/bioh/include/tclcad.h 2020-07-31 14:50:16 UTC (rev
76610)
@@ -523,7 +523,7 @@
* Delete Tcl specific I/O handlers
*/
TCLCAD_EXPORT void
-tclcad_delete_io_handler(void *interp, void *chan, struct bu_process *p, int
fd, void *data, ged_io_handler_callback_t callback);
+tclcad_delete_io_handler(void *interp, void *chan, struct bu_process *p, int
fd, ged_io_handler_callback_t callback);
/* dm_tcl.c */
Modified: brlcad/branches/bioh/src/libged/ged_util.c
===================================================================
--- brlcad/branches/bioh/src/libged/ged_util.c 2020-07-31 02:40:14 UTC (rev
76609)
+++ brlcad/branches/bioh/src/libged/ged_util.c 2020-07-31 14:50:16 UTC (rev
76610)
@@ -1330,9 +1330,10 @@
/* Done watching for output, undo subprocess I/O hooks. */
if (drcdp->gedp->ged_delete_io_handler) {
(*drcdp->gedp->ged_delete_io_handler)(drcdp->gedp->ged_interp,
run_rtp->chan,
- run_rtp->p, BU_PROCESS_STDERR, (void *)drcdp,
- _ged_rt_output_handler);
+ run_rtp->p, BU_PROCESS_STDERR, _ged_rt_output_handler);
}
+
+
/* Either EOF has been sent or there was a read error.
* there is no need to block indefinitely */
retcode = bu_process_wait(&aborted, run_rtp->p, 120);
@@ -1363,6 +1364,7 @@
ged_output_handler_cb(drcdp->gedp, line);
else
bu_vls_printf(drcdp->gedp->ged_result_str, "%s", line);
+
}
void
Modified: brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c
===================================================================
--- brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c 2020-07-31 02:40:14 UTC
(rev 76609)
+++ brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c 2020-07-31 14:50:16 UTC
(rev 76610)
@@ -60,11 +60,9 @@
if (rtcp->gedp->ged_delete_io_handler) {
(*rtcp->gedp->ged_delete_io_handler)(rtcp->gedp->ged_interp,
rtcp->rrtp->chan,
- rtcp->rrtp->p, BU_PROCESS_STDOUT, (void *)rtcp,
- rtcheck_vector_handler);
+ rtcp->rrtp->p, BU_PROCESS_STDOUT, rtcheck_vector_handler);
(*rtcp->gedp->ged_delete_io_handler)(rtcp->gedp->ged_interp, rtcp->chan,
- rtcp->p, BU_PROCESS_STDERR, (void *)rtcp,
- rtcheck_output_handler);
+ rtcp->p, BU_PROCESS_STDERR, rtcheck_output_handler);
}
bu_process_close(rtcp->rrtp->p, BU_PROCESS_STDOUT);
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-07-31 02:40:14 UTC
(rev 76609)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-07-31 14:50:16 UTC
(rev 76610)
@@ -1185,7 +1185,7 @@
}
void
-tclcad_delete_io_handler(void *UNUSED(interp), void *UNUSED(chan), struct
bu_process *p, int fd, void *UNUSED(data), ged_io_handler_callback_t
UNUSED(callback))
+tclcad_delete_io_handler(void *UNUSED(interp), void *UNUSED(chan), struct
bu_process *p, int fd, ged_io_handler_callback_t UNUSED(callback))
{
int *fdp;
if (!p) return;
@@ -1206,7 +1206,7 @@
}
void
-tclcad_delete_io_handler(void *interp, void *chan, struct bu_process *p, int
fd, void *data, ged_io_handler_callback_t callback)
+tclcad_delete_io_handler(void *interp, void *chan, struct bu_process *p, int
fd, ged_io_handler_callback_t callback)
{
HANDLE *fdp;
Tcl_Interp *tcl_interp;
@@ -1213,7 +1213,7 @@
if (!chan || !p) return;
tcl_interp = (Tcl_Interp *)interp;
fdp = (HANDLE *)bu_process_fd(p, fd);
- Tcl_DeleteChannelHandler((Tcl_Channel)chan, callback, (ClientData)data);
+ Tcl_DeleteChannelHandler((Tcl_Channel)chan, callback, (ClientData)NULL);
Tcl_Close(tcl_interp, (Tcl_Channel)chan);
}
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
