[brlcad-commits] SF.net SVN: brlcad: [31733] brlcad/trunk/src/libged

[<bo...@us...>]

Revision: 31733
          http://brlcad.svn.sourceforge.net/brlcad/?rev=31733&view=rev
Author:   bob1961
Date:     2008-07-03 10:45:55 -0700 (Thu, 03 Jul 2008)

Log Message:
-----------
Changed GED_OK to GED_ERROR to BRLCAD_OK and BRLCAD_ERROR, respectively.

Modified Paths:
--------------
    brlcad/trunk/src/libged/aet.c
    brlcad/trunk/src/libged/arced.c
    brlcad/trunk/src/libged/attr.c
    brlcad/trunk/src/libged/autoview.c
    brlcad/trunk/src/libged/bigE.c
    brlcad/trunk/src/libged/binary.c
    brlcad/trunk/src/libged/blast.c
    brlcad/trunk/src/libged/center.c
    brlcad/trunk/src/libged/comb_color.c
    brlcad/trunk/src/libged/draw.c
    brlcad/trunk/src/libged/edcomb.c
    brlcad/trunk/src/libged/edmater.c
    brlcad/trunk/src/libged/erase.c
    brlcad/trunk/src/libged/erase_all.c
    brlcad/trunk/src/libged/ged.c
    brlcad/trunk/src/libged/get_autoview.c
    brlcad/trunk/src/libged/get_eyemodel.c
    brlcad/trunk/src/libged/get_obj_bounds.c
    brlcad/trunk/src/libged/how.c
    brlcad/trunk/src/libged/illum.c
    brlcad/trunk/src/libged/item.c
    brlcad/trunk/src/libged/list.c
    brlcad/trunk/src/libged/log.c
    brlcad/trunk/src/libged/ls.c
    brlcad/trunk/src/libged/make.c
    brlcad/trunk/src/libged/make_name.c
    brlcad/trunk/src/libged/mater.c
    brlcad/trunk/src/libged/mirror.c
    brlcad/trunk/src/libged/nirt.c
    brlcad/trunk/src/libged/ocenter.c
    brlcad/trunk/src/libged/orotate.c
    brlcad/trunk/src/libged/oscale.c
    brlcad/trunk/src/libged/otranslate.c
    brlcad/trunk/src/libged/overlay.c
    brlcad/trunk/src/libged/pathsum.c
    brlcad/trunk/src/libged/qray.c
    brlcad/trunk/src/libged/report.c
    brlcad/trunk/src/libged/rmater.c
    brlcad/trunk/src/libged/rt.c
    brlcad/trunk/src/libged/set_outputHandler.c
    brlcad/trunk/src/libged/set_transparency.c
    brlcad/trunk/src/libged/set_uplotOutputMode.c
    brlcad/trunk/src/libged/shader.c
    brlcad/trunk/src/libged/size.c
    brlcad/trunk/src/libged/tree.c
    brlcad/trunk/src/libged/wdb_obj.c
    brlcad/trunk/src/libged/who.c
    brlcad/trunk/src/libged/wmater.c
    brlcad/trunk/src/libged/zap.c

Modified: brlcad/trunk/src/libged/aet.c
===================================================================
--- brlcad/trunk/src/libged/aet.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/aet.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -40,7 +40,7 @@
     static const char *usage = "[[-i] az el [tw]]";
 
     GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
-    GED_CHECK_VIEW(gedp, GED_ERROR);
+    GED_CHECK_VIEW(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);

