Revision: 76536
http://sourceforge.net/p/brlcad/code/76536
Author: brlcad
Date: 2020-07-27 20:48:06 +0000 (Mon, 27 Jul 2020)
Log Message:
-----------
more single expression per line simplifications for readability and consistency
Modified Paths:
--------------
brlcad/trunk/src/libged/attr/attr.cpp
brlcad/trunk/src/libged/bb/bb.c
brlcad/trunk/src/libged/bigE/bigE.c
brlcad/trunk/src/libged/bo/bo.c
brlcad/trunk/src/libged/bot/bot_dump.c
brlcad/trunk/src/libged/bot/bot_face_sort.c
brlcad/trunk/src/libged/check/check.c
brlcad/trunk/src/libged/clone/clone.c
brlcad/trunk/src/libged/comb/comb.c
brlcad/trunk/src/libged/copyeval/copyeval.c
brlcad/trunk/src/libged/decompose/decompose.c
brlcad/trunk/src/libged/display_list.c
brlcad/trunk/src/libged/draw/draw.c
brlcad/trunk/src/libged/edcodes/edcodes.c
brlcad/trunk/src/libged/erase/erase.c
brlcad/trunk/src/libged/facetize/facetize.cpp
brlcad/trunk/src/libged/fracture/fracture.c
brlcad/trunk/src/libged/ged_util.c
brlcad/trunk/src/libged/get_obj_bounds.c
brlcad/trunk/src/libged/gqa/gqa.c
brlcad/trunk/src/libged/joint/joint.c
brlcad/trunk/src/libged/lint/lint.cpp
brlcad/trunk/src/libged/mater/mater.cpp
brlcad/trunk/src/libged/nmg/nmg_collapse.c
brlcad/trunk/src/libged/pix2fb/pix2fb.c
brlcad/trunk/src/libged/shells/shells.c
brlcad/trunk/src/libged/tables/tables.c
brlcad/trunk/src/libged/trace.c
brlcad/trunk/src/libged/typein/typein.c
brlcad/trunk/src/libged/wcodes/wcodes.c
brlcad/trunk/src/libged/whatid/whatid.c
Modified: brlcad/trunk/src/libged/attr/attr.cpp
===================================================================
--- brlcad/trunk/src/libged/attr/attr.cpp 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/attr/attr.cpp 2020-07-27 20:48:06 UTC (rev
76536)
@@ -438,7 +438,7 @@
}
} else {
const char *val;
- int do_separators=argc-4; /* if more than one attribute */
+ int do_separators = argc-4; /* if more than one attribute */
for (i = 3; i < (size_t)argc; i++) {
val = bu_avs_get(&avs, argv[i]);
@@ -495,7 +495,7 @@
}
} else {
const char *val;
- int do_separators=argc-4; /* if more than one attribute */
+ int do_separators = argc-4; /* if more than one attribute */
for (j = 3; j < (size_t)argc; j++) {
val = bu_avs_get(&avs, argv[j]);
Modified: brlcad/trunk/src/libged/bb/bb.c
===================================================================
--- brlcad/trunk/src/libged/bb/bb.c 2020-07-27 20:46:49 UTC (rev 76535)
+++ brlcad/trunk/src/libged/bb/bb.c 2020-07-27 20:48:06 UTC (rev 76536)
@@ -189,7 +189,8 @@
new_intern.idb_meth = &OBJ[ID_ARB8];
new_intern.idb_ptr = (void *)arb;
- if ((dp=db_diradd(gedp->ged_wdbp->dbip, bbname, RT_DIR_PHONY_ADDR,
0, RT_DIR_SOLID, (void *)&new_intern.idb_type)) == RT_DIR_NULL) {
+ dp = db_diradd(gedp->ged_wdbp->dbip, bbname, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&new_intern.idb_type);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "Cannot add %s to
directory\n", bbname);
return GED_ERROR;
}
@@ -214,7 +215,9 @@
db_free_full_path(&path);
return GED_ERROR;
}
- if ((obj_dp=db_lookup(gedp->ged_wdbp->dbip,
DB_FULL_PATH_CUR_DIR(&path)->d_namep, LOOKUP_QUIET)) == RT_DIR_NULL) {
+
+ obj_dp = db_lookup(gedp->ged_wdbp->dbip,
DB_FULL_PATH_CUR_DIR(&path)->d_namep, LOOKUP_QUIET);
+ if (obj_dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "db_lookup failed for %s\n",
DB_FULL_PATH_CUR_DIR(&path)->d_namep);
db_free_full_path(&path);
return GED_ERROR;
@@ -289,7 +292,8 @@
rt_db_free_internal(&new_intern);
} else {
- if ((dp=db_diradd(gedp->ged_wdbp->dbip, bbname, RT_DIR_PHONY_ADDR,
0, RT_DIR_SOLID, (void *)&new_intern.idb_type)) == RT_DIR_NULL) {
+ dp = db_diradd(gedp->ged_wdbp->dbip, bbname, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&new_intern.idb_type);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "Cannot add %s to
directory\n", bbname);
return GED_ERROR;
}
Modified: brlcad/trunk/src/libged/bigE/bigE.c
===================================================================
--- brlcad/trunk/src/libged/bigE/bigE.c 2020-07-27 20:46:49 UTC (rev 76535)
+++ brlcad/trunk/src/libged/bigE/bigE.c 2020-07-27 20:48:06 UTC (rev 76536)
@@ -182,7 +182,7 @@
if (solid_is_plate_mode_bot
|| !eptr->l.m
- || (bot=nmg_bot(s, &RTG.rtg_vlfree,
&dgcdp->gedp->ged_wdbp->wdb_tol)) == (struct rt_bot_internal *)NULL)
+ || (bot = nmg_bot(s, &RTG.rtg_vlfree,
&dgcdp->gedp->ged_wdbp->wdb_tol)) == (struct rt_bot_internal *)NULL)
{
eptr->l.stp->st_id = id;
eptr->l.stp->st_meth = &OBJ[id];
@@ -251,7 +251,8 @@
BU_LIST_INIT(&eptr->l.seghead);
break;
case OP_DB_LEAF:
- if ((dp=db_lookup(dgcdp->gedp->ged_wdbp->dbip, tp->tr_l.tl_name,
LOOKUP_NOISY)) == RT_DIR_NULL) {
+ dp = db_lookup(dgcdp->gedp->ged_wdbp->dbip, tp->tr_l.tl_name,
LOOKUP_NOISY);
+ if (dp == RT_DIR_NULL) {
break;
}
eptr = add_solid(dp, tp->tr_l.tl_mat, dgcdp);
Modified: brlcad/trunk/src/libged/bo/bo.c
===================================================================
--- brlcad/trunk/src/libged/bo/bo.c 2020-07-27 20:46:49 UTC (rev 76535)
+++ brlcad/trunk/src/libged/bo/bo.c 2020-07-27 20:48:06 UTC (rev 76536)
@@ -182,7 +182,8 @@
obj_name = (char *)*argv;
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, obj_name, LOOKUP_NOISY)) ==
RT_DIR_NULL) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, obj_name, LOOKUP_NOISY);
+ if (dp == RT_DIR_NULL) {
return GED_ERROR;
}
if (!(dp->d_major_type & DB5_MAJORTYPE_BINARY_MASK)) {
Modified: brlcad/trunk/src/libged/bot/bot_dump.c
===================================================================
--- brlcad/trunk/src/libged/bot/bot_dump.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/bot/bot_dump.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -779,7 +779,7 @@
MAT_IDN(mat);
/* get the internal form */
- ret=rt_db_get_internal(&intern, dp, gbdcdp->gedp->ged_wdbp->dbip, mat,
&rt_uniresource);
+ ret = rt_db_get_internal(&intern, dp, gbdcdp->gedp->ged_wdbp->dbip, mat,
&rt_uniresource);
if (ret < 0) {
bu_log("ged_bot_leaf: rt_get_internal failure %d on %s\n", ret,
dp->d_namep);
@@ -1359,7 +1359,7 @@
dp = sp->s_fullpath.fp_names[sp->s_fullpath.fp_len-1];
/* get the internal form */
- ret=rt_db_get_internal(&intern, dp, dbip, mat, &rt_uniresource);
+ ret = rt_db_get_internal(&intern, dp, dbip, mat, &rt_uniresource);
if (ret < 0) {
bu_log("rt_get_internal failure %d on %s\n", ret, dp->d_namep);
Modified: brlcad/trunk/src/libged/bot/bot_face_sort.c
===================================================================
--- brlcad/trunk/src/libged/bot/bot_face_sort.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/bot/bot_face_sort.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -72,7 +72,8 @@
struct rt_db_internal intern;
struct rt_bot_internal *bot;
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) ==
RT_DIR_NULL) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY);
+ if (dp == RT_DIR_NULL) {
continue;
}
Modified: brlcad/trunk/src/libged/check/check.c
===================================================================
--- brlcad/trunk/src/libged/check/check.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/check/check.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -276,7 +276,9 @@
break;
case 'P':
/* cannot ask for more cpu's than the machine has */
- if ((c=atoi(bu_optarg)) > 0 && c <= (int) bu_avail_cpus())
options->ncpu = c;
+ c = atoi(bu_optarg);
+ if (c > 0 && c <= (int) bu_avail_cpus())
+ options->ncpu = c;
analyze_set_ncpu(state, options->ncpu);
break;
case 'q':
Modified: brlcad/trunk/src/libged/clone/clone.c
===================================================================
--- brlcad/trunk/src/libged/clone/clone.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/clone/clone.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -643,7 +643,8 @@
return NULL;
}
- if ((dp=db_diradd(dbip, bu_vls_addr(name), RT_DIR_PHONY_ADDR, 0,
proto->d_flags, (void *)&proto->d_minor_type)) == RT_DIR_NULL) {
+ dp = db_diradd(dbip, bu_vls_addr(name), RT_DIR_PHONY_ADDR, 0,
proto->d_flags, (void *)&proto->d_minor_type);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(state->gedp->ged_result_str, "An error has
occurred while adding a new object to the database.");
return NULL;
}
Modified: brlcad/trunk/src/libged/comb/comb.c
===================================================================
--- brlcad/trunk/src/libged/comb/comb.c 2020-07-27 20:46:49 UTC (rev 76535)
+++ brlcad/trunk/src/libged/comb/comb.c 2020-07-27 20:48:06 UTC (rev 76536)
@@ -137,7 +137,8 @@
bu_vls_sprintf(&comb_child_name, "%s.c", dp->d_namep);
/* First, make sure the target comb name for wrapping doesn't already
exist */
- if ((new_dp=db_lookup(gedp->ged_wdbp->dbip, bu_vls_addr(&comb_child_name),
LOOKUP_QUIET)) != RT_DIR_NULL) {
+ new_dp = db_lookup(gedp->ged_wdbp->dbip, bu_vls_addr(&comb_child_name),
LOOKUP_QUIET);
+ if (new_dp != RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "ERROR: %s already exists in the
database, cannot wrap %s", bu_vls_addr(&comb_child_name), dp->d_namep);
bu_vls_free(&comb_child_name);
bu_vls_free(&orig_name);
@@ -161,7 +162,8 @@
bu_free_external(&external);
/* Load new obj.c comb and clear its region flag, if any */
- if ((new_dp=db_lookup(gedp->ged_wdbp->dbip, bu_vls_addr(&comb_child_name),
LOOKUP_QUIET)) == RT_DIR_NULL) {
+ new_dp = db_lookup(gedp->ged_wdbp->dbip, bu_vls_addr(&comb_child_name),
LOOKUP_QUIET);
+ if (new_dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "Wrapping %s: creation of %s
failed!", dp->d_namep, bu_vls_addr(&comb_child_name));
bu_vls_free(&comb_child_name);
bu_vls_free(&orig_name);
@@ -185,7 +187,8 @@
bu_vls_free(&orig_name);
return GED_ERROR;
}
- if ((orig_dp=db_lookup(gedp->ged_wdbp->dbip, bu_vls_addr(&orig_name),
LOOKUP_QUIET)) == RT_DIR_NULL) {
+ orig_dp = db_lookup(gedp->ged_wdbp->dbip, bu_vls_addr(&orig_name),
LOOKUP_QUIET);
+ if (orig_dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "ERROR: %s tree clearing failed",
bu_vls_addr(&orig_name));
bu_vls_free(&comb_child_name);
bu_vls_free(&orig_name);
@@ -713,7 +716,8 @@
if (comb_wrap(gedp, dp) == GED_ERROR) {
return GED_ERROR;
} else {
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, comb_name, LOOKUP_QUIET))
== RT_DIR_NULL) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, comb_name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "ERROR: wrap of %s failed",
comb_name);
return GED_ERROR;
}
@@ -728,7 +732,8 @@
if (comb_flatten(gedp, dp) == GED_ERROR) {
return GED_ERROR;
} else {
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, comb_name, LOOKUP_QUIET))
== RT_DIR_NULL) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, comb_name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "ERROR: flattening of %s
failed", comb_name);
return GED_ERROR;
}
@@ -743,7 +748,8 @@
if (comb_lift_region(gedp, dp) == GED_ERROR) {
return GED_ERROR;
} else {
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, comb_name, LOOKUP_QUIET))
== RT_DIR_NULL) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, comb_name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "ERROR: region lift to %s
failed", comb_name);
return GED_ERROR;
}
Modified: brlcad/trunk/src/libged/copyeval/copyeval.c
===================================================================
--- brlcad/trunk/src/libged/copyeval/copyeval.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/copyeval/copyeval.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -136,7 +136,7 @@
/* should call GED_DB_DIRADD() but need to deal with freeing the
* internals on failure.
*/
- dp=db_diradd(gedp->ged_wdbp->dbip, argv[2], RT_DIR_PHONY_ADDR, 0,
gtd.gtd_obj[endpos-1]->d_flags, (void *)&ip->idb_type);
+ dp = db_diradd(gedp->ged_wdbp->dbip, argv[2], RT_DIR_PHONY_ADDR, 0,
gtd.gtd_obj[endpos-1]->d_flags, (void *)&ip->idb_type);
if (dp == RT_DIR_NULL) {
rt_db_free_internal(&internal);
if (ip == &new_int)
Modified: brlcad/trunk/src/libged/decompose/decompose.c
===================================================================
--- brlcad/trunk/src/libged/decompose/decompose.c 2020-07-27 20:46:49 UTC
(rev 76535)
+++ brlcad/trunk/src/libged/decompose/decompose.c 2020-07-27 20:48:06 UTC
(rev 76536)
@@ -79,7 +79,8 @@
prefix = def_prefix;
}
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, nmg_solid_name, LOOKUP_NOISY)) ==
RT_DIR_NULL)
+ dp = db_lookup(gedp->ged_wdbp->dbip, nmg_solid_name, LOOKUP_NOISY);
+ if (dp == RT_DIR_NULL)
return GED_ERROR;
if (rt_db_get_internal(&nmg_intern, dp, gedp->ged_wdbp->dbip,
bn_mat_identity, &rt_uniresource) < 0) {
@@ -172,7 +173,7 @@
new_intern.idb_meth = &OBJ[ID_NMG];
new_intern.idb_ptr = (void *)new_m;
- new_dp=db_diradd(gedp->ged_wdbp->dbip,
bu_vls_addr(&solid_name), RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void
*)&new_intern.idb_type);
+ new_dp = db_diradd(gedp->ged_wdbp->dbip,
bu_vls_addr(&solid_name), RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void
*)&new_intern.idb_type);
if (new_dp == RT_DIR_NULL) {
bu_vls_free(&solid_name);
bu_vls_printf(gedp->ged_result_str, "%s: Database alloc
error, aborting", argv[0]);
Modified: brlcad/trunk/src/libged/display_list.c
===================================================================
--- brlcad/trunk/src/libged/display_list.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/display_list.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -2209,8 +2209,7 @@
for (i = 0; i < sp->s_fullpath.fp_len; i++) {
if (!(DB_FULL_PATH_GET(&sp->s_fullpath, i)->d_flags &
RT_DIR_USED)) {
struct animate *anp;
- for (anp = DB_FULL_PATH_GET(&sp->s_fullpath,
i)->d_animate; anp;
- anp=anp->an_forw) {
+ for (anp = DB_FULL_PATH_GET(&sp->s_fullpath,
i)->d_animate; anp; anp=anp->an_forw) {
db_write_anim(fp, anp);
}
DB_FULL_PATH_GET(&sp->s_fullpath, i)->d_flags |=
RT_DIR_USED;
Modified: brlcad/trunk/src/libged/draw/draw.c
===================================================================
--- brlcad/trunk/src/libged/draw/draw.c 2020-07-27 20:46:49 UTC (rev 76535)
+++ brlcad/trunk/src/libged/draw/draw.c 2020-07-27 20:48:06 UTC (rev 76536)
@@ -1031,7 +1031,7 @@
if (ptr_A)
flag_A_attr = 1;
- ptr_o=strchr(argv[i], 'o');
+ ptr_o = strchr(argv[i], 'o');
if (ptr_o)
flag_o_nonunique = 2;
Modified: brlcad/trunk/src/libged/edcodes/edcodes.c
===================================================================
--- brlcad/trunk/src/libged/edcodes/edcodes.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/edcodes/edcodes.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -78,7 +78,8 @@
RT_CK_DBI(dbip);
RT_CK_TREE(comb_leaf);
- if ((nextdp=db_lookup(dbip, comb_leaf->tr_l.tl_name, LOOKUP_NOISY)) ==
RT_DIR_NULL)
+ nextdp = db_lookup(dbip, comb_leaf->tr_l.tl_name, LOOKUP_NOISY);
+ if (nextdp == RT_DIR_NULL)
return;
pathpos = (int *)user_ptr1;
@@ -105,8 +106,8 @@
if (!(dp->d_flags & RT_DIR_COMB))
return EDCODES_OK;
- if ((id=rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip,
- (matp_t)NULL, &rt_uniresource)) < 0) {
+ id = rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, (matp_t)NULL,
&rt_uniresource);
+ if (id < 0) {
bu_vls_printf(gedp->ged_result_str,
"Cannot get records for %s\n", dp->d_namep);
return EDCODES_NOTOK;
Modified: brlcad/trunk/src/libged/erase/erase.c
===================================================================
--- brlcad/trunk/src/libged/erase/erase.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/erase/erase.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -82,7 +82,7 @@
if (ptr_A)
flag_A_attr = 1;
- ptr_o=strchr(argv[i], 'o');
+ ptr_o = strchr(argv[i], 'o');
if (ptr_o)
flag_o_nonunique = 2;
Modified: brlcad/trunk/src/libged/facetize/facetize.cpp
===================================================================
--- brlcad/trunk/src/libged/facetize/facetize.cpp 2020-07-27 20:46:49 UTC
(rev 76535)
+++ brlcad/trunk/src/libged/facetize/facetize.cpp 2020-07-27 20:48:06 UTC
(rev 76536)
@@ -704,7 +704,7 @@
intern.idb_meth = &OBJ[ID_BOT];
intern.idb_ptr = (void *)bot;
- dp=db_diradd(dbip, name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void
*)&intern.idb_type);
+ dp = db_diradd(dbip, name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void
*)&intern.idb_type);
if (dp == RT_DIR_NULL) {
if (opts->verbosity) {
bu_log("Cannot add %s to directory\n", name);
@@ -737,7 +737,7 @@
intern.idb_meth = &OBJ[ID_NMG];
intern.idb_ptr = (void *)nmg_model;
- dp=db_diradd(dbip, name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void
*)&intern.idb_type);
+ dp = db_diradd(dbip, name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void
*)&intern.idb_type);
if (dp == RT_DIR_NULL) {
if (opts->verbosity) {
bu_log("Cannot add %s to directory\n", name);
Modified: brlcad/trunk/src/libged/fracture/fracture.c
===================================================================
--- brlcad/trunk/src/libged/fracture/fracture.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/fracture/fracture.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -50,7 +50,7 @@
return;
}
- new_dp=db_diradd(gedp->ged_wdbp->dbip, newname, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&new_intern.idb_type);
+ new_dp = db_diradd(gedp->ged_wdbp->dbip, newname, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&new_intern.idb_type);
if (new_dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str,
"Failed to add new object name (%s) to directory -
aborting!!\n",
Modified: brlcad/trunk/src/libged/ged_util.c
===================================================================
--- brlcad/trunk/src/libged/ged_util.c 2020-07-27 20:46:49 UTC (rev 76535)
+++ brlcad/trunk/src/libged/ged_util.c 2020-07-27 20:48:06 UTC (rev 76536)
@@ -965,7 +965,9 @@
conv = atof(avp->value);
bu_vls_strcat(gedp->ged_result_str, "\tunits: ");
- if ((str=bu_units_string(conv)) == NULL) {
+
+ str = bu_units_string(conv);
+ if (str == NULL) {
bu_vls_strcat(gedp->ged_result_str, "Unrecognized units\n");
} else {
bu_vls_strcat(gedp->ged_result_str, str);
Modified: brlcad/trunk/src/libged/get_obj_bounds.c
===================================================================
--- brlcad/trunk/src/libged/get_obj_bounds.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/get_obj_bounds.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -53,7 +53,8 @@
struct region *regp;
/* Make a new rt_i instance from the existing db_i structure */
- if ((rtip=rt_new_rti(gedp->ged_wdbp->dbip)) == RTI_NULL) {
+ rtip = rt_new_rti(gedp->ged_wdbp->dbip);
+ if (rtip == RTI_NULL) {
bu_vls_printf(gedp->ged_result_str, "rt_new_rti failure for %s\n",
gedp->ged_wdbp->dbip->dbi_filename);
return GED_ERROR;
}
@@ -251,7 +252,8 @@
GED_DB_GET_INTERNAL(gedp, &intern, dp, gtdp->gtd_xform, &rt_uniresource,
GED_ERROR);
/* Make a new rt_i instance from the existing db_i structure */
- if ((rtip=rt_new_rti(gedp->ged_wdbp->dbip)) == RTI_NULL) {
+ rtip = rt_new_rti(gedp->ged_wdbp->dbip);
+ if (rtip == RTI_NULL) {
bu_vls_printf(gedp->ged_result_str, "rt_new_rti failure for %s",
gedp->ged_wdbp->dbip->dbi_filename);
return GED_ERROR;
}
Modified: brlcad/trunk/src/libged/gqa/gqa.c
===================================================================
--- brlcad/trunk/src/libged/gqa/gqa.c 2020-07-27 20:46:49 UTC (rev 76535)
+++ brlcad/trunk/src/libged/gqa/gqa.c 2020-07-27 20:48:06 UTC (rev 76536)
@@ -1344,7 +1344,7 @@
char *str = bu_strdup(name);
char *p;
- p=strchr(str, '/');
+ p = strchr(str, '/');
if (p) {
*p = '\0';
}
Modified: brlcad/trunk/src/libged/joint/joint.c
===================================================================
--- brlcad/trunk/src/libged/joint/joint.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/joint/joint.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -2192,7 +2192,7 @@
/*
* If no animate structure, cons one up.
*/
- anp=jp->anim;
+ anp = jp->anim;
if (!anp || anp->magic != ANIMATE_MAGIC) {
char *sofar;
struct directory *dp = NULL;
@@ -2207,7 +2207,7 @@
}
db_add_node_to_full_path(&anp->an_path, dp);
}
- jp->anim=anp;
+ jp->anim = anp;
db_add_anim(gedp->ged_wdbp->dbip, anp, 0);
if (J_DEBUG & DEBUG_J_MOVE) {
@@ -2697,7 +2697,7 @@
hold=(struct jointH *)jh->l.back;
BU_LIST_DEQUEUE(&jh->l);
jh->p->uses--;
- jh=hold;
+ jh = hold;
}
}
}
@@ -2734,20 +2734,20 @@
* bx-limits-0.001 or lower and cx = bx+limits+0.001 or
* upper.
*/
- ax=bx-limits-EPSI;
+ ax = bx-limits-EPSI;
if (ax < jp->rots[i].lower)
- ax=jp->rots[i].lower;
- cx=bx+limits+EPSI;
+ ax = jp->rots[i].lower;
+ cx = bx+limits+EPSI;
if (cx > jp->rots[i].upper)
- cx=jp->rots[i].upper;
- x0=ax;
- x3=cx;
+ cx = jp->rots[i].upper;
+ x0 = ax;
+ x3 = cx;
if (fabs(cx-bx) > fabs(bx-ax)) {
- x1=bx;
- x2=bx+C*(cx-bx);
+ x1 = bx;
+ x2 = bx+C*(cx-bx);
} else {
- x2=bx;
- x1=bx-C*(bx-ax);
+ x2 = bx;
+ x1 = bx-C*(bx-ax);
}
jp->rots[i].current = x1;
joint_adjust(gedp, jp);
Modified: brlcad/trunk/src/libged/lint/lint.cpp
===================================================================
--- brlcad/trunk/src/libged/lint/lint.cpp 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/lint/lint.cpp 2020-07-27 20:48:06 UTC (rev
76536)
@@ -140,7 +140,8 @@
_ged_cyclic_search_subtree(path, OP_UNION, tp->tr_b.tb_left,
traverse_func, client_data);
break;
case OP_DB_LEAF:
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, tp->tr_l.tl_name,
LOOKUP_QUIET)) == RT_DIR_NULL) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, tp->tr_l.tl_name,
LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
return;
} else {
/* See if we've got a cyclic path */
Modified: brlcad/trunk/src/libged/mater/mater.cpp
===================================================================
--- brlcad/trunk/src/libged/mater/mater.cpp 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/mater/mater.cpp 2020-07-27 20:48:06 UTC (rev
76536)
@@ -1173,8 +1173,8 @@
}
/* add this (phony until written) object to the directory */
- if ((dp=db_diradd5(gedp->ged_wdbp->dbip, GED_DB_DENSITY_OBJECT,
RT_DIR_PHONY_ADDR, intern.idb_major_type,
- intern.idb_minor_type, 0, 0, NULL)) == RT_DIR_NULL) {
+ dp = db_diradd5(gedp->ged_wdbp->dbip, GED_DB_DENSITY_OBJECT,
RT_DIR_PHONY_ADDR, intern.idb_major_type, intern.idb_minor_type, 0, 0, NULL);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "Error while attempting to add new
name (%s) to the database", GED_DB_DENSITY_OBJECT);
bu_free_external(&bin_ext);
return GED_ERROR;
Modified: brlcad/trunk/src/libged/nmg/nmg_collapse.c
===================================================================
--- brlcad/trunk/src/libged/nmg/nmg_collapse.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/nmg/nmg_collapse.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -77,7 +77,8 @@
return GED_ERROR;
}
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_NOISY)) ==
RT_DIR_NULL)
+ dp = db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_NOISY);
+ if (dp == RT_DIR_NULL)
return GED_ERROR;
if (dp->d_flags & RT_DIR_COMB) {
@@ -132,7 +133,7 @@
count = (size_t)nmg_edge_collapse(m, &gedp->ged_wdbp->wdb_tol, tol_coll,
min_angle, &RTG.rtg_vlfree);
- dp=db_diradd(gedp->ged_wdbp->dbip, new_name, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&intern.idb_type);
+ dp = db_diradd(gedp->ged_wdbp->dbip, new_name, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&intern.idb_type);
if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "Cannot add %s to directory\n",
new_name);
rt_db_free_internal(&intern);
Modified: brlcad/trunk/src/libged/pix2fb/pix2fb.c
===================================================================
--- brlcad/trunk/src/libged/pix2fb/pix2fb.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/pix2fb/pix2fb.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -136,7 +136,7 @@
scr_height = atoi(bu_optarg);
break;
case 'p':
- pause_sec=atoi(bu_optarg);
+ pause_sec = atoi(bu_optarg);
break;
default: /* 'h' '?' */
Modified: brlcad/trunk/src/libged/shells/shells.c
===================================================================
--- brlcad/trunk/src/libged/shells/shells.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/shells/shells.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -107,7 +107,7 @@
new_intern.idb_meth = &OBJ[ID_NMG];
new_intern.idb_ptr = (void *)m_tmp;
- new_dp=db_diradd(gedp->ged_wdbp->dbip, bu_vls_addr(&shell_name),
RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&new_intern.idb_type);
+ new_dp = db_diradd(gedp->ged_wdbp->dbip, bu_vls_addr(&shell_name),
RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&new_intern.idb_type);
if (new_dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "An error has occurred
while adding a new object to the database.\n");
return GED_ERROR;
Modified: brlcad/trunk/src/libged/tables/tables.c
===================================================================
--- brlcad/trunk/src/libged/tables/tables.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/tables/tables.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -302,7 +302,8 @@
break;
}
- if ((sol_dp=db_lookup(gedp->ged_wdbp->dbip,
tree_list[i].tl_tree->tr_l.tl_name, LOOKUP_QUIET)) != RT_DIR_NULL) {
+ sol_dp = db_lookup(gedp->ged_wdbp->dbip,
tree_list[i].tl_tree->tr_l.tl_name, LOOKUP_QUIET);
+ if (sol_dp != RT_DIR_NULL) {
if (sol_dp->d_flags & RT_DIR_COMB) {
bu_vls_printf(tobj->tree, " RG %c %s\n", op,
sol_dp->d_namep);
continue;
Modified: brlcad/trunk/src/libged/trace.c
===================================================================
--- brlcad/trunk/src/libged/trace.c 2020-07-27 20:46:49 UTC (rev 76535)
+++ brlcad/trunk/src/libged/trace.c 2020-07-27 20:48:06 UTC (rev 76536)
@@ -163,7 +163,8 @@
/* NOTE - only reach here if gtd_flag == _GED_LISTEVAL */
bu_vls_printf(gtdp->gtd_gedp->ged_result_str, "/");
- if ((id=rt_db_get_internal(&intern, dp, gtdp->gtd_gedp->ged_wdbp->dbip,
gtdp->gtd_xform, &rt_uniresource)) < 0) {
+ id = rt_db_get_internal(&intern, dp, gtdp->gtd_gedp->ged_wdbp->dbip,
gtdp->gtd_xform, &rt_uniresource);
+ if (id < 0) {
bu_vls_printf(gtdp->gtd_gedp->ged_result_str, "rt_db_get_internal(%s)
failure", dp->d_namep);
return;
}
Modified: brlcad/trunk/src/libged/typein/typein.c
===================================================================
--- brlcad/trunk/src/libged/typein/typein.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/typein/typein.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -2324,7 +2324,8 @@
eip->sketch_name = bu_strdup(cmd_argvs[15]);
/* eip->keypoint = atoi(cmd_argvs[16]); */
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, eip->sketch_name, LOOKUP_NOISY))
== RT_DIR_NULL) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, eip->sketch_name, LOOKUP_NOISY);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "Cannot find sketch (%s) for
extrusion (%s)\n",
eip->sketch_name, cmd_argvs[1]);
eip->skt = (struct rt_sketch_internal *)NULL;
@@ -2377,7 +2378,8 @@
VUNITIZE(rip->r);
VUNITIZE(rip->axis3d);
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, bu_vls_addr(&rip->sketch_name),
LOOKUP_NOISY)) == RT_DIR_NULL) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, bu_vls_addr(&rip->sketch_name),
LOOKUP_NOISY);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "Cannot find sketch (%s) for
revolve (%s)\n",
bu_vls_addr(&rip->sketch_name), cmd_argvs[1]);
rip->skt = (struct rt_sketch_internal *)NULL;
@@ -3473,7 +3475,7 @@
do_new_update:
/* The function may have already written via LIBWDB */
if (internal.idb_ptr != NULL) {
- dp=db_diradd(gedp->ged_wdbp->dbip, name, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&internal.idb_type);
+ dp = db_diradd(gedp->ged_wdbp->dbip, name, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&internal.idb_type);
if (dp == RT_DIR_NULL) {
rt_db_free_internal(&internal);
bu_vls_printf(gedp->ged_result_str, "%s: Cannot add '%s' to
directory\n", argv[0], name);
Modified: brlcad/trunk/src/libged/wcodes/wcodes.c
===================================================================
--- brlcad/trunk/src/libged/wcodes/wcodes.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/wcodes/wcodes.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -59,7 +59,8 @@
RT_CK_DBI(dbip);
RT_CK_TREE(comb_leaf);
- if ((nextdp=db_lookup(dbip, comb_leaf->tr_l.tl_name, LOOKUP_NOISY)) ==
RT_DIR_NULL)
+ nextdp = db_lookup(dbip, comb_leaf->tr_l.tl_name, LOOKUP_NOISY);
+ if (nextdp == RT_DIR_NULL)
return;
fp = (FILE *)user_ptr1;
@@ -83,7 +84,8 @@
if (!(dp->d_flags & RT_DIR_COMB))
return GED_OK;
- if ((id=rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip,
(matp_t)NULL, &rt_uniresource)) < 0) {
+ id = rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, (matp_t)NULL,
&rt_uniresource);
+ if (id < 0) {
bu_vls_printf(gedp->ged_result_str, "Cannot get records for %s\n",
dp->d_namep);
return GED_ERROR;
}
Modified: brlcad/trunk/src/libged/whatid/whatid.c
===================================================================
--- brlcad/trunk/src/libged/whatid/whatid.c 2020-07-27 20:46:49 UTC (rev
76535)
+++ brlcad/trunk/src/libged/whatid/whatid.c 2020-07-27 20:48:06 UTC (rev
76536)
@@ -57,8 +57,8 @@
return GED_ERROR;
}
-
- if ((dp=db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_NOISY)) ==
RT_DIR_NULL)
+ dp = db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_NOISY);
+ if (dp == RT_DIR_NULL)
return GED_ERROR;
if (!(dp->d_flags & RT_DIR_REGION)) {
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
