Revision: 75283
http://sourceforge.net/p/brlcad/code/75283
Author: starseeker
Date: 2020-04-07 14:05:11 +0000 (Tue, 07 Apr 2020)
Log Message:
-----------
Use GED_* returns consistently
Modified Paths:
--------------
brlcad/trunk/src/libged/draw.c
brlcad/trunk/src/libged/editit.c
brlcad/trunk/src/libged/edmater.c
brlcad/trunk/src/libged/erase.c
brlcad/trunk/src/libged/eye.c
brlcad/trunk/src/libged/get_obj_bounds.c
brlcad/trunk/src/libged/move_arb_face.c
brlcad/trunk/src/libged/oscale.c
brlcad/trunk/src/libged/pmat.c
brlcad/trunk/src/libged/qray.c
brlcad/trunk/src/libged/remove.c
brlcad/trunk/src/libged/rmat.c
brlcad/trunk/src/libged/rmater.c
brlcad/trunk/src/libged/savekey.c
brlcad/trunk/src/libged/showmats.c
brlcad/trunk/src/libged/wdb_importFg4Section.c
Modified: brlcad/trunk/src/libged/draw.c
===================================================================
--- brlcad/trunk/src/libged/draw.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/draw.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -1138,12 +1138,12 @@
if (!tbl) {
bu_log("Error: db_lookup_by_attr() failed!!\n");
bu_vls_free(&vls);
- return TCL_ERROR;
+ return GED_ERROR;
}
if (BU_PTBL_LEN(tbl) < 1) {
/* nothing matched, just return */
bu_vls_free(&vls);
- return TCL_OK;
+ return GED_OK;
}
for (i = 0; i < BU_PTBL_LEN(tbl); i++) {
struct directory *dp;
Modified: brlcad/trunk/src/libged/editit.c
===================================================================
--- brlcad/trunk/src/libged/editit.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/editit.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -260,7 +260,7 @@
*/
if (argc != 5) {
bu_vls_printf(gedp->ged_result_str, "Internal Error: \"%s -e editstring
-f tmpfile\" is malformed (argc == %d)", argv[0], argc);
- return TCL_ERROR;
+ return GED_ERROR;
} else {
char *edstr = bu_strdup((char *)argv[2]);
ret = _ged_editit(edstr, argv[4]);
Modified: brlcad/trunk/src/libged/edmater.c
===================================================================
--- brlcad/trunk/src/libged/edmater.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/edmater.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -79,7 +79,7 @@
fp = bu_temp_file(tmpfil, MAXPATHLEN);
if (!fp)
- return TCL_ERROR;
+ return GED_ERROR;
av = (const char **)bu_malloc(sizeof(char *)*(argc + 2), "f_edmater: av");
av[0] = "wmater";
@@ -91,10 +91,10 @@
(void)fclose(fp);
- if (ged_wmater(gedp, argc, av) == TCL_ERROR) {
+ if (ged_wmater(gedp, argc, av) == GED_ERROR) {
bu_file_delete(tmpfil);
bu_free((void *)av, "f_edmater: av");
- return TCL_ERROR;
+ return GED_ERROR;
}
if (_ged_editit(editstring, tmpfil)) {
@@ -102,7 +102,7 @@
av[2] = NULL;
status = ged_rmater(gedp, 2, av);
} else {
- status = TCL_ERROR;
+ status = GED_ERROR;
}
bu_file_delete(tmpfil);
Modified: brlcad/trunk/src/libged/erase.c
===================================================================
--- brlcad/trunk/src/libged/erase.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/erase.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -141,12 +141,12 @@
if (!tbl) {
bu_log("Error: db_lookup_by_attr() failed!!\n");
bu_vls_free(&vls);
- return TCL_ERROR;
+ return GED_ERROR;
}
if (BU_PTBL_LEN(tbl) < 1) {
/* nothing matched, just return */
bu_vls_free(&vls);
- return TCL_OK;
+ return GED_OK;
}
for (i = 0; i < BU_PTBL_LEN(tbl); i++) {
struct directory *dp;
Modified: brlcad/trunk/src/libged/eye.c
===================================================================
--- brlcad/trunk/src/libged/eye.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/eye.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -105,7 +105,7 @@
MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, new_cent);
ged_view_update(gedp->ged_gvp);
- return TCL_OK;
+ return GED_OK;
}
Modified: brlcad/trunk/src/libged/get_obj_bounds.c
===================================================================
--- brlcad/trunk/src/libged/get_obj_bounds.c 2020-04-07 13:39:24 UTC (rev
75282)
+++ brlcad/trunk/src/libged/get_obj_bounds.c 2020-04-07 14:05:11 UTC (rev
75283)
@@ -118,7 +118,7 @@
if (rt_bound_tree(regp->reg_treetop, reg_min, reg_max)) {
bu_vls_printf(gedp->ged_result_str, "rt_bound_tree failed
for %s\n", regp->reg_name);
rt_free_rti(rtip);
- return TCL_ERROR;
+ return GED_ERROR;
}
VMINMAX(rpp_min, rpp_max, reg_min);
VMINMAX(rpp_min, rpp_max, reg_max);
@@ -143,7 +143,7 @@
if (rt_bound_tree(regp->reg_treetop, reg_min, reg_max)) {
bu_vls_printf(gedp->ged_result_str, "rt_bound_tree failed for
%s\n", regp->reg_name);
rt_free_rti(rtip);
- return TCL_ERROR;
+ return GED_ERROR;
}
VMINMAX(rpp_min, rpp_max, reg_min);
VMINMAX(rpp_min, rpp_max, reg_max);
@@ -154,7 +154,7 @@
rt_free_rti(rtip);
- return TCL_OK;
+ return GED_OK;
}
@@ -239,7 +239,7 @@
VSETALL(rpp_min, MAX_FASTF);
VREVERSE(rpp_max, rpp_min);
- if (get_objpath_mat(gedp, argc, argv, gtdp) == TCL_ERROR)
+ if (get_objpath_mat(gedp, argc, argv, gtdp) == GED_ERROR)
return GED_ERROR;
dp = gtdp->gtd_obj[gtdp->gtd_objpos-1];
Modified: brlcad/trunk/src/libged/move_arb_face.c
===================================================================
--- brlcad/trunk/src/libged/move_arb_face.c 2020-04-07 13:39:24 UTC (rev
75282)
+++ brlcad/trunk/src/libged/move_arb_face.c 2020-04-07 14:05:11 UTC (rev
75283)
@@ -134,7 +134,7 @@
bu_vls_printf(gedp->ged_result_str, "Object not an ARB");
rt_db_free_internal(&intern);
- return TCL_OK;
+ return GED_OK;
}
if (sscanf(argv[2], "%d", &face) != 1) {
Modified: brlcad/trunk/src/libged/oscale.c
===================================================================
--- brlcad/trunk/src/libged/oscale.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/oscale.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -75,13 +75,13 @@
}
if (argc == 3) {
- if (_ged_get_obj_bounds2(gedp, 1, argv+1, >d, rpp_min, rpp_max) ==
TCL_ERROR)
- return TCL_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];
if (!(dp->d_flags & RT_DIR_SOLID)) {
- if (ged_get_obj_bounds(gedp, 1, argv+1, 1, rpp_min, rpp_max) ==
TCL_ERROR)
- return TCL_ERROR;
+ if (ged_get_obj_bounds(gedp, 1, argv+1, 1, rpp_min, rpp_max) ==
GED_ERROR)
+ return GED_ERROR;
}
VADD2(keypoint, rpp_min, rpp_max);
Modified: brlcad/trunk/src/libged/pmat.c
===================================================================
--- brlcad/trunk/src/libged/pmat.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/pmat.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -51,12 +51,12 @@
} else if (argc == 2) {
/* set perspective matrix */
if (bn_decode_mat(pmat, argv[1]) != 16)
- return TCL_ERROR;
+ return GED_ERROR;
MAT_COPY(gedp->ged_gvp->gv_pmat, pmat);
ged_view_update(gedp->ged_gvp);
- return TCL_OK;
+ return GED_OK;
}
bu_vls_printf(gedp->ged_result_str, "Usage: %s", argv[0]);
Modified: brlcad/trunk/src/libged/qray.c
===================================================================
--- brlcad/trunk/src/libged/qray.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/qray.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -214,7 +214,7 @@
/* get value */
bu_vls_printf(gedp->ged_result_str, "%c",
gedp->ged_gdp->gd_qray_effects);
- return TCL_OK;
+ return GED_OK;
} else if (argc == 3) {
/* set value */
if (*argv[2] != 't' && *argv[2] != 'g' && *argv[2] != 'b') {
Modified: brlcad/trunk/src/libged/remove.c
===================================================================
--- brlcad/trunk/src/libged/remove.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/remove.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -80,7 +80,7 @@
/* Process each argument */
num_deleted = 0;
- ret = TCL_OK;
+ ret = GED_OK;
for (i = 2; i < argc; i++) {
if (db_tree_del_dbleaf(&(comb->tree), argv[i], &rt_uniresource, 0) < 0)
{
bu_vls_printf(gedp->ged_result_str, "ERROR: Failure deleting
%s/%s\n", dp->d_namep, argv[i]);
Modified: brlcad/trunk/src/libged/rmat.c
===================================================================
--- brlcad/trunk/src/libged/rmat.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/rmat.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -56,7 +56,7 @@
MAT_COPY(gedp->ged_gvp->gv_rotation, rotation);
ged_view_update(gedp->ged_gvp);
- return TCL_OK;
+ return GED_OK;
}
bu_vls_printf(gedp->ged_result_str, "Usage: %s", argv[0]);
Modified: brlcad/trunk/src/libged/rmater.c
===================================================================
--- brlcad/trunk/src/libged/rmater.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/rmater.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -50,7 +50,7 @@
++j;
if (line[j] == '\0')
- return TCL_ERROR;
+ return GED_ERROR;
/* We found a double quote, so use everything between the quotes */
if (line[j] == '"') {
@@ -62,7 +62,7 @@
}
if (line[j] == '\0')
- return TCL_ERROR;
+ return GED_ERROR;
str[i][k] = '\0';
++j;
@@ -70,9 +70,9 @@
/* character and/or whitespace delimited numbers */
if ((sscanf(line + j, "%d%*c%d%*c%d%*c%d%*c%d", r, g, b, override,
inherit)) != 5)
- return TCL_ERROR;
+ return GED_ERROR;
- return TCL_OK;
+ return GED_OK;
}
Modified: brlcad/trunk/src/libged/savekey.c
===================================================================
--- brlcad/trunk/src/libged/savekey.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/savekey.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -85,7 +85,7 @@
if ((fp = fopen(argv[1], "a")) == NULL) {
perror(argv[1]);
- return TCL_ERROR;
+ return GED_ERROR;
}
if (argc > 2) {
timearg = atof(argv[2]);
Modified: brlcad/trunk/src/libged/showmats.c
===================================================================
--- brlcad/trunk/src/libged/showmats.c 2020-04-07 13:39:24 UTC (rev 75282)
+++ brlcad/trunk/src/libged/showmats.c 2020-04-07 14:05:11 UTC (rev 75283)
@@ -93,7 +93,7 @@
struct rt_comb_internal *comb;
if ((dp = db_lookup(gedp->ged_wdbp->dbip, parent, LOOKUP_NOISY)) ==
RT_DIR_NULL)
- return TCL_ERROR;
+ return GED_ERROR;
if (!aflag)
bu_vls_printf(gedp->ged_result_str, "%s\n", parent);
Modified: brlcad/trunk/src/libged/wdb_importFg4Section.c
===================================================================
--- brlcad/trunk/src/libged/wdb_importFg4Section.c 2020-04-07 13:39:24 UTC
(rev 75282)
+++ brlcad/trunk/src/libged/wdb_importFg4Section.c 2020-04-07 14:05:11 UTC
(rev 75283)
@@ -480,7 +480,7 @@
if (argc != 3) {
bu_log("ERROR: expecting three arguments\n");
- return TCL_ERROR;
+ return GED_ERROR;
}
grid_size = GRID_BLOCK;
@@ -539,7 +539,7 @@
THICKNESS = NULL;
facemode = NULL;
- return TCL_OK;
+ return GED_OK;
}
/** @} */
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