Modified: brlcad/trunk/src/libged/arced.c
===================================================================
--- brlcad/trunk/src/libged/arced.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/arced.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -41,8 +41,8 @@
     union tree *tp;
     static const char *usage = "a/b anim_cmd ...";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -53,26 +53,26 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc < 3) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (!strchr(argv[1], '/')) {
 	bu_vls_printf(&gedp->ged_result_str, "arced: bad path specification '%s'", argv[1]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
     if (!(anp = db_parse_1anim(gedp->ged_wdbp->dbip, argc, (const char **)argv))) {
 	bu_vls_printf(&gedp->ged_result_str, "arced: unable to parse command");
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
     if (anp->an_path.fp_len < 2) {
 	db_free_1anim(anp);
 	bu_vls_printf(&gedp->ged_result_str, "arced: path spec has insufficient elements\n");
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     /* Only the matrix rarc, lmul, and rmul directives are useful here */
@@ -84,12 +84,12 @@
     if ((dp->d_flags & DIR_COMB) == 0) {
 	db_free_1anim(anp);
 	bu_vls_printf(&gedp->ged_result_str, "%s: not a combination", dp->d_namep);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
     if (rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, (fastf_t *)NULL, &rt_uniresource) < 0) {
 	db_free_1anim(anp);
 	bu_vls_printf(&(gedp)->ged_result_str, "Database read error, aborting");
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
     comb = (struct rt_comb_internal *)intern.idb_ptr;
     RT_CK_COMB(comb);
@@ -124,12 +124,12 @@
 	goto fail;
     }
     db_free_1anim(anp);
-    return GED_OK;
+    return BRLCAD_OK;
 
  fail:
     rt_db_free_internal(&intern, &rt_uniresource);
     db_free_1anim(anp);
-    return GED_ERROR;
+    return BRLCAD_ERROR;
 }
 
 

Modified: brlcad/trunk/src/libged/attr.c
===================================================================
--- brlcad/trunk/src/libged/attr.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/attr.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -36,8 +36,8 @@
     struct bu_attribute_value_pair	*avpp;
     static const char *usage = "set|get|show|rm|append} object [args]";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -48,37 +48,37 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc < 3) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
 
     /* this is only valid for v5 databases */
     if (gedp->ged_wdbp->dbip->dbi_version < 5) {
 	bu_vls_printf(&gedp->ged_result_str, "Attributes are not available for this database format.\nPlease upgrade your database format using \"dbupgrade\" to enable attributes.", (char *)NULL);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     /* Verify that this wdb supports lookup operations
        (non-null dbip) */
     if (gedp->ged_wdbp->dbip == 0) {
 	bu_vls_printf(&gedp->ged_result_str, "db does not support lookup operations");
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if ((dp=db_lookup(gedp->ged_wdbp->dbip, argv[2], LOOKUP_QUIET)) == DIR_NULL) {
 	bu_vls_printf(&gedp->ged_result_str, "%s does not exist\n", argv[2]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     bu_avs_init_empty(&avs);
     if (db5_get_attributes(gedp->ged_wdbp->dbip, &avs, dp)) {
 	bu_vls_printf(&gedp->ged_result_str, "Cannot get attributes for object %s\n", dp->d_namep);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (strcmp(argv[1], "get") == 0) {
@@ -100,7 +100,7 @@
 				  dp->d_namep,
 				  argv[i]);
 		    bu_avs_free(&avs);
-		    return GED_ERROR;
+		    return BRLCAD_ERROR;
 		}
 		if (do_separators) {
 		    bu_vls_printf(&gedp->ged_result_str, "{%s} ", val);
@@ -111,7 +111,7 @@
 	}
 
 	bu_avs_free(&avs);
-	return GED_OK;
+	return BRLCAD_OK;
 
     } else if ( strcmp( argv[1], "set" ) == 0 ) {
 	/* setting attribute/value pairs */
@@ -119,7 +119,7 @@
 	    bu_vls_printf(&gedp->ged_result_str,
 			  "Error: attribute names and values must be in pairs!!!\n");
 	    bu_avs_free(&avs);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	i = 3;
@@ -131,11 +131,11 @@
 	    bu_vls_printf(&gedp->ged_result_str,
 			  "Error: failed to update attributes\n");
 	    bu_avs_free(&avs);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	/* avs is freed by db5_update_attributes() */
-	return GED_OK;
+	return BRLCAD_OK;
     } else if (strcmp(argv[1], "rm") == 0) {
 	i = 3;
 	while (i < argc) {
@@ -146,17 +146,17 @@
 	    bu_vls_printf(&gedp->ged_result_str,
 			  "Error: failed to update attributes\n");
 	    bu_avs_free(&avs);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	/* avs is freed by db5_replace_attributes() */
-	return GED_OK;
+	return BRLCAD_OK;
     } else if ( strcmp( argv[1], "append" ) == 0 ) {
 	if ((argc-3)%2) {
 	    bu_vls_printf(&gedp->ged_result_str,
 			  "Error: attribute names and values must be in pairs!!!\n");
 	    bu_avs_free(&avs);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 	i = 3;
 	while (i < argc) {
@@ -181,11 +181,11 @@
 	    bu_vls_printf(&gedp->ged_result_str,
 			  "Error: failed to update attributes\n");
 	    bu_avs_free(&avs);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	/* avs is freed by db5_replace_attributes() */
-	return GED_OK;
+	return BRLCAD_OK;
     } else if ( strcmp( argv[1], "show" ) == 0 ) {
 	int max_attr_name_len=0;
 	int tabs1=0;
@@ -278,7 +278,7 @@
 				  dp->d_namep,
 				  argv[i]);
 		    bu_avs_free(&avs);
-		    return GED_ERROR;
+		    return BRLCAD_ERROR;
 		}
 		bu_vls_printf(&gedp->ged_result_str, "\t%s", argv[i]);
 		len = strlen(val);
@@ -300,17 +300,17 @@
 	    }
 	}
 
-	return GED_OK;
+	return BRLCAD_OK;
     } else {
 	bu_vls_printf(&gedp->ged_result_str, "ERROR: unrecognized attr subcommand %s\n", argv[1]);
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
 
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
 
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/autoview.c
===================================================================
--- brlcad/trunk/src/libged/autoview.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/autoview.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -43,19 +43,19 @@
     vect_t		radial;
     vect_t		small;
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
     gedp->ged_result = GED_RESULT_NULL;
     gedp->ged_result_flags = 0;
 
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
-    GED_CHECK_VIEW(gedp, GED_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
+    GED_CHECK_VIEW(gedp, BRLCAD_ERROR);
 
     if (argc != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s", argv[0]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     VSETALL(min,  INFINITY);
@@ -99,7 +99,7 @@
     gedp->ged_gvp->gv_invSize = 1.0 / gedp->ged_gvp->gv_size;
     ged_view_update(gedp->ged_gvp);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/bigE.c
===================================================================
--- brlcad/trunk/src/libged/bigE.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/bigE.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -2219,14 +2219,14 @@
     struct ged_client_data	*dgcdp;
     static const char *usage = "[-C#/#/# -s] objects(s)";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
 
     /* must be wanting help */
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (bu_debug&BU_DEBUG_MEM_CHECK && bu_mem_barriercheck())
@@ -2276,7 +2276,7 @@
 	    default:
 	    {
 		bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-		return GED_ERROR;
+		return BRLCAD_ERROR;
 	    }
 	}
     }
@@ -2317,7 +2317,7 @@
 	bu_free(dgcdp, "dgcdp");
 
 	bu_vls_printf(&gedp->ged_result_str, "Failed to get objects\n");
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
     {
 	struct region *rp;
@@ -2358,7 +2358,7 @@
     bu_vls_printf(&gedp->ged_result_str, "E: %ld vectors in %ld sec\n",
 	    dgcdp->nvectors, (long)(dgcdp->etime - dgcdp->start_time));
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 /*

Modified: brlcad/trunk/src/libged/binary.c
===================================================================
--- brlcad/trunk/src/libged/binary.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/binary.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -47,8 +47,8 @@
     char *cname;
     static const char *usage = "{-i major_type minor_type | -o} dest source";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);

Modified: brlcad/trunk/src/libged/blast.c
===================================================================
--- brlcad/trunk/src/libged/blast.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/blast.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -39,8 +39,8 @@
 {
     static const char *usage = "object(s)";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -51,7 +51,7 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     /* First, clear the screen */

Modified: brlcad/trunk/src/libged/center.c
===================================================================
--- brlcad/trunk/src/libged/center.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/center.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -40,7 +40,7 @@
     static const char *usage = "[\"x y z\"]";
 
     GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
-    GED_CHECK_VIEW(gedp, GED_ERROR);
+    GED_CHECK_VIEW(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);

Modified: brlcad/trunk/src/libged/comb_color.c
===================================================================
--- brlcad/trunk/src/libged/comb_color.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/comb_color.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -36,8 +36,8 @@
     struct rt_comb_internal	*comb;
     static const char *usage = "comb_color combination R G B";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -48,17 +48,17 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc != 5) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
-    GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, GED_ERROR);
-    GED_CHECK_COMB(gedp, dp, GED_ERROR);
-    GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, GED_ERROR);
+    GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, BRLCAD_ERROR);
+    GED_CHECK_COMB(gedp, dp, BRLCAD_ERROR);
+    GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR);
 
     comb = (struct rt_comb_internal *)intern.idb_ptr;
     RT_CK_COMB(comb);
@@ -67,16 +67,16 @@
 	if (sscanf(argv[i+2], "%d", &val) != 1 || val < 0 || 255 < val) {
 	    bu_vls_printf(&gedp->ged_result_str,"RGB value out of range: %s", argv[i + 2]);
 	    rt_db_free_internal(&intern, &rt_uniresource);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 	else
 	    comb->rgb[i] = val;
     }
 
     comb->rgb_valid = 1;
-    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
+    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/draw.c
===================================================================
--- brlcad/trunk/src/libged/draw.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/draw.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -688,7 +688,7 @@
 		{
 		    bu_vls_printf(&gedp->ged_result_str, "unrecogized option - %c\n", c);
 		    bu_free((genptr_t)dgcdp, "ged_drawtrees: dgcdp");
-		    return GED_ERROR;
+		    return BRLCAD_ERROR;
 		}
 	    }
 	}
