Revision: 76570
http://sourceforge.net/p/brlcad/code/76570
Author: starseeker
Date: 2020-07-29 14:43:33 +0000 (Wed, 29 Jul 2020)
Log Message:
-----------
Per ged/defines.h, with the exception of GED_OK we're actually supposed to be
checking fore these returns via masking, not with an equality test. Fix.
Modified Paths:
--------------
brlcad/branches/bioh/src/libged/arb/rotate_arb_face.c
brlcad/branches/bioh/src/libged/bb/bb.c
brlcad/branches/bioh/src/libged/bot/bot.cpp
brlcad/branches/bioh/src/libged/bot/bot_dump.c
brlcad/branches/bioh/src/libged/bot/check.cpp
brlcad/branches/bioh/src/libged/bot/edbot.c
brlcad/branches/bioh/src/libged/bot/extrude.cpp
brlcad/branches/bioh/src/libged/bot/remesh.cpp
brlcad/branches/bioh/src/libged/clone/clone.c
brlcad/branches/bioh/src/libged/comb/comb.c
brlcad/branches/bioh/src/libged/comb_std/comb_std.c
brlcad/branches/bioh/src/libged/copymat/copymat.c
brlcad/branches/bioh/src/libged/edcodes/edcodes.c
brlcad/branches/bioh/src/libged/edit/edit.c
brlcad/branches/bioh/src/libged/edmater/edmater.c
brlcad/branches/bioh/src/libged/facetize/facetize.cpp
brlcad/branches/bioh/src/libged/ged_util.c
brlcad/branches/bioh/src/libged/get/get.c
brlcad/branches/bioh/src/libged/get_obj_bounds.c
brlcad/branches/bioh/src/libged/get_type/get_type.c
brlcad/branches/bioh/src/libged/mater/mater.cpp
brlcad/branches/bioh/src/libged/metaball/metaball.c
brlcad/branches/bioh/src/libged/move_arb_edge/move_arb_edge.c
brlcad/branches/bioh/src/libged/move_arb_face/move_arb_face.c
brlcad/branches/bioh/src/libged/ocenter/ocenter.c
brlcad/branches/bioh/src/libged/orotate/orotate.c
brlcad/branches/bioh/src/libged/oscale/oscale.c
brlcad/branches/bioh/src/libged/otranslate/otranslate.c
brlcad/branches/bioh/src/libged/pipe/pipe.c
brlcad/branches/bioh/src/libged/pipe.c
brlcad/branches/bioh/src/libged/polyclip.cpp
brlcad/branches/bioh/src/libged/protate/protate.c
brlcad/branches/bioh/src/libged/pscale/pscale.c
brlcad/branches/bioh/src/libged/pset/pset.c
brlcad/branches/bioh/src/libged/ptranslate/ptranslate.c
brlcad/branches/bioh/src/libged/put/put.c
brlcad/branches/bioh/src/libged/put_comb/put_comb.c
brlcad/branches/bioh/src/libged/rmater/rmater.c
brlcad/branches/bioh/src/libged/select/select.c
brlcad/branches/bioh/src/libged/wcodes/wcodes.c
brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c
brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c
brlcad/branches/bioh/src/libtclcad/view/arrows.c
brlcad/branches/bioh/src/libtclcad/view/axes.c
brlcad/branches/bioh/src/libtclcad/view/labels.c
brlcad/branches/bioh/src/libtclcad/view/lines.c
brlcad/branches/bioh/src/mged/chgview.c
brlcad/branches/bioh/src/mged/dodraw.c
brlcad/branches/bioh/src/mged/overlay.c
brlcad/branches/bioh/src/mged/utility1.c
brlcad/branches/bioh/src/mged/wdb_obj.c
brlcad/branches/bioh/src/shapes/coil.c
Modified: brlcad/branches/bioh/src/libged/arb/rotate_arb_face.c
===================================================================
--- brlcad/branches/bioh/src/libged/arb/rotate_arb_face.c 2020-07-29
14:16:57 UTC (rev 76569)
+++ brlcad/branches/bioh/src/libged/arb/rotate_arb_face.c 2020-07-29
14:43:33 UTC (rev 76570)
@@ -95,7 +95,7 @@
return GED_ERROR;
}
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) == GED_ERROR)
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) & GED_ERROR)
return GED_ERROR;
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD ||
Modified: brlcad/branches/bioh/src/libged/bb/bb.c
===================================================================
--- brlcad/branches/bioh/src/libged/bb/bb.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/bb/bb.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -126,7 +126,7 @@
VSETALL(rpp_min, INFINITY);
VSETALL(rpp_max, -INFINITY);
for (i = 0; i < argc; i++) {
- if (ged_get_obj_bounds(gedp, argc - i, (const char **)argv+i,
use_air, obj_min, obj_max) == GED_ERROR)
+ if (ged_get_obj_bounds(gedp, argc - i, (const char **)argv+i,
use_air, obj_min, obj_max) & GED_ERROR)
return GED_ERROR;
VMINMAX(rpp_min, rpp_max, (double *)obj_min);
VMINMAX(rpp_min, rpp_max, (double *)obj_max);
Modified: brlcad/branches/bioh/src/libged/bot/bot.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/bot/bot.cpp 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/bot/bot.cpp 2020-07-29 14:43:33 UTC (rev
76570)
@@ -115,7 +115,7 @@
return GED_ERROR;
}
- if (_bot_obj_setup(gb, argv[1]) == GED_ERROR) {
+ if (_bot_obj_setup(gb, argv[1]) & GED_ERROR) {
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libged/bot/bot_dump.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot/bot_dump.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/bot/bot_dump.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -891,7 +891,7 @@
using_dbot_dump = 0;
- if (bot_dump_get_args(gedp, argc, argv) == GED_ERROR)
+ if (bot_dump_get_args(gedp, argc, argv) & GED_ERROR)
return GED_ERROR;
if (bu_optind > argc) {
Modified: brlcad/branches/bioh/src/libged/bot/check.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/bot/check.cpp 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/bot/check.cpp 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -711,7 +711,7 @@
return GED_OK;
}
- if (_bot_obj_setup(gb, argv[argc-1]) == GED_ERROR) {
+ if (_bot_obj_setup(gb, argv[argc-1]) & GED_ERROR) {
return GED_ERROR;
}
argc--;
Modified: brlcad/branches/bioh/src/libged/bot/edbot.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot/edbot.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/bot/edbot.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -89,7 +89,7 @@
return GED_ERROR;
}
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, last,
gedp->ged_wdbp, mat) == GED_ERROR) {
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, last,
gedp->ged_wdbp, mat) & GED_ERROR) {
bu_vls_printf(gedp->ged_result_str, "%s: failed to find %s", argv[0],
argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libged/bot/extrude.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/bot/extrude.cpp 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/bot/extrude.cpp 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -100,7 +100,7 @@
argc--; argv++;
- if (_bot_obj_setup(gb, argv[0]) == GED_ERROR) {
+ if (_bot_obj_setup(gb, argv[0]) & GED_ERROR) {
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libged/bot/remesh.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/bot/remesh.cpp 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/bot/remesh.cpp 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -179,7 +179,7 @@
argc--; argv++;
- if (_bot_obj_setup(gb, argv[0]) == GED_ERROR) {
+ if (_bot_obj_setup(gb, argv[0]) & GED_ERROR) {
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libged/clone/clone.c
===================================================================
--- brlcad/branches/bioh/src/libged/clone/clone.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/clone/clone.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -1006,7 +1006,7 @@
}
/* validate user options */
- if (get_args(gedp, argc, (char **)argv, &state) == GED_ERROR)
+ if (get_args(gedp, argc, (char **)argv, &state) & GED_ERROR)
return GED_ERROR;
bu_vls_init(&state.olist);
Modified: brlcad/branches/bioh/src/libged/comb/comb.c
===================================================================
--- brlcad/branches/bioh/src/libged/comb/comb.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/comb/comb.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -169,7 +169,7 @@
bu_vls_free(&orig_name);
return GED_ERROR;
}
- if (region_flag_clear(gedp, new_dp) == GED_ERROR) {
+ if (region_flag_clear(gedp, new_dp) & GED_ERROR) {
bu_vls_free(&comb_child_name);
bu_vls_free(&orig_name);
return GED_ERROR;
Modified: brlcad/branches/bioh/src/libged/comb_std/comb_std.c
===================================================================
--- brlcad/branches/bioh/src/libged/comb_std/comb_std.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/comb_std/comb_std.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -561,7 +561,7 @@
if (last_tok == TOK_RPAREN) {
/* next token MUST be an operator */
- if (add_operator(gedp, &tok_hd.l, ptr, &last_tok) == GED_ERROR)
{
+ if (add_operator(gedp, &tok_hd.l, ptr, &last_tok) & GED_ERROR) {
free_tokens(&tok_hd.l);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libged/copymat/copymat.c
===================================================================
--- brlcad/branches/bioh/src/libged/copymat/copymat.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/copymat/copymat.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -150,7 +150,7 @@
wrapup:
bu_vls_free(&pvls);
- if (status == GED_ERROR)
+ if (status & GED_ERROR)
rt_db_free_internal(&intern);
return status;
}
Modified: brlcad/branches/bioh/src/libged/edcodes/edcodes.c
===================================================================
--- brlcad/branches/bioh/src/libged/edcodes/edcodes.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/edcodes/edcodes.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -227,7 +227,7 @@
(void)fclose(fp);
- if (ged_wcodes(gedp, argc + 1, (const char **)av) == GED_ERROR) {
+ if (ged_wcodes(gedp, argc + 1, (const char **)av) & GED_ERROR) {
bu_file_delete(tmpfil);
bu_free((void *)av, "ged_edcodes_core av");
return GED_ERROR;
Modified: brlcad/branches/bioh/src/libged/edit/edit.c
===================================================================
--- brlcad/branches/bioh/src/libged/edit/edit.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/edit/edit.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -778,7 +778,7 @@
point_t rpp_max;
size_t i;
- if (ged_path_validate(gedp, path) == GED_ERROR) {
+ if (ged_path_validate(gedp, path) & GED_ERROR) {
bu_vls_printf(gedp->ged_result_str, "path \"%s\" does not exist in"
"the database", db_path_to_string(path));
return GED_ERROR;
Modified: brlcad/branches/bioh/src/libged/edmater/edmater.c
===================================================================
--- brlcad/branches/bioh/src/libged/edmater/edmater.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/edmater/edmater.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -91,7 +91,7 @@
(void)fclose(fp);
- if (ged_wmater(gedp, argc, av) == GED_ERROR) {
+ if (ged_wmater(gedp, argc, av) & GED_ERROR) {
bu_file_delete(tmpfil);
bu_free((void *)av, "f_edmater: av");
return GED_ERROR;
Modified: brlcad/branches/bioh/src/libged/facetize/facetize.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/facetize/facetize.cpp 2020-07-29
14:16:57 UTC (rev 76569)
+++ brlcad/branches/bioh/src/libged/facetize/facetize.cpp 2020-07-29
14:43:33 UTC (rev 76570)
@@ -938,7 +938,7 @@
bu_vls_printf(&tmpname, "-0");
bu_vls_incr(&tmpname, NULL, NULL, &_db_uniq_test, (void *)gedp);
}
- if (_write_bot(gedp, tbot, bu_vls_addr(&tmpname), opts) == GED_ERROR) {
+ if (_write_bot(gedp, tbot, bu_vls_addr(&tmpname), opts) & GED_ERROR) {
bu_log("SPSR: could not write BoT to temporary name %s\n",
bu_vls_addr(&tmpname));
bu_vls_free(&tmpname);
ret = GED_FACETIZE_FAILURE;
Modified: brlcad/branches/bioh/src/libged/ged_util.c
===================================================================
--- brlcad/branches/bioh/src/libged/ged_util.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/ged_util.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -1525,7 +1525,7 @@
av[0] = objp->d_namep;
av[1] = NULL;
- if (_ged_combadd2(gedp, combname, ac, av, region_flag, relation, ident,
air, NULL, 1) == GED_ERROR)
+ if (_ged_combadd2(gedp, combname, ac, av, region_flag, relation, ident,
air, NULL, 1) & GED_ERROR)
return RT_DIR_NULL;
/* Done changing stuff - update nref. */
Modified: brlcad/branches/bioh/src/libged/get/get.c
===================================================================
--- brlcad/branches/bioh/src/libged/get/get.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/get/get.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -63,7 +63,7 @@
return GED_ERROR;
}
- if (wdb_import_from_path(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp) == GED_ERROR)
+ if (wdb_import_from_path(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp) & GED_ERROR)
return GED_ERROR;
if (!intern.idb_meth->ft_get) {
Modified: brlcad/branches/bioh/src/libged/get_obj_bounds.c
===================================================================
--- brlcad/branches/bioh/src/libged/get_obj_bounds.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/get_obj_bounds.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -245,7 +245,7 @@
VSETALL(rpp_min, MAX_FASTF);
VREVERSE(rpp_max, rpp_min);
- if (get_objpath_mat(gedp, argc, argv, gtdp) == GED_ERROR)
+ if (get_objpath_mat(gedp, argc, argv, gtdp) & GED_ERROR)
return GED_ERROR;
dp = gtdp->gtd_obj[gtdp->gtd_objpos-1];
Modified: brlcad/branches/bioh/src/libged/get_type/get_type.c
===================================================================
--- brlcad/branches/bioh/src/libged/get_type/get_type.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/get_type/get_type.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -56,7 +56,7 @@
return GED_ERROR;
}
- if (wdb_import_from_path(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp) == GED_ERROR)
+ if (wdb_import_from_path(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp) & GED_ERROR)
return GED_ERROR;
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD) {
Modified: brlcad/branches/bioh/src/libged/mater/mater.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/mater/mater.cpp 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/mater/mater.cpp 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -390,7 +390,7 @@
}
// As a first cut, do a fault intolerant read - if there are any problems
we want to know
- if (_ged_read_densities(&a, &dsource, gedp, densities_filename, 0) ==
GED_ERROR) {
+ if (_ged_read_densities(&a, &dsource, gedp, densities_filename, 0) &
GED_ERROR) {
a = NULL;
}
Modified: brlcad/branches/bioh/src/libged/metaball/metaball.c
===================================================================
--- brlcad/branches/bioh/src/libged/metaball/metaball.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/metaball/metaball.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -149,7 +149,7 @@
/* convert from double to fastf_t */
VMOVE(model_pt, scan);
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) == GED_ERROR)
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) & GED_ERROR)
return GED_ERROR;
nearest = find_metaball_pnt_nearest_pnt(&((struct rt_metaball_internal
*)intern.idb_ptr)->metaball_ctrl_head,
Modified: brlcad/branches/bioh/src/libged/move_arb_edge/move_arb_edge.c
===================================================================
--- brlcad/branches/bioh/src/libged/move_arb_edge/move_arb_edge.c
2020-07-29 14:16:57 UTC (rev 76569)
+++ brlcad/branches/bioh/src/libged/move_arb_edge/move_arb_edge.c
2020-07-29 14:43:33 UTC (rev 76570)
@@ -102,7 +102,7 @@
return GED_ERROR;
}
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) == GED_ERROR)
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) & GED_ERROR)
return GED_ERROR;
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD ||
Modified: brlcad/branches/bioh/src/libged/move_arb_face/move_arb_face.c
===================================================================
--- brlcad/branches/bioh/src/libged/move_arb_face/move_arb_face.c
2020-07-29 14:16:57 UTC (rev 76569)
+++ brlcad/branches/bioh/src/libged/move_arb_face/move_arb_face.c
2020-07-29 14:43:33 UTC (rev 76570)
@@ -126,7 +126,7 @@
return GED_ERROR;
}
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) == GED_ERROR)
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) & GED_ERROR)
return GED_ERROR;
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD ||
Modified: brlcad/branches/bioh/src/libged/ocenter/ocenter.c
===================================================================
--- brlcad/branches/bioh/src/libged/ocenter/ocenter.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/ocenter/ocenter.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -68,7 +68,7 @@
* One of the get bounds routines needs to be fixed to
* work with all cases. In the meantime...
*/
- if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) ==
GED_ERROR)
+ if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) &
GED_ERROR)
return GED_ERROR;
dp = gtd.gtd_obj[gtd.gtd_objpos-1];
Modified: brlcad/branches/bioh/src/libged/orotate/orotate.c
===================================================================
--- brlcad/branches/bioh/src/libged/orotate/orotate.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/orotate/orotate.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -85,7 +85,7 @@
if (argc == 5) {
/* Use the object's center as the keypoint. */
- if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) ==
GED_ERROR)
+ if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) &
GED_ERROR)
return GED_ERROR;
dp = gtd.gtd_obj[gtd.gtd_objpos-1];
Modified: brlcad/branches/bioh/src/libged/oscale/oscale.c
===================================================================
--- brlcad/branches/bioh/src/libged/oscale/oscale.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/oscale/oscale.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -75,7 +75,7 @@
}
if (argc == 3) {
- if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) ==
GED_ERROR)
+ if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) &
GED_ERROR)
return GED_ERROR;
dp = gtd.gtd_obj[gtd.gtd_objpos-1];
Modified: brlcad/branches/bioh/src/libged/otranslate/otranslate.c
===================================================================
--- brlcad/branches/bioh/src/libged/otranslate/otranslate.c 2020-07-29
14:16:57 UTC (rev 76569)
+++ brlcad/branches/bioh/src/libged/otranslate/otranslate.c 2020-07-29
14:43:33 UTC (rev 76570)
@@ -63,7 +63,7 @@
return GED_ERROR;
}
- if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) ==
GED_ERROR)
+ if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) &
GED_ERROR)
return GED_ERROR;
dp = gtd.gtd_obj[gtd.gtd_objpos-1];
Modified: brlcad/branches/bioh/src/libged/pipe/pipe.c
===================================================================
--- brlcad/branches/bioh/src/libged/pipe/pipe.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/pipe/pipe.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -191,7 +191,7 @@
/* convert from double to fastf_t */
VMOVE(model_pt, scan);
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) == GED_ERROR)
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) & GED_ERROR)
return GED_ERROR;
nearest = find_pipe_pnt_nearest_pnt(&((struct rt_pipe_internal
*)intern.idb_ptr)->pipe_segs_head,
Modified: brlcad/branches/bioh/src/libged/pipe.c
===================================================================
--- brlcad/branches/bioh/src/libged/pipe.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/pipe.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -628,7 +628,7 @@
/* convert from double to fastf_t */
VMOVE(view_ps_pt, scan);
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) == GED_ERROR)
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[1],
gedp->ged_wdbp, mat) & GED_ERROR)
return GED_ERROR;
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD ||
Modified: brlcad/branches/bioh/src/libged/polyclip.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/polyclip.cpp 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/polyclip.cpp 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -158,7 +158,7 @@
struct contour_node *curr_cnode;
struct bg_polygon *gpp;
- if (wdb_import_from_path(gedp->ged_result_str, &intern, sname,
gedp->ged_wdbp) == GED_ERROR)
+ if (wdb_import_from_path(gedp->ged_result_str, &intern, sname,
gedp->ged_wdbp) & GED_ERROR)
return (struct bg_polygon *)0;
sketch_ip = (rt_sketch_internal *)intern.idb_ptr;
Modified: brlcad/branches/bioh/src/libged/protate/protate.c
===================================================================
--- brlcad/branches/bioh/src/libged/protate/protate.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/protate/protate.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -119,7 +119,7 @@
if (ret == GED_OK) {
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
- } else if (ret == GED_ERROR) {
+ } else if (ret & GED_ERROR) {
rt_db_free_internal(&intern);
}
Modified: brlcad/branches/bioh/src/libged/pscale/pscale.c
===================================================================
--- brlcad/branches/bioh/src/libged/pscale/pscale.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/pscale/pscale.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -161,7 +161,7 @@
if (ret == GED_OK) {
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
- } else if (ret == GED_ERROR) {
+ } else if (ret & GED_ERROR) {
rt_db_free_internal(&intern);
}
Modified: brlcad/branches/bioh/src/libged/pset/pset.c
===================================================================
--- brlcad/branches/bioh/src/libged/pset/pset.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/pset/pset.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -107,7 +107,7 @@
if (ret == GED_OK) {
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
- } else if (ret == GED_ERROR) {
+ } else if (ret & GED_ERROR) {
rt_db_free_internal(&intern);
}
Modified: brlcad/branches/bioh/src/libged/ptranslate/ptranslate.c
===================================================================
--- brlcad/branches/bioh/src/libged/ptranslate/ptranslate.c 2020-07-29
14:16:57 UTC (rev 76569)
+++ brlcad/branches/bioh/src/libged/ptranslate/ptranslate.c 2020-07-29
14:43:33 UTC (rev 76570)
@@ -124,7 +124,7 @@
if (ret == GED_OK) {
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
- } else if (ret == GED_ERROR) {
+ } else if (ret & GED_ERROR) {
rt_db_free_internal(&intern);
}
Modified: brlcad/branches/bioh/src/libged/put/put.c
===================================================================
--- brlcad/branches/bioh/src/libged/put/put.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/libged/put/put.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -89,7 +89,7 @@
rt_generic_make(ftp, &intern);
}
- if (!ftp->ft_adjust || ftp->ft_adjust(gedp->ged_result_str, &intern,
argc-3, argv+3) == GED_ERROR) {
+ if (!ftp->ft_adjust || ftp->ft_adjust(gedp->ged_result_str, &intern,
argc-3, argv+3) & GED_ERROR) {
rt_db_free_internal(&intern);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libged/put_comb/put_comb.c
===================================================================
--- brlcad/branches/bioh/src/libged/put_comb/put_comb.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/put_comb/put_comb.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -583,7 +583,7 @@
else
dir_name = comb_name;
- if (put_tree_into_comb_and_export(gedp, comb, dp, comb_name, dir_name,
expression) == GED_ERROR) {
+ if (put_tree_into_comb_and_export(gedp, comb, dp, comb_name, dir_name,
expression) & GED_ERROR) {
if (dp) {
restore_comb(gedp, dp, saved_name);
bu_vls_printf(gedp->ged_result_str, "%s: \toriginal restored\n",
cmd_name);
Modified: brlcad/branches/bioh/src/libged/rmater/rmater.c
===================================================================
--- brlcad/branches/bioh/src/libged/rmater/rmater.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/rmater/rmater.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -121,7 +121,7 @@
while (bu_fgets(line, LINELEN, fp) != NULL) {
if ((extract_mater_from_line(line, name, shader,
- &r, &g, &b, &override, &inherit)) ==
GED_ERROR)
+ &r, &g, &b, &override, &inherit)) &
GED_ERROR)
continue;
if ((dp = db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_NOISY)) ==
RT_DIR_NULL) {
Modified: brlcad/branches/bioh/src/libged/select/select.c
===================================================================
--- brlcad/branches/bioh/src/libged/select/select.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/select/select.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -72,7 +72,7 @@
if (botip != (struct rt_bot_internal *)NULL)
break;
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, bu_optarg,
gedp->ged_wdbp, mat) == GED_ERROR) {
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, bu_optarg,
gedp->ged_wdbp, mat) & GED_ERROR) {
bu_vls_printf(gedp->ged_result_str, "%s: failed to find %s",
cmd, bu_optarg);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libged/wcodes/wcodes.c
===================================================================
--- brlcad/branches/bioh/src/libged/wcodes/wcodes.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libged/wcodes/wcodes.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -163,7 +163,7 @@
if ((dp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) !=
RT_DIR_NULL) {
status = wcodes_printcodes(gedp, fp, dp, 0);
- if (status == GED_ERROR) {
+ if (status & GED_ERROR) {
(void)fclose(fp);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -1485,7 +1485,7 @@
return GED_ERROR;
}
- if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[2],
gedp->ged_wdbp, mat) == GED_ERROR) {
+ if (wdb_import_from_path2(gedp->ged_result_str, &intern, argv[2],
gedp->ged_wdbp, mat) & GED_ERROR) {
bu_vls_printf(gedp->ged_result_str, "%s: failed to find %s", cmd,
argv[2]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c 2020-07-29
14:16:57 UTC (rev 76569)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c 2020-07-29
14:43:33 UTC (rev 76570)
@@ -1026,7 +1026,7 @@
current_top->to_gop->go_refresh_on = 0;
ret = to_data_polygons_func(interp, gedp, gdvp, argc, argv);
- if (ret == GED_ERROR)
+ if (ret & GED_ERROR)
bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return ret;
Modified: brlcad/branches/bioh/src/libtclcad/view/arrows.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/arrows.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libtclcad/view/arrows.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -62,7 +62,7 @@
current_top->to_gop->go_refresh_on = 0;
ret = to_data_arrows_func(interp, gedp, gdvp, argc, argv);
- if (ret == GED_ERROR)
+ if (ret & GED_ERROR)
bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return ret;
Modified: brlcad/branches/bioh/src/libtclcad/view/axes.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/axes.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libtclcad/view/axes.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -470,7 +470,7 @@
current_top->to_gop->go_refresh_on = 0;
ret = to_data_axes_func(interp, gedp, gdvp, argc, argv);
- if (ret == GED_ERROR)
+ if (ret & GED_ERROR)
bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return ret;
Modified: brlcad/branches/bioh/src/libtclcad/view/labels.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/labels.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libtclcad/view/labels.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -62,7 +62,7 @@
current_top->to_gop->go_refresh_on = 0;
ret = to_data_labels_func(interp, gedp, gdvp, argc, argv);
- if (ret == GED_ERROR)
+ if (ret & GED_ERROR)
bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return ret;
Modified: brlcad/branches/bioh/src/libtclcad/view/lines.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/lines.c 2020-07-29 14:16:57 UTC
(rev 76569)
+++ brlcad/branches/bioh/src/libtclcad/view/lines.c 2020-07-29 14:43:33 UTC
(rev 76570)
@@ -100,7 +100,7 @@
gedp->ged_gvp = btmp;
to_refresh_view(gdvp);
- if (ret == GED_ERROR)
+ if (ret & GED_ERROR)
bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return ret;
Modified: brlcad/branches/bioh/src/mged/chgview.c
===================================================================
--- brlcad/branches/bioh/src/mged/chgview.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/mged/chgview.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -394,12 +394,12 @@
ret = ged_draw(GEDP, new_argc, (const char **)new_argv);
- if (ret == GED_ERROR) {
+ if (ret & GED_ERROR) {
bu_log("ERROR: %s\n", bu_vls_addr(GEDP->ged_result_str));
bu_vls_free(&vls);
bu_free((char *)new_argv, "edit_com new_argv");
return ret;
- } else if (ret == GED_HELP) {
+ } else if (ret & GED_HELP) {
bu_log("%s\n", bu_vls_addr(GEDP->ged_result_str));
bu_vls_free(&vls);
bu_free((char *)new_argv, "edit_com new_argv");
Modified: brlcad/branches/bioh/src/mged/dodraw.c
===================================================================
--- brlcad/branches/bioh/src/mged/dodraw.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/mged/dodraw.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -294,7 +294,7 @@
av[0] = "redraw";
ret = ged_redraw(GEDP, ac, (const char **)av);
- if (ret == GED_ERROR) {
+ if (ret & GED_ERROR) {
return TCL_ERROR;
}
Modified: brlcad/branches/bioh/src/mged/overlay.c
===================================================================
--- brlcad/branches/bioh/src/mged/overlay.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/mged/overlay.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -50,7 +50,7 @@
Tcl_DStringAppend(&ds, bu_vls_addr(GEDP->ged_result_str), -1);
Tcl_DStringResult(interp, &ds);
- if (ret == GED_HELP)
+ if (ret & GED_HELP)
return TCL_OK;
if (ret != GED_OK)
Modified: brlcad/branches/bioh/src/mged/utility1.c
===================================================================
--- brlcad/branches/bioh/src/mged/utility1.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/mged/utility1.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -236,7 +236,7 @@
av[2] = bu_vls_addr(&editstring);
av[3] = argv[1];
- if ( ged_red(GEDP, 4, (const char **)av) == GED_ERROR ) {
+ if ( ged_red(GEDP, 4, (const char **)av) & GED_ERROR ) {
Tcl_AppendResult(interpreter, "Error: ",
bu_vls_addr(GEDP->ged_result_str), (char *)NULL);
} else {
Tcl_AppendResult(interpreter, bu_vls_addr(GEDP->ged_result_str), (char
*)NULL);
Modified: brlcad/branches/bioh/src/mged/wdb_obj.c
===================================================================
--- brlcad/branches/bioh/src/mged/wdb_obj.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/mged/wdb_obj.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -2645,7 +2645,7 @@
bu_vls_init(&logstr);
- if (!ftp->ft_adjust || ftp->ft_adjust(&logstr, &intern, argc-3, argv+3)
== GED_ERROR) {
+ if (!ftp->ft_adjust || ftp->ft_adjust(&logstr, &intern, argc-3, argv+3)
& GED_ERROR) {
Tcl_AppendResult((Tcl_Interp *)wdbp->wdb_interp,
bu_vls_addr(&logstr), (char *)NULL);
bu_vls_free(&logstr);
rt_db_free_internal(&intern);
@@ -10206,7 +10206,7 @@
bu_vls_init(&vls);
- if (ret == GED_HELP)
+ if (ret & GED_HELP)
bu_vls_strcat(&vls, "1 ");
else
bu_vls_strcat(&vls, "0 ");
Modified: brlcad/branches/bioh/src/shapes/coil.c
===================================================================
--- brlcad/branches/bioh/src/shapes/coil.c 2020-07-29 14:16:57 UTC (rev
76569)
+++ brlcad/branches/bioh/src/shapes/coil.c 2020-07-29 14:43:33 UTC (rev
76570)
@@ -67,7 +67,7 @@
flag = ged_coil(&ged, ac, (const char**)av);
/* Close database */
wdb_close(db_fp);
- if (flag == GED_ERROR)
+ if (flag & GED_ERROR)
/* Creation failed - remove file */
bu_file_delete(DEFAULT_COIL_FILENAME);
bu_log("%s\n", bu_vls_addr(ged.ged_result_str));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
