Revision: 41222
http://brlcad.svn.sourceforge.net/brlcad/?rev=41222&view=rev
Author: brlcad
Date: 2010-11-02 11:30:35 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
don't need to check the pointer parameter to db_free_tree() as it will do a
test for callers and return without action if null. simplify.
Modified Paths:
--------------
brlcad/trunk/src/libged/comb_std.c
brlcad/trunk/src/libged/dg_obj.c
brlcad/trunk/src/libged/draw.c
brlcad/trunk/src/libged/red.c
brlcad/trunk/src/libged/wdb_comb_std.c
brlcad/trunk/src/libged/wdb_obj.c
brlcad/trunk/src/librt/comb/comb.c
brlcad/trunk/src/librt/comb/db_comb.c
brlcad/trunk/src/mged/dodraw.c
brlcad/trunk/src/mged/red.c
Modified: brlcad/trunk/src/libged/comb_std.c
===================================================================
--- brlcad/trunk/src/libged/comb_std.c 2010-11-02 11:29:08 UTC (rev 41221)
+++ brlcad/trunk/src/libged/comb_std.c 2010-11-02 11:30:35 UTC (rev 41222)
@@ -62,8 +62,7 @@
while (BU_LIST_WHILE(tok, tokens, hp)) {
BU_LIST_DEQUEUE(&tok->l);
if (tok->type == GED_TOK_TREE) {
- if (tok->tp)
- db_free_tree(tok->tp, &rt_uniresource);
+ db_free_tree(tok->tp, &rt_uniresource);
}
}
}
@@ -627,7 +626,7 @@
case GED_TOK_SUBTR:
break;
case GED_TOK_TREE:
- if (!strcmp(tok->tp->tr_l.tl_name, comb_name)) {
+ if (tok->tp && !strcmp(tok->tp->tr_l.tl_name, comb_name)) {
db_free_tree( tok->tp, &rt_uniresource );
GED_DB_GET_INTERNAL(gedp, &intern1, dp, (fastf_t
*)NULL, &rt_uniresource, GED_ERROR);
comb1 = (struct rt_comb_internal *)intern1.idb_ptr;
Modified: brlcad/trunk/src/libged/dg_obj.c
===================================================================
--- brlcad/trunk/src/libged/dg_obj.c 2010-11-02 11:29:08 UTC (rev 41221)
+++ brlcad/trunk/src/libged/dg_obj.c 2010-11-02 11:30:35 UTC (rev 41222)
@@ -2856,8 +2856,7 @@
Tcl_AppendResult(dgcdp->interp, "WARNING: Boolean evaluation of ",
sofar,
" failed!!!\n", (char *)NULL);
bu_free((genptr_t)sofar, "path string");
- if (curtree)
- db_free_tree(curtree, tsp->ts_resp);
+ db_free_tree(curtree, tsp->ts_resp);
return (union tree *)NULL;
}
failed = nmg_boolean(curtree, *tsp->ts_m, tsp->ts_tol, tsp->ts_resp);
@@ -2890,8 +2889,7 @@
Tcl_AppendResult(dgcdp->interp, "WARNING: Triangulation of ", sofar,
" failed!!!\n", (char *)NULL);
bu_free((genptr_t)sofar, "path string");
- if (curtree)
- db_free_tree(curtree, tsp->ts_resp);
+ db_free_tree(curtree, tsp->ts_resp);
return (union tree *)NULL;
}
nmg_triangulate_model(*tsp->ts_m, tsp->ts_tol);
Modified: brlcad/trunk/src/libged/draw.c
===================================================================
--- brlcad/trunk/src/libged/draw.c 2010-11-02 11:29:08 UTC (rev 41221)
+++ brlcad/trunk/src/libged/draw.c 2010-11-02 11:30:35 UTC (rev 41222)
@@ -436,8 +436,7 @@
bu_vls_printf(&dgcdp->gedp->ged_result_str, "WARNING: Boolean
evaluation of %s failed!!!\n", sofar);
bu_free((genptr_t)sofar, "path string");
- if (curtree)
- db_free_tree(curtree, tsp->ts_resp);
+ db_free_tree(curtree, tsp->ts_resp);
return (union tree *)NULL;
}
failed = nmg_boolean(curtree, *tsp->ts_m, tsp->ts_tol, tsp->ts_resp);
@@ -467,8 +466,7 @@
bu_vls_printf(&dgcdp->gedp->ged_result_str, "WARNING: Triangulation
of %s failed!!!\n", sofar);
bu_free((genptr_t)sofar, "path string");
- if (curtree)
- db_free_tree(curtree, tsp->ts_resp);
+ db_free_tree(curtree, tsp->ts_resp);
return (union tree *)NULL;
}
nmg_triangulate_model(*tsp->ts_m, tsp->ts_tol);
Modified: brlcad/trunk/src/libged/red.c
===================================================================
--- brlcad/trunk/src/libged/red.c 2010-11-02 11:29:08 UTC (rev 41221)
+++ brlcad/trunk/src/libged/red.c 2010-11-02 11:30:35 UTC (rev 41222)
@@ -534,7 +534,7 @@
else
tp = (union tree *)NULL;
- if (comb && comb->tree) {
+ if (comb) {
db_free_tree(comb->tree, &rt_uniresource);
comb->tree = NULL;
}
Modified: brlcad/trunk/src/libged/wdb_comb_std.c
===================================================================
--- brlcad/trunk/src/libged/wdb_comb_std.c 2010-11-02 11:29:08 UTC (rev
41221)
+++ brlcad/trunk/src/libged/wdb_comb_std.c 2010-11-02 11:30:35 UTC (rev
41222)
@@ -67,8 +67,7 @@
while (BU_LIST_WHILE(tok, tokens, hp)) {
BU_LIST_DEQUEUE(&tok->l);
if (tok->type == WDB_TOK_TREE) {
- if (tok->tp)
- db_free_tree(tok->tp, &rt_uniresource);
+ db_free_tree(tok->tp, &rt_uniresource);
}
}
}
@@ -659,7 +658,7 @@
case WDB_TOK_SUBTR:
break;
case WDB_TOK_TREE:
- if (!strcmp(tok->tp->tr_l.tl_name, comb_name)) {
+ if (tok->tp && !strcmp(tok->tp->tr_l.tl_name, comb_name)) {
db_free_tree(tok->tp, &rt_uniresource);
if (rt_db_get_internal(&intern1, dp, wdbp->dbip,
(fastf_t *)NULL, &rt_uniresource) < 0) {
Tcl_AppendResult(interp, "Cannot get records for ",
comb_name, "\n", (char *)NULL);
Modified: brlcad/trunk/src/libged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/libged/wdb_obj.c 2010-11-02 11:29:08 UTC (rev 41221)
+++ brlcad/trunk/src/libged/wdb_obj.c 2010-11-02 11:30:35 UTC (rev 41222)
@@ -4535,8 +4535,7 @@
if (BU_SETJUMP) {
BU_UNSETJUMP;
Tcl_AppendResult(interp, "WARNING: facetization failed!!!\n", (char
*)NULL);
- if (facetize_tree)
- db_free_tree(facetize_tree, &rt_uniresource);
+ db_free_tree(facetize_tree, &rt_uniresource);
facetize_tree = (union tree *)NULL;
nmg_km(nmg_model);
nmg_model = (struct model *)NULL;
@@ -4550,8 +4549,7 @@
if (failed) {
Tcl_AppendResult(interp, "facetize: no resulting region, aborting\n",
(char *)NULL);
- if (facetize_tree)
- db_free_tree(facetize_tree, &rt_uniresource);
+ db_free_tree(facetize_tree, &rt_uniresource);
facetize_tree = (union tree *)NULL;
nmg_km(nmg_model);
nmg_model = (struct model *)NULL;
@@ -4568,8 +4566,7 @@
if (BU_SETJUMP) {
BU_UNSETJUMP;
Tcl_AppendResult(interp, "WARNING: triangulation failed!!!\n",
(char *)NULL);
- if (facetize_tree)
- db_free_tree(facetize_tree, &rt_uniresource);
+ db_free_tree(facetize_tree, &rt_uniresource);
facetize_tree = (union tree *)NULL;
nmg_km(nmg_model);
nmg_model = (struct model *)NULL;
Modified: brlcad/trunk/src/librt/comb/comb.c
===================================================================
--- brlcad/trunk/src/librt/comb/comb.c 2010-11-02 11:29:08 UTC (rev 41221)
+++ brlcad/trunk/src/librt/comb/comb.c 2010-11-02 11:30:35 UTC (rev 41222)
@@ -1032,9 +1032,7 @@
union tree *new;
if (*argv[1] == '\0' || strcmp(argv[1], "none") == 0) {
- if (comb->tree) {
- db_free_tree(comb->tree, &rt_uniresource);
- }
+ db_free_tree(comb->tree, &rt_uniresource);
comb->tree = TREE_NULL;
} else {
new = db_tree_parse(logstr, argv[1], &rt_uniresource);
@@ -1042,8 +1040,7 @@
bu_vls_printf(logstr, "db adjust tree: bad tree '%s'\n",
argv[1]);
return BRLCAD_ERROR;
}
- if (comb->tree)
- db_free_tree(comb->tree, &rt_uniresource);
+ db_free_tree(comb->tree, &rt_uniresource);
comb->tree = new;
}
} else {
Modified: brlcad/trunk/src/librt/comb/db_comb.c
===================================================================
--- brlcad/trunk/src/librt/comb/db_comb.c 2010-11-02 11:29:08 UTC (rev
41221)
+++ brlcad/trunk/src/librt/comb/db_comb.c 2010-11-02 11:30:35 UTC (rev
41222)
@@ -880,7 +880,7 @@
if (comb) {
/* If tree hasn't been stolen, release it */
- if (comb->tree) db_free_tree(comb->tree, &rt_uniresource);
+ db_free_tree(comb->tree, &rt_uniresource);
comb->tree = NULL;
bu_vls_free(&comb->shader);
Modified: brlcad/trunk/src/mged/dodraw.c
===================================================================
--- brlcad/trunk/src/mged/dodraw.c 2010-11-02 11:29:08 UTC (rev 41221)
+++ brlcad/trunk/src/mged/dodraw.c 2010-11-02 11:30:35 UTC (rev 41222)
@@ -571,8 +571,7 @@
Tcl_AppendResult(interp, "WARNING: Boolean evaluation of ", sofar,
" failed!!!\n", (char *)NULL);
bu_free((genptr_t)sofar, "path string");
- if (curtree)
- db_free_tree(curtree, &rt_uniresource);
+ db_free_tree(curtree, &rt_uniresource);
return (union tree *)NULL;
}
failed = nmg_boolean(curtree, *tsp->ts_m, tsp->ts_tol, &rt_uniresource);
@@ -603,8 +602,7 @@
Tcl_AppendResult(interp, "WARNING: Triangulation of ", sofar,
" failed!!!\n", (char *)NULL);
bu_free((genptr_t)sofar, "path string");
- if (curtree)
- db_free_tree(curtree, &rt_uniresource);
+ db_free_tree(curtree, &rt_uniresource);
return (union tree *)NULL;
}
nmg_triangulate_model(*tsp->ts_m, tsp->ts_tol);
@@ -1324,8 +1322,7 @@
if (BU_SETJUMP) {
BU_UNSETJUMP;
Tcl_AppendResult(interp, "WARNING: facetization failed!!!\n", (char
*)NULL);
- if (mged_facetize_tree)
- db_free_tree(mged_facetize_tree, &rt_uniresource);
+ db_free_tree(mged_facetize_tree, &rt_uniresource);
mged_facetize_tree = (union tree *)NULL;
nmg_km(mged_nmg_model);
mged_nmg_model = (struct model *)NULL;
@@ -1339,8 +1336,7 @@
if (failed) {
Tcl_AppendResult(interp, "facetize: no resulting region, aborting\n",
(char *)NULL);
- if (mged_facetize_tree)
- db_free_tree(mged_facetize_tree, &rt_uniresource);
+ db_free_tree(mged_facetize_tree, &rt_uniresource);
mged_facetize_tree = (union tree *)NULL;
nmg_km(mged_nmg_model);
mged_nmg_model = (struct model *)NULL;
@@ -1357,8 +1353,7 @@
if (BU_SETJUMP) {
BU_UNSETJUMP;
Tcl_AppendResult(interp, "WARNING: triangulation failed!!!\n",
(char *)NULL);
- if (mged_facetize_tree)
- db_free_tree(mged_facetize_tree, &rt_uniresource);
+ db_free_tree(mged_facetize_tree, &rt_uniresource);
mged_facetize_tree = (union tree *)NULL;
nmg_km(mged_nmg_model);
mged_nmg_model = (struct model *)NULL;
@@ -1605,8 +1600,7 @@
BU_UNSETJUMP;
Tcl_AppendResult(interp, "WARNING: Boolean evaluation failed!!!\n",
(char *)NULL);
- if (tmp_tree)
- db_free_tree(tmp_tree, &rt_uniresource);
+ db_free_tree(tmp_tree, &rt_uniresource);
tmp_tree = (union tree *)NULL;
nmg_km(mged_nmg_model);
mged_nmg_model = (struct model *)NULL;
@@ -1620,8 +1614,7 @@
if (failed) {
Tcl_AppendResult(interp, "bev: no resulting region, aborting\n", (char
*)NULL);
- if (tmp_tree)
- db_free_tree(tmp_tree, &rt_uniresource);
+ db_free_tree(tmp_tree, &rt_uniresource);
tmp_tree = (union tree *)NULL;
nmg_km(mged_nmg_model);
mged_nmg_model = (struct model *)NULL;
@@ -1639,8 +1632,7 @@
if (BU_SETJUMP) {
BU_UNSETJUMP;
Tcl_AppendResult(interp, "WARNING: Triangulation failed!!!\n",
(char *)NULL);
- if (tmp_tree)
- db_free_tree(tmp_tree, &rt_uniresource);
+ db_free_tree(tmp_tree, &rt_uniresource);
tmp_tree = (union tree *)NULL;
nmg_km(mged_nmg_model);
mged_nmg_model = (struct model *)NULL;
Modified: brlcad/trunk/src/mged/red.c
===================================================================
--- brlcad/trunk/src/mged/red.c 2010-11-02 11:29:08 UTC (rev 41221)
+++ brlcad/trunk/src/mged/red.c 2010-11-02 11:30:35 UTC (rev 41222)
@@ -1048,7 +1048,7 @@
}
/* empty the existing combination */
- if (comb && comb->tree) {
+ if (comb) {
db_free_tree(comb->tree, &rt_uniresource);
comb->tree = NULL;
} else {
@@ -1453,7 +1453,7 @@
}
/* empty the existing combination */
- if (comb && comb->tree) {
+ if (comb) {
db_free_tree(comb->tree, &rt_uniresource);
comb->tree = NULL;
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