@@ -1075,8 +1075,8 @@
 {
     static const char *usage = "[-A -o -C#/#/# -s] <objects | attribute name/value pairs>";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -1101,7 +1101,7 @@
     ged_drawtrees(gedp, argc, argv, kind, (struct ged_client_data *)0);
     ged_color_soltab((struct solid *)&gedp->ged_gdp->gd_headSolid);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 int

Modified: brlcad/trunk/src/libged/edcomb.c
===================================================================
--- brlcad/trunk/src/libged/edcomb.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/edcomb.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -35,8 +35,8 @@
     struct rt_comb_internal *comb;
     static const char *usage = "combname Regionflag regionid air los GIFTmater";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -47,26 +47,26 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc < 6 || 7 < argc) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
-    GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, GED_ERROR);
-    GED_CHECK_COMB(gedp, dp, GED_ERROR);
+    GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, BRLCAD_ERROR);
+    GED_CHECK_COMB(gedp, dp, BRLCAD_ERROR);
 
     if (sscanf(argv[3], "%d", &regionid) != 1 ||
 	sscanf(argv[4], "%d", &air) != 1 ||
 	sscanf(argv[5], "%d", &los) != 1 ||
 	sscanf(argv[6], "%d", &mat) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "Bad rid, air, los or material");
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
-    GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, GED_ERROR);
+    GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR);
     comb = (struct rt_comb_internal *)intern.idb_ptr;
     RT_CK_COMB(comb);
 
@@ -78,9 +78,9 @@
     comb->aircode = air;
     comb->los = los;
     comb->GIFTmater = mat;
-    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
+    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/edmater.c
===================================================================
--- brlcad/trunk/src/libged/edmater.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/edmater.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -38,14 +38,14 @@
     static const char *usage = "comb(s)";
     char tmpfil[MAXPATHLEN];
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* must be wanting help */
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     fp = bu_temp_file(tmpfil, MAXPATHLEN);

Modified: brlcad/trunk/src/libged/erase.c
===================================================================
--- brlcad/trunk/src/libged/erase.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/erase.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -46,8 +46,8 @@
     int illum = 1;
     static const char *usage = "objects(s)";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -58,17 +58,17 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc < 2) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     ged_eraseobjpath(gedp, argc-1, argv+1, LOOKUP_QUIET, 0);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/erase_all.c
===================================================================
--- brlcad/trunk/src/libged/erase_all.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/erase_all.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -46,8 +46,8 @@
     int illum = 1;
     static const char *usage = "objects(s)";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -58,17 +58,17 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc < 2) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     ged_eraseobjpath(gedp, argc-1, argv+1, LOOKUP_QUIET, 1);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/ged.c
===================================================================
--- brlcad/trunk/src/libged/ged.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/ged.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -73,7 +73,7 @@
     } else {
 	struct db_i	*dbip;
 
-	if (ged_decode_dbip(filename, &dbip) != GED_OK)
+	if (ged_decode_dbip(filename, &dbip) != BRLCAD_OK)
 	    return GED_NULL;
 
 	if (strcmp(dbtype, "disk" ) == 0)
@@ -204,7 +204,7 @@
     /* Could core dump */
     RT_CK_DBI(*dbipp);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 void

Modified: brlcad/trunk/src/libged/get_autoview.c
===================================================================
--- brlcad/trunk/src/libged/get_autoview.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/get_autoview.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -45,8 +45,8 @@
     int pflag = 0;
     register int	c;
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -56,7 +56,7 @@
     /* must be wanting help */
     if (argc != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s", argv[0]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     /* Parse options. */
@@ -68,7 +68,7 @@
 		break;
 	    default: {
 		bu_vls_printf(&gedp->ged_result_str, "Usage: %s", argv[0]);
-		return GED_ERROR;
+		return BRLCAD_ERROR;
 	    }
 	}
     }
