Revision: 54483
http://brlcad.svn.sourceforge.net/brlcad/?rev=54483&view=rev
Author: bob1961
Date: 2013-02-26 13:28:55 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
More simplification of _ged_combadd2().
Modified Paths:
--------------
brlcad/trunk/src/libged/comb.c
Modified: brlcad/trunk/src/libged/comb.c
===================================================================
--- brlcad/trunk/src/libged/comb.c 2013-02-26 13:08:44 UTC (rev 54482)
+++ brlcad/trunk/src/libged/comb.c 2013-02-26 13:28:55 UTC (rev 54483)
@@ -162,7 +162,7 @@
size_t node_count;
size_t actual_count;
size_t curr_count;
- int i = 0;
+ int i;
if (argc < 1)
return GED_ERROR;
@@ -205,21 +205,8 @@
comb->region_flag = 0;
}
- for (; i < argc; ++i) {
- if ((objp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY))
== RT_DIR_NULL) {
- bu_vls_printf(gedp->ged_result_str, "skip member %s\n",
argv[i]);
- continue;
- }
-
- RT_GET_TREE(tp, &rt_uniresource);
- tp->tr_l.tl_op = OP_DB_LEAF;
- tp->tr_l.tl_name = bu_strdup(objp->d_namep);
- tp->tr_l.tl_mat = (matp_t)NULL;
- comb->tree = tp;
-
- ++i;
+ if (argc > 0)
goto addmembers;
- }
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, 0);
return GED_OK;
@@ -261,7 +248,7 @@
comb->tree = TREE_NULL;
}
- for (; i < argc; ++i) {
+ for (i = 0; i < argc; ++i) {
if ((objp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) ==
RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "skip member %s\n", argv[i]);
continue;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
