Revision: 42456
http://brlcad.svn.sourceforge.net/brlcad/?rev=42456&view=rev
Author: brlcad
Date: 2011-01-19 17:26:22 +0000 (Wed, 19 Jan 2011)
Log Message:
-----------
rename db_warn, db_upgrade, and db_version to have an mged_ prefix so they
don't collide with librt db_*() functions (e.g., db_version())
Modified Paths:
--------------
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/mged/mged.c
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2011-01-19 16:51:51 UTC (rev 42455)
+++ brlcad/trunk/src/mged/cmd.c 2011-01-19 17:26:22 UTC (rev 42456)
@@ -68,9 +68,9 @@
struct cmd_list head_cmd_list;
struct cmd_list *curr_cmd_list;
-extern int db_warn;
-extern int db_upgrade;
-extern int db_version;
+extern int mged_db_warn;
+extern int mged_db_upgrade;
+extern int mged_db_version;
int glob_compat_mode = 1;
int output_as_return = 1;
@@ -1683,9 +1683,9 @@
mged_global_variable_setup(Tcl_Interp *interpreter)
{
Tcl_LinkVar(interpreter, "mged_default(dlist)", (char
*)&mged_default_dlist, TCL_LINK_INT);
- Tcl_LinkVar(interpreter, "mged_default(db_warn)", (char *)&db_warn,
TCL_LINK_INT);
- Tcl_LinkVar(interpreter, "mged_default(db_upgrade)", (char *)&db_upgrade,
TCL_LINK_INT);
- Tcl_LinkVar(interpreter, "mged_default(db_version)", (char *)&db_version,
TCL_LINK_INT);
+ Tcl_LinkVar(interpreter, "mged_default(db_warn)", (char *)&mged_db_warn,
TCL_LINK_INT);
+ Tcl_LinkVar(interpreter, "mged_default(db_upgrade)", (char
*)&mged_db_upgrade, TCL_LINK_INT);
+ Tcl_LinkVar(interpreter, "mged_default(db_version)", (char
*)&mged_db_version, TCL_LINK_INT);
Tcl_LinkVar(interpreter, "edit_class", (char *)&es_edclass, TCL_LINK_INT);
Tcl_LinkVar(interpreter, "edit_solid_flag", (char *)&es_edflag,
TCL_LINK_INT);
@@ -1697,9 +1697,9 @@
mged_global_variable_teardown(Tcl_Interp *interpreter)
{
Tcl_UnlinkVar(interpreter, "mged_default(dlist)");
- Tcl_UnlinkVar(interpreter, "mged_default(db_warn)");
- Tcl_UnlinkVar(interpreter, "mged_default(db_upgrade)");
- Tcl_UnlinkVar(interpreter, "mged_default(db_version)");
+ Tcl_UnlinkVar(interpreter, "mged_default(mged_db_warn)");
+ Tcl_UnlinkVar(interpreter, "mged_default(mged_db_upgrade)");
+ Tcl_UnlinkVar(interpreter, "mged_default(mged_db_version)");
Tcl_UnlinkVar(interpreter, "edit_class");
Tcl_UnlinkVar(interpreter, "edit_solid_flag");
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2011-01-19 16:51:51 UTC (rev 42455)
+++ brlcad/trunk/src/mged/mged.c 2011-01-19 17:26:22 UTC (rev 42456)
@@ -173,16 +173,16 @@
* 0 - no warn
* 1 - warn
*/
-int db_warn = 0;
+int mged_db_warn = 0;
/*
* 0 - no upgrade
* 1 - upgrade
*/
-int db_upgrade = 0;
+int mged_db_upgrade = 0;
/* force creation of specific database versions */
-int db_version = 5;
+int mged_db_version = 5;
struct bn_tol mged_tol; /* calculation tolerance */
struct rt_tess_tol mged_ttol; /* XXX needs to replace mged_abs_tol, et.al. */
@@ -2721,7 +2721,7 @@
}
/* File does not exist, and should be created */
- if ((dbip = db_create(argv[1], db_version)) == DBI_NULL) {
+ if ((dbip = db_create(argv[1], mged_db_version)) == DBI_NULL) {
gedp = save_gedp;
dbip = save_dbip; /* restore previous database */
rt_new_material_head(save_materp);
@@ -2853,13 +2853,13 @@
* creating a new database.
*/
if (db_version(dbip) < 5 && !created_new_db) {
- if (db_upgrade) {
- if (db_warn)
+ if (mged_db_upgrade) {
+ if (mged_db_warn)
bu_vls_printf(&msg, "Warning:\n\tDatabase version is
old.\n\tConverting to the new format.\n");
(void)Tcl_Eval(interpreter, "after idle dbupgrade -f y");
} else {
- if (db_warn) {
+ if (mged_db_warn) {
if (classic_mged)
bu_vls_printf(&msg, "Warning:\n\tDatabase version is
old.\n\tSee the dbupgrade command.");
else
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