@@ -113,7 +113,7 @@
 
     bu_vls_printf(&gedp->ged_result_str, "center {%g %g %g} size %g", V3ARGS(center), radial[X] * 2.0);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/get_eyemodel.c
===================================================================
--- brlcad/trunk/src/libged/get_eyemodel.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/get_eyemodel.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -39,9 +39,9 @@
     quat_t		quat;
     vect_t		eye_model;
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
-    GED_CHECK_VIEW(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
+    GED_CHECK_VIEW(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -50,7 +50,7 @@
 
     if (argc != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s", argv[0]);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     ged_rt_set_eye_model(gedp, eye_model);
@@ -62,7 +62,7 @@
     bu_vls_printf(&gedp->ged_result_str, "eye_pt %.15e %.15e %.15e;\n",
 		  eye_model[X], eye_model[Y], eye_model[Z]);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/get_obj_bounds.c
===================================================================
--- brlcad/trunk/src/libged/get_obj_bounds.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/get_obj_bounds.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -49,7 +49,7 @@
     /* Make a new rt_i instance from the existing db_i sructure */
     if ((rtip=rt_new_rti(gedp->ged_wdbp->dbip)) == RTI_NULL) {
 	bu_vls_printf(&gedp->ged_result_str, "rt_new_rti failure for ", gedp->ged_wdbp->dbip->dbi_filename);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     rtip->useair = use_air;
@@ -63,7 +63,7 @@
 	if (db_string_to_path(&path,  rtip->rti_dbip, argv[i])) {
 	    bu_vls_printf(&gedp->ged_result_str, "db_string_to_path failed for ", argv[i]);
 	    rt_free_rti(rtip);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	/* check if we already got this tree */
@@ -75,7 +75,7 @@
 	    if (db_string_to_path(&tmp_path, rtip->rti_dbip, regp->reg_name)) {
 		bu_vls_printf(&gedp->ged_result_str, "db_string_to_path failed for ", regp->reg_name);
 		rt_free_rti(rtip);
-		return GED_ERROR;
+		return BRLCAD_ERROR;
 	    }
 	    if (path.fp_names[0] == tmp_path.fp_names[0])
 		gottree = 1;
@@ -88,7 +88,7 @@
 	if (!gottree && rt_gettree(rtip, path.fp_names[0]->d_namep)) {
 	    bu_vls_printf(&gedp->ged_result_str, "rt_gettree failed for ", argv[i]);
 	    rt_free_rti(rtip);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 	db_free_full_path(&path);
     }
@@ -194,7 +194,7 @@
 		 db_lookup(gedp->ged_wdbp->dbip, tok, LOOKUP_NOISY)) == DIR_NULL) {
 		bu_vls_printf(&gedp->ged_result_str, "ged_get_objpath_mat: Failed to find %s", tok);
 		free(av0);
-		return GED_ERROR;
+		return BRLCAD_ERROR;
 	    }
 
 	    tok = strtok((char *)0, "/");
@@ -209,7 +209,7 @@
 	    if ((gtdp->gtd_obj[i] =
 		 db_lookup(gedp->ged_wdbp->dbip, argv[pos_in+i], LOOKUP_NOISY)) == DIR_NULL) {
 		bu_vls_printf(&gedp->ged_result_str, "ged_get_objpath_mat: Failed to find %s", argv[pos_in+i]);
-		return GED_ERROR;
+		return BRLCAD_ERROR;
 	    }
 	}
     }
@@ -217,7 +217,7 @@
     MAT_IDN(gtdp->gtd_xform);
     ged_trace(gtdp->gtd_obj[0], 0, bn_mat_identity, gtdp);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 /**
@@ -243,15 +243,15 @@
     VREVERSE(rpp_max, rpp_min);
 
     if (ged_get_objpath_mat(gedp, argc, argv, gtdp) == TCL_ERROR)
-	return GED_ERROR;
+	return BRLCAD_ERROR;
 
     dp = gtdp->gtd_obj[gtdp->gtd_objpos-1];
-    GED_DB_GET_INTERNAL(gedp, &intern, dp, gtdp->gtd_xform, &rt_uniresource, GED_ERROR);
+    GED_DB_GET_INTERNAL(gedp, &intern, dp, gtdp->gtd_xform, &rt_uniresource, BRLCAD_ERROR);
 
     /* Make a new rt_i instance from the existing db_i structure */
     if ((rtip=rt_new_rti(gedp->ged_wdbp->dbip)) == RTI_NULL) {
 	bu_vls_printf(&gedp->ged_result_str, "rt_new_rti failure for %s", gedp->ged_wdbp->dbip->dbi_filename);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     BU_GETSTRUCT(stp, soltab);
@@ -272,7 +272,7 @@
     rt_db_free_internal(&intern, &rt_uniresource);
     bu_free( (char *)stp, "struct soltab" );
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 /*

Modified: brlcad/trunk/src/libged/how.c
===================================================================
--- brlcad/trunk/src/libged/how.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/how.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -50,8 +50,8 @@
     int both = 0;
     static const char *usage = "[-b] object";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -62,12 +62,12 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc < 2 || 3 < argc) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (argc == 3 &&
@@ -110,7 +110,7 @@
     if (dpp != (struct directory **)NULL)
 	bu_free((genptr_t)dpp, "ged_how: directory pointers");
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/illum.c
===================================================================
--- brlcad/trunk/src/libged/illum.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/illum.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -42,8 +42,8 @@
     int illum = 1;
     static const char *usage = "[-n] obj";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -54,7 +54,7 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc == 3) {
@@ -87,14 +87,14 @@
 
     if (!found) {
 	bu_vls_printf(&gedp->ged_result_str, "illum: %s not found", argv[1]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
-    return GED_OK;
+    return BRLCAD_OK;
 
 bad:
     bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-    return GED_ERROR;
+    return BRLCAD_ERROR;
 }
 
 

Modified: brlcad/trunk/src/libged/item.c
===================================================================
--- brlcad/trunk/src/libged/item.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/item.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -29,7 +29,7 @@
 int
 ged_item(struct ged *gedp, int argc, const char *argv[])
 {
-    int status = GED_OK;
+    int status = BRLCAD_OK;
     register struct directory *dp;
     int			ident, air, GIFTmater=0, los=0;
     int			GIFTmater_set, los_set;
@@ -37,8 +37,8 @@
     struct rt_comb_internal	*comb;
     static const char *usage = "region ident [air [material [los]]]";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -49,17 +49,17 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc < 3 || 6 < argc) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
-    GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, GED_ERROR);
-    GED_CHECK_COMB(gedp, dp, GED_ERROR);
-    GED_CHECK_REGION(gedp, dp, GED_ERROR);
+    GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, BRLCAD_ERROR);
+    GED_CHECK_COMB(gedp, dp, BRLCAD_ERROR);
+    GED_CHECK_REGION(gedp, dp, BRLCAD_ERROR);
 
     air = ident = 0;
     GIFTmater_set = los_set = 0;
@@ -84,7 +84,7 @@
 	los_set = 1;
     }
 
-    GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, GED_ERROR);
+    GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR);
 
     comb = (struct rt_comb_internal *)intern.idb_ptr;
     RT_CK_COMB(comb);
@@ -99,7 +99,7 @@
 	comb->los = los;
     }
 
-    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
+    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
 
     return status;
 }

Modified: brlcad/trunk/src/libged/list.c
===================================================================
--- brlcad/trunk/src/libged/list.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/list.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -44,7 +44,7 @@
     struct rt_db_internal	intern;
     static const char *usage = "[-r] <objects>";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -53,7 +53,7 @@
 
     if (argc < 2 || MAXARGS < argc) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (argc > 1 && strcmp(argv[1], "-r") == 0) {
@@ -113,7 +113,7 @@
 	}
     }
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/log.c
===================================================================
--- brlcad/trunk/src/libged/log.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/log.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -50,8 +50,8 @@
 {
     static char *usage = "get|start|stop";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -64,29 +64,29 @@
 	/* must be wanting help */
 	if (argc == 1) {
 	    gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
-	    return GED_OK;
+	    return BRLCAD_OK;
 	}
 
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (argv[1][0] == 'g' && !strcmp(argv[1], "get")) {
 	bu_vls_vlscatzap(&gedp->ged_result_str, &gedp->ged_log);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argv[1][0] == 's' && !strcmp(argv[1], "start")) {
 	bu_log_add_hook(ged_logHook, (genptr_t)&gedp->ged_log);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argv[1][0] == 's' && !strcmp(argv[1], "stop")) {
 	bu_log_delete_hook(ged_logHook, (genptr_t)&gedp->ged_log);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     bu_log("Usage: %s ", argv[0], usage);
-    return GED_ERROR;
+    return BRLCAD_ERROR;
 }
 
 /*

Modified: brlcad/trunk/src/libged/ls.c
===================================================================
--- brlcad/trunk/src/libged/ls.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/ls.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -81,7 +81,7 @@
     const char *cmdname = argv[0];
     static const char *usage = "[-A name/value pairs] OR [-acrslop] object(s)";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -90,7 +90,7 @@
 
     if (argc < 1 || MAXARGS < argc) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     bu_vls_init(&vls);
@@ -122,7 +122,7 @@
 		break;
 	    default:
 		bu_vls_printf(&gedp->ged_result_str, "Unrecognized option - %c", c);
-		return GED_ERROR;
+		return BRLCAD_ERROR;
 	}
     }
     /* skip options processed plus command name, should just leave object names */
@@ -215,7 +215,7 @@
 
     bu_free((genptr_t)dirp0, "ged_getspace dp[]");
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 /**

Modified: brlcad/trunk/src/libged/make.c
===================================================================
--- brlcad/trunk/src/libged/make.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/make.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -36,7 +36,7 @@
 int
 ged_make(struct ged *gedp, int argc, char *argv[])
 {
-    int status = GED_OK;
+    int status = BRLCAD_OK;
     int i;
     int k;
     int save_bu_optind;
@@ -66,8 +66,8 @@
     struct rt_metaball_internal	*metaball_ip;
     static const char *usage = "-h | -t | -o origin -s sf name <arb8|arb7|arb6|arb5|arb4|arbn|ars|bot|ehy|ell|ell1|epa|eto|extrude|grip|half|nmg|part|pipe|rcc|rec|rhc|rpc|rpp|sketch|sph|tec|tgc|tor|trc>";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -78,7 +78,7 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     bu_optind = 1;
@@ -93,14 +93,14 @@
 		       &origin[Y],
 		       &origin[Z]) != 3) {
 		bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-		return GED_ERROR;
+		return BRLCAD_ERROR;
 	    }
 	    break;
 	case 's':
 	case 'S':
 	    if (sscanf(bu_optarg, "%lf", &scale) != 1) {
 		bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-		return GED_ERROR;
+		return BRLCAD_ERROR;
 	    }
 	    break;
 	case 't':
@@ -108,19 +108,19 @@
 	    if (argc == 2) {
 		gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 		bu_vls_printf(&gedp->ged_result_str, "arb8 arb7 arb6 arb5 arb4 arbn ars bot ehy ell ell1 epa eto extrude grip half nmg part pipe rcc rec rhc rpc rpp sketch sph tec tgc tor trc superell metaball");
-		return GED_OK;
+		return BRLCAD_OK;
 	    }
 
 	    bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	case 'h':
 	case 'H':
 	    gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	    bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	    return GED_OK;
+	    return BRLCAD_OK;
 	default:
 	    bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
     }
 
@@ -128,12 +128,12 @@
 
     if (argc != 2) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     save_bu_optind = bu_optind;
 
-    GED_CHECK_EXISTS(gedp, argv[bu_optind], LOOKUP_QUIET, GED_ERROR);
+    GED_CHECK_EXISTS(gedp, argv[bu_optind], LOOKUP_QUIET, BRLCAD_ERROR);
     RT_INIT_DB_INTERNAL(&internal);
 
     if (strcmp(argv[bu_optind+1], "arb8") == 0 ||
@@ -745,11 +745,11 @@
 
     } else if (strcmp(argv[bu_optind+1], "hf") == 0) {
 	bu_vls_printf(&gedp->ged_result_str, "make: the height field is deprecated and not supported by this command.\nUse the dsp primitive.\n");
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     } else if (strcmp(argv[bu_optind+1], "pg") == 0 ||
 	       strcmp(argv[bu_optind+1], "poly") == 0) {
 	bu_vls_printf(&gedp->ged_result_str, "make: the polysolid is deprecated and not supported by this command.\nUse the bot primitive.");
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     } else if (strcmp(argv[bu_optind+1], "cline") == 0 ||
 	       strcmp(argv[bu_optind+1], "dsp") == 0 ||
 	       strcmp(argv[bu_optind+1], "ebm") == 0 ||
@@ -758,7 +758,7 @@
 	       strcmp(argv[bu_optind+1], "submodel") == 0 ||
 	       strcmp(argv[bu_optind+1], "vol") == 0) {
 	bu_vls_printf(&gedp->ged_result_str, "make: the %s primitive is not supported by this command", argv[bu_optind+1]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     } else if (strcmp(argv[bu_optind+1], "metaball") == 0) {
 	struct wdb_metaballpt *mbpt;
 	internal.idb_major_type = DB5_MAJORTYPE_BRLCAD;
@@ -787,16 +787,16 @@
 	       metaball_ip->threshold, rt_metaball_lookup_type_name(metaball_ip->method));
     } else {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     /* no interrupts */
     (void)signal(SIGINT, SIG_IGN);
 
-    GED_DB_DIRADD(gedp, dp, argv[save_bu_optind], -1L, 0, DIR_SOLID, (genptr_t)&internal.idb_type, GED_ERROR);
-    GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, GED_ERROR);
+    GED_DB_DIRADD(gedp, dp, argv[save_bu_optind], -1L, 0, DIR_SOLID, (genptr_t)&internal.idb_type, BRLCAD_ERROR);
+    GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, BRLCAD_ERROR);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/make_name.c
===================================================================
--- brlcad/trunk/src/libged/make_name.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/make_name.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -29,15 +29,15 @@
 int
 ged_make_name(struct ged *gedp, int argc, char *argv[])
 {
-    int status = GED_OK;
+    int status = BRLCAD_OK;
     struct bu_vls obj_name;
     char *cp, *tp;
     static int i = 0;
     int	len;
     static const char *usage = "template | -s [num]";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -48,7 +48,7 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     switch (argc) {
@@ -57,7 +57,7 @@
 	    break;
 	else {
 	    i = 0;
-	    return GED_OK;
+	    return BRLCAD_OK;
 	}
     case 3:
     {
@@ -66,12 +66,12 @@
 	if ((strcmp(argv[1], "-s") == 0)
 	    && (sscanf(argv[2], "%d", &new_i) == 1)) {
 	    i = new_i;
-	    return GED_OK;
+	    return BRLCAD_OK;
 	}
     }
     default:
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     bu_vls_init(&obj_name);
@@ -97,7 +97,7 @@
     bu_vls_printf(&gedp->ged_result_str, bu_vls_addr(&obj_name));
     bu_vls_free(&obj_name);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/mater.c
===================================================================
--- brlcad/trunk/src/libged/mater.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/mater.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -29,7 +29,7 @@
 int
 ged_mater(struct ged *gedp, int argc, const char *argv[])
 {
-    int status = GED_OK;
+    int status = BRLCAD_OK;
     register struct directory *dp;
     int r=0, g=0, b=0;
     char inherit;
@@ -37,8 +37,8 @@
     struct rt_comb_internal	*comb;
     static const char *usage = "region_name shader r g b inherit";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -49,17 +49,17 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc != 7) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
-    GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, GED_ERROR);
-    GED_CHECK_COMB(gedp, dp, GED_ERROR);
-    GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, GED_ERROR);
+    GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, BRLCAD_ERROR);
+    GED_CHECK_COMB(gedp, dp, BRLCAD_ERROR);
+    GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR);
 
     comb = (struct rt_comb_internal *)intern.idb_ptr;
     RT_CK_COMB(comb);
