Revision: 75959
http://sourceforge.net/p/brlcad/code/75959
Author: starseeker
Date: 2020-05-28 17:04:27 +0000 (Thu, 28 May 2020)
Log Message:
-----------
There doesn't seem to be any 'init_dm' to call and the _init_dm wrapper just
calls the arguments libdm is supplying. Dispense with the _init_dm proc.
Modified Paths:
--------------
brlcad/trunk/src/libdm/dm-X.c
brlcad/trunk/src/libdm/dm-ogl.c
brlcad/trunk/src/libdm/dm-osgl.cpp
brlcad/trunk/src/libdm/dm-qt.cpp
brlcad/trunk/src/libdm/dm-tk.c
brlcad/trunk/src/libdm/dm-wgl.c
brlcad/trunk/src/tclscripts/libdm.tcl
Modified: brlcad/trunk/src/libdm/dm-X.c
===================================================================
--- brlcad/trunk/src/libdm/dm-X.c 2020-05-28 15:17:48 UTC (rev 75958)
+++ brlcad/trunk/src/libdm/dm-X.c 2020-05-28 17:04:27 UTC (rev 75959)
@@ -536,9 +536,7 @@
(char *)Tk_Name(pubvars->xtkwin));
#endif
- bu_vls_printf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
bu_vls_free(&str);
Modified: brlcad/trunk/src/libdm/dm-ogl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-ogl.c 2020-05-28 15:17:48 UTC (rev 75958)
+++ brlcad/trunk/src/libdm/dm-ogl.c 2020-05-28 17:04:27 UTC (rev 75959)
@@ -826,9 +826,7 @@
bu_vls_printf(&dmp->dm_tkName, "%s",
(char *)Tk_Name(pubvars->xtkwin));
- bu_vls_printf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
bu_vls_free(&init_proc_vls);
Modified: brlcad/trunk/src/libdm/dm-osgl.cpp
===================================================================
--- brlcad/trunk/src/libdm/dm-osgl.cpp 2020-05-28 15:17:48 UTC (rev 75958)
+++ brlcad/trunk/src/libdm/dm-osgl.cpp 2020-05-28 17:04:27 UTC (rev 75959)
@@ -554,9 +554,7 @@
(char *)Tk_Name(pubvars->xtkwin));
/* Important - note that this is a bu_vls_sprintf, to clear the string */
- bu_vls_sprintf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->dm_pathName));
+ bu_vls_sprintf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == TCL_ERROR) {
bu_vls_free(&init_proc_vls);
Modified: brlcad/trunk/src/libdm/dm-qt.cpp
===================================================================
--- brlcad/trunk/src/libdm/dm-qt.cpp 2020-05-28 15:17:48 UTC (rev 75958)
+++ brlcad/trunk/src/libdm/dm-qt.cpp 2020-05-28 17:04:27 UTC (rev 75959)
@@ -870,10 +870,10 @@
bu_vls_printf(&dmp->dm_tkName, "%s", (char *)Tk_Name(pubvars->xtkwin));
- bu_vls_printf(&str, "_init_dm %s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == TCL_ERROR) {
- bu_log("qt_open: _init_dm failed\n");
+ bu_log("qt_open: dm init failed\n");
bu_vls_free(&init_proc_vls);
bu_vls_free(&str);
(void)qt_close(dmp);
Modified: brlcad/trunk/src/libdm/dm-tk.c
===================================================================
--- brlcad/trunk/src/libdm/dm-tk.c 2020-05-28 15:17:48 UTC (rev 75958)
+++ brlcad/trunk/src/libdm/dm-tk.c 2020-05-28 17:04:27 UTC (rev 75959)
@@ -1008,7 +1008,7 @@
#if 0
struct bu_vls str = BU_VLS_INIT_ZERO;
- bu_vls_printf(&str, "_init_dm %s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
bu_vls_free(&str);
(void)tk_close(dmp);
Modified: brlcad/trunk/src/libdm/dm-wgl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-wgl.c 2020-05-28 15:17:48 UTC (rev 75958)
+++ brlcad/trunk/src/libdm/dm-wgl.c 2020-05-28 17:04:27 UTC (rev 75959)
@@ -351,9 +351,7 @@
bu_vls_printf(&dmp->dm_tkName, "%s",
(char *)Tk_Name(((struct dm_xvars
*)dmp->dm_vars.pub_vars)->xtkwin));
- bu_vls_printf(&str, "_init_dm %s %s\n",
- bu_vls_addr(&init_proc_vls),
- bu_vls_addr(&dmp->dm_pathName));
+ bu_vls_printf(&str, "%s %s\n", bu_vls_addr(&init_proc_vls),
bu_vls_addr(&dmp->dm_pathName));
if (Tcl_Eval(interp, bu_vls_addr(&str)) == BRLCAD_ERROR) {
bu_log("open_wgl: _init_dm failed\n");
Modified: brlcad/trunk/src/tclscripts/libdm.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/libdm.tcl 2020-05-28 15:17:48 UTC (rev
75958)
+++ brlcad/trunk/src/tclscripts/libdm.tcl 2020-05-28 17:04:27 UTC (rev
75959)
@@ -18,10 +18,6 @@
# information.
#
###
-proc _init_dm { func w } {
- $func $w
- catch { init_dm $w }
-}
proc bind_dm { w } {
}
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
