Revision: 41221
http://brlcad.svn.sourceforge.net/brlcad/?rev=41221&view=rev
Author: brlcad
Date: 2010-11-02 11:29:08 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
simplify
Modified Paths:
--------------
brlcad/trunk/src/libged/put_comb.c
Modified: brlcad/trunk/src/libged/put_comb.c
===================================================================
--- brlcad/trunk/src/libged/put_comb.c 2010-11-02 11:28:38 UTC (rev 41220)
+++ brlcad/trunk/src/libged/put_comb.c 2010-11-02 11:29:08 UTC (rev 41221)
@@ -505,6 +505,7 @@
return GED_ERROR;
}
+ comb = (struct rt_comb_internal *)NULL;
dp = db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_QUIET);
if (dp != DIR_NULL) {
if (!(dp->d_flags & DIR_COMB)) {
@@ -520,12 +521,10 @@
comb = (struct rt_comb_internal *)intern.idb_ptr;
saved_name = _ged_save_comb(gedp, dp); /* Save combination to a temp
name */
save_comb_flag = 1;
- } else {
- comb = (struct rt_comb_internal *)NULL;
}
/* 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