@@ -69,26 +69,26 @@
     if (bu_shader_to_tcl_list(argv[2], &comb->shader)) {
 	bu_vls_printf(&gedp->ged_result_str, "Problem with shader string: %s", argv[2]);
 	rt_db_free_internal(&intern, &rt_uniresource);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     /* Color */
     if (sscanf(argv[3], "%d", &r) != 1 || r < 0 || 255 < r) {
 	bu_vls_printf(&gedp->ged_result_str, "Bad color value - %s", argv[3]);
 	rt_db_free_internal(&intern, &rt_uniresource);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[4], "%d", &g) != 1 || g < 0 || 255 < g) {
 	bu_vls_printf(&gedp->ged_result_str, "Bad color value - %s", argv[4]);
 	rt_db_free_internal(&intern, &rt_uniresource);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[5], "%d", &b) != 1 || b < 0 || 255 < b) {
 	bu_vls_printf(&gedp->ged_result_str, "Bad color value - %s", argv[5]);
 	rt_db_free_internal(&intern, &rt_uniresource);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     comb->rgb[0] = r;
@@ -108,12 +108,12 @@
 	default:
 	    bu_vls_printf(&gedp->ged_result_str, "Inherit value must be 0 or 1");
 	    rt_db_free_internal(&intern, &rt_uniresource);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
     }
 
-    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
+    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/mirror.c
===================================================================
--- brlcad/trunk/src/libged/mirror.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/mirror.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -43,8 +43,8 @@
     struct bu_vls vlsargv;
 #endif
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -55,7 +55,7 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
 #if 1
@@ -120,7 +120,7 @@
 	    bu_vls_free(&vlsargv);
 #endif
 
-	    return GED_OK;
+	    return BRLCAD_OK;
 	default:
 	    bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
 	    early_out = 1;
@@ -134,14 +134,14 @@
 #endif
 
     if (early_out) {
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     argc -= bu_optind;
 
     if (argc < 2) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     /* mirror the object */
@@ -155,10 +155,10 @@
 		  mirror_pt,
 		  &rt_uniresource) == DIR_NULL) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: not able to perform the mirror", argv[0]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/nirt.c
===================================================================
--- brlcad/trunk/src/libged/nirt.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/nirt.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -110,9 +110,9 @@
     struct ged_qray_dataList *ndlp;
     struct ged_qray_dataList HeadQRayData;
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
-    GED_CHECK_VIEW(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
+    GED_CHECK_VIEW(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -567,7 +567,7 @@
     FOR_ALL_SOLIDS(sp, &gedp->ged_gdp->gd_headSolid)
 	sp->s_wflag = DOWN;
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 int
@@ -584,9 +584,9 @@
     char **av;
     static const char *usage = "vnirt options vX vY";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
-    GED_CHECK_VIEW(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR);
+    GED_CHECK_VIEW(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -595,7 +595,7 @@
 
     if (argc < 3 || MAXARGS < argc) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     /*
@@ -607,7 +607,7 @@
      */
     if (sscanf(argv[argc-2], "%lf", &view_ray_orig[X]) != 1 ||
 	sscanf(argv[argc-1], "%lf", &view_ray_orig[Y]) != 1) {
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
     view_ray_orig[Z] = DG_GED_MAX;
     argc -= 2;

Modified: brlcad/trunk/src/libged/ocenter.c
===================================================================
--- brlcad/trunk/src/libged/ocenter.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/ocenter.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -43,7 +43,7 @@
     point_t delta;
     static const char *usage = "object [x y z]";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -54,25 +54,25 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc != 2 && argc != 5) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     /*
      * 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, &gtd, rpp_min, rpp_max) == GED_ERROR)
-	return GED_ERROR;
+    if (ged_get_obj_bounds2(gedp, 1, argv+1, &gtd, rpp_min, rpp_max) == BRLCAD_ERROR)
+	return BRLCAD_ERROR;
 
     dp = gtd.gtd_obj[gtd.gtd_objpos-1];
     if (!(dp->d_flags & DIR_SOLID)) {
-	if (ged_get_obj_bounds(gedp, 1, argv+1, 1, rpp_min, rpp_max) == GED_ERROR)
-	    return GED_ERROR;
+	if (ged_get_obj_bounds(gedp, 1, argv+1, 1, rpp_min, rpp_max) == BRLCAD_ERROR)
+	    return BRLCAD_ERROR;
     }
 
     VADD2(oldCenter, rpp_min, rpp_max);
@@ -82,25 +82,25 @@
 	VSCALE(center, oldCenter, gedp->ged_wdbp->dbip->dbi_base2local);
 	bn_encode_vect(&gedp->ged_result_str, center);
 
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* Read in the new center */
     if (sscanf(argv[2], "%lf", &center[X]) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad x value - %s", argv[0], argv[2]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[3], "%lf", &center[Y]) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad y value - %s", argv[0], argv[3]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[4], "%lf", &center[Z]) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad z value - %s", argv[0], argv[4]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     VSCALE(center, center, gedp->ged_wdbp->dbip->dbi_local2base);
@@ -112,16 +112,16 @@
     bn_mat_mul(tmpMat, invXform, dmat);
     bn_mat_mul(emat, tmpMat, gtd.gtd_xform);
 
-    GED_DB_GET_INTERNAL(gedp, &intern, dp, emat, &rt_uniresource, GED_ERROR);
+    GED_DB_GET_INTERNAL(gedp, &intern, dp, emat, &rt_uniresource, BRLCAD_ERROR);
     RT_CK_DB_INTERNAL(&intern);
-    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
+    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
 
 #if 0
     /* notify observers */
     bu_observer_notify(interp, &gedp->wdb_observers, bu_vls_addr(&gedp->wdb_name));
 #endif
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/orotate.c
===================================================================
--- brlcad/trunk/src/libged/orotate.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/orotate.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -43,8 +43,8 @@
     point_t keypoint;
     static const char *usage = "obj rX rY rZ [kX kY kZ]";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -55,39 +55,39 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc != 5 && argc != 8) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[2], "%lf", &xrot) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad rX value - %s", argv[0], argv[2]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[3], "%lf", &yrot) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad rY value - %s", argv[0], argv[3]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[4], "%lf", &zrot) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad rZ value - %s", argv[0], argv[4]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (argc == 5) {
 	/* Use the object's center as the keypoint. */
 
-	if (ged_get_obj_bounds2(gedp, 1, argv+1, &gtd, rpp_min, rpp_max) == GED_ERROR)
-	    return GED_ERROR;
+	if (ged_get_obj_bounds2(gedp, 1, argv+1, &gtd, rpp_min, rpp_max) == BRLCAD_ERROR)
+	    return BRLCAD_ERROR;
 
 	dp = gtd.gtd_obj[gtd.gtd_objpos-1];
 	if (!(dp->d_flags & DIR_SOLID)) {
-	    if (ged_get_obj_bounds(gedp, 1, argv+1, 1, rpp_min, rpp_max) == GED_ERROR)
-		return GED_ERROR;
+	    if (ged_get_obj_bounds(gedp, 1, argv+1, 1, rpp_min, rpp_max) == BRLCAD_ERROR)
+		return BRLCAD_ERROR;
 	}
 
 	VADD2(keypoint, rpp_min, rpp_max);
@@ -98,24 +98,24 @@
 
 	if (sscanf(argv[5], "%lf", &keypoint[X]) != 1) {
 	    bu_vls_printf(&gedp->ged_result_str, "%s: bad kX value - %s", argv[0], argv[5]);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	if (sscanf(argv[6], "%lf", &keypoint[Y]) != 1) {
 	    bu_vls_printf(&gedp->ged_result_str, "%s: bad kY value - %s", argv[0], argv[6]);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	if (sscanf(argv[7], "%lf", &keypoint[Z]) != 1) {
 	    bu_vls_printf(&gedp->ged_result_str, "%s: bad kZ value - %s", argv[0], argv[7]);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	VSCALE(keypoint, keypoint, gedp->ged_wdbp->dbip->dbi_local2base);
 
 	if ((dp = db_lookup(gedp->ged_wdbp->dbip,  argv[1],  LOOKUP_QUIET)) == DIR_NULL) {
 	    bu_vls_printf(&gedp->ged_result_str, "%s: %s not found", argv[0], argv[1]);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
     }
 
@@ -126,16 +126,16 @@
     bn_mat_mul(tmpMat, invXform, pmat);
     bn_mat_mul(emat, tmpMat, gtd.gtd_xform);
 
-    GED_DB_GET_INTERNAL(gedp, &intern, dp, emat, &rt_uniresource, GED_ERROR);
+    GED_DB_GET_INTERNAL(gedp, &intern, dp, emat, &rt_uniresource, BRLCAD_ERROR);
     RT_CK_DB_INTERNAL(&intern);
-    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
+    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
 
 #if 0
     /* notify observers */
     bu_observer_notify(interp, &gedp->wdb_observers, bu_vls_addr(&gedp->wdb_name));
 #endif
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/oscale.c
===================================================================
--- brlcad/trunk/src/libged/oscale.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/oscale.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -44,8 +44,8 @@
     point_t keypoint;
     static const char *usage = "obj sf [kX kY kZ]";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -56,17 +56,17 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc != 3 && argc != 6) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[2], "%lf", &sf) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad sf value - %s", argv[0], argv[2]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (argc == 3) {
@@ -87,24 +87,24 @@
 
 	if (sscanf(argv[3], "%lf", &keypoint[X]) != 1) {
 	    bu_vls_printf(&gedp->ged_result_str, "%s: bad kx value - %s", argv[0], argv[3]);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	if (sscanf(argv[4], "%lf", &keypoint[Y]) != 1) {
 	    bu_vls_printf(&gedp->ged_result_str, "%s: bad ky value - %s", argv[0], argv[4]);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	if (sscanf(argv[5], "%lf", &keypoint[Z]) != 1) {
 	    bu_vls_printf(&gedp->ged_result_str, "%s: bad kz value - %s", argv[0], argv[5]);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
 
 	VSCALE(keypoint, keypoint, gedp->ged_wdbp->dbip->dbi_local2base);
 
 	if ((dp = db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_QUIET)) == DIR_NULL) {
 	    bu_vls_printf(&gedp->ged_result_str, "%s: %s not found", argv[0], argv[1]);
-	    return GED_ERROR;
+	    return BRLCAD_ERROR;
 	}
     }
 
@@ -115,16 +115,16 @@
     bn_mat_mul(tmpMat, invXform, smat);
     bn_mat_mul(emat, tmpMat, gtd.gtd_xform);
 
-    GED_DB_GET_INTERNAL(gedp, &intern, dp, emat, &rt_uniresource, GED_ERROR);
+    GED_DB_GET_INTERNAL(gedp, &intern, dp, emat, &rt_uniresource, BRLCAD_ERROR);
     RT_CK_DB_INTERNAL(&intern);
-    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR);
+    GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
 
 #if 0
     /* notify observers */
     bu_observer_notify(interp, &gedp->wdb_observers, bu_vls_addr(&gedp->wdb_name));
 #endif
 
-    return GED_OK;
+    return BRLCAD_OK;
 }
 
 

Modified: brlcad/trunk/src/libged/otranslate.c
===================================================================
--- brlcad/trunk/src/libged/otranslate.c	2008-07-03 17:29:40 UTC (rev 31732)
+++ brlcad/trunk/src/libged/otranslate.c	2008-07-03 17:45:55 UTC (rev 31733)
@@ -41,8 +41,8 @@
     point_t rpp_max;
     static const char *usage = "obj dx dy dz";
 
-    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+    GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
 
     /* initialize result */
     bu_vls_trunc(&gedp->ged_result_str, 0);
@@ -53,36 +53,36 @@
     if (argc == 1) {
 	gedp->ged_result_flags |= GED_RESULT_FLAGS_HELP_BIT;
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_OK;
+	return BRLCAD_OK;
     }
 
     if (argc != 5) {
 	bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
-    if (ged_get_obj_bounds2(gedp, 1, argv+1, &gtd, rpp_min, rpp_max) == GED_ERROR)
-	return GED_ERROR;
+    if (ged_get_obj_bounds2(gedp, 1, argv+1, &gtd, rpp_min, rpp_max) == BRLCAD_ERROR)
+	return BRLCAD_ERROR;
 
     dp = gtd.gtd_obj[gtd.gtd_objpos-1];
     if (!(dp->d_flags & DIR_SOLID)) {
-	if (ged_get_obj_bounds(gedp, 1, argv+1, 1, rpp_min, rpp_max) == GED_ERROR)
-	    return GED_ERROR;
+	if (ged_get_obj_bounds(gedp, 1, argv+1, 1, rpp_min, rpp_max) == BRLCAD_ERROR)
+	    return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[2], "%lf", &delta[X]) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad x value - %s", argv[0], argv[2]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[3], "%lf", &delta[Y]) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad y value - %s", argv[0], argv[3]);
-	return GED_ERROR;
+	return BRLCAD_ERROR;
     }
 
     if (sscanf(argv[4], "%lf", &delta[Z]) != 1) {
 	bu_vls_printf(&gedp->ged_result_str, "%s: bad z value - %s", arg...
 
[truncated message content]