Revision: 42163
http://brlcad.svn.sourceforge.net/brlcad/?rev=42163&view=rev
Author: brlcad
Date: 2011-01-12 19:13:30 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
another BU_PTBL_LEN caller, size_t it up.
Modified Paths:
--------------
brlcad/trunk/src/libged/bev.c
brlcad/trunk/src/libged/combmem.c
brlcad/trunk/src/libged/dg_obj.c
brlcad/trunk/src/libged/draw.c
brlcad/trunk/src/libged/erase.c
brlcad/trunk/src/libged/ls.c
brlcad/trunk/src/libged/png.c
brlcad/trunk/src/libged/wdb_obj.c
brlcad/trunk/src/libwdb/dynamic_geometry.c
Modified: brlcad/trunk/src/libged/bev.c
===================================================================
--- brlcad/trunk/src/libged/bev.c 2011-01-12 19:06:15 UTC (rev 42162)
+++ brlcad/trunk/src/libged/bev.c 2011-01-12 19:13:30 UTC (rev 42163)
@@ -83,19 +83,22 @@
int
ged_bev(struct ged *gedp, int argc, const char *argv[])
{
- int i;
- int c;
- int ncpu;
- int triangulate;
- char *cmdname;
- char *newname;
- struct rt_db_internal intern;
- struct directory *dp;
- union tree *tmp_tree;
- char op;
- int failed;
static const char *usage = "[P|t] new_obj obj1 op obj2 op obj3 ...";
+ int i;
+ int c;
+ int ncpu;
+ char *cmdname;
+ char *newname;
+ struct rt_db_internal intern;
+ struct directory *dp;
+ char op;
+ int failed;
+
+ /* static due to longjmp */
+ static int triangulate = 0;
+ static union tree *tmp_tree = NULL;
+
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_READ_ONLY(gedp, GED_ERROR);
GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
Modified: brlcad/trunk/src/libged/combmem.c
===================================================================
--- brlcad/trunk/src/libged/combmem.c 2011-01-12 19:06:15 UTC (rev 42162)
+++ brlcad/trunk/src/libged/combmem.c 2011-01-12 19:13:30 UTC (rev 42163)
@@ -394,7 +394,7 @@
for (i=0; i<node_count; i++) {
union tree *itp = rt_tree_array[i].tl_tree;
- char op;
+ char op = '\0';
RT_CK_TREE(itp);
BU_ASSERT_LONG(itp->tr_op, ==, OP_DB_LEAF);
Modified: brlcad/trunk/src/libged/dg_obj.c
===================================================================
--- brlcad/trunk/src/libged/dg_obj.c 2011-01-12 19:06:15 UTC (rev 42162)
+++ brlcad/trunk/src/libged/dg_obj.c 2011-01-12 19:13:30 UTC (rev 42163)
@@ -2923,27 +2923,27 @@
if (curtree->tr_op == OP_NOP) return curtree;
if (!dgcdp->draw_nmg_only) {
- if (BU_SETJUMP)
- {
+ if (!BU_SETJUMP) {
+ /* try */
+ failed = nmg_boolean(curtree, *tsp->ts_m, tsp->ts_tol,
tsp->ts_resp);
+ if (failed) {
+ db_free_tree(curtree, tsp->ts_resp);
+ return (union tree *)NULL;
+ }
+ BU_UNSETJUMP;
+ } else {
+ /* catch */
char *sofar = db_path_to_string(pathp);
- BU_UNSETJUMP;
-
Tcl_AppendResult(dgcdp->interp, "WARNING: Boolean evaluation of ",
sofar,
" failed!!!\n", (char *)NULL);
bu_free((genptr_t)sofar, "path string");
db_free_tree(curtree, tsp->ts_resp);
+
+ BU_UNSETJUMP;
return (union tree *)NULL;
}
- failed = nmg_boolean(curtree, *tsp->ts_m, tsp->ts_tol, tsp->ts_resp);
- BU_UNSETJUMP;
- if (failed) {
- db_free_tree(curtree, tsp->ts_resp);
- return (union tree *)NULL;
- }
- }
- else if (curtree->tr_op != OP_NMG_TESS)
- {
+ } else if (curtree->tr_op != OP_NMG_TESS) {
Tcl_AppendResult(dgcdp->interp, "Cannot use '-d' option when Boolean
evaluation is required\n", (char *)NULL);
db_free_tree(curtree, tsp->ts_resp);
return (union tree *)NULL;
Modified: brlcad/trunk/src/libged/draw.c
===================================================================
--- brlcad/trunk/src/libged/draw.c 2011-01-12 19:06:15 UTC (rev 42162)
+++ brlcad/trunk/src/libged/draw.c 2011-01-12 19:13:30 UTC (rev 42163)
@@ -1115,7 +1115,7 @@
int
ged_draw_guts(struct ged *gedp, int argc, const char *argv[], int kind)
{
- int i;
+ size_t i;
int flag_A_attr=0;
int flag_o_nonunique=1;
int last_opt=0;
Modified: brlcad/trunk/src/libged/erase.c
===================================================================
--- brlcad/trunk/src/libged/erase.c 2011-01-12 19:06:15 UTC (rev 42162)
+++ brlcad/trunk/src/libged/erase.c 2011-01-12 19:13:30 UTC (rev 42163)
@@ -43,7 +43,7 @@
int
ged_erase(struct ged *gedp, int argc, const char *argv[])
{
- int i;
+ size_t i;
int flag_A_attr=0;
int flag_o_nonunique=1;
int last_opt=0;
Modified: brlcad/trunk/src/libged/ls.c
===================================================================
--- brlcad/trunk/src/libged/ls.c 2011-01-12 19:06:15 UTC (rev 42162)
+++ brlcad/trunk/src/libged/ls.c 2011-01-12 19:13:30 UTC (rev 42163)
@@ -400,7 +400,7 @@
{
struct bu_vls vls;
struct directory *dp;
- int i;
+ size_t i;
int c;
int aflag = 0; /* print all objects without formatting */
int cflag = 0; /* print combinations */
Modified: brlcad/trunk/src/libged/png.c
===================================================================
--- brlcad/trunk/src/libged/png.c 2011-01-12 19:06:15 UTC (rev 42162)
+++ brlcad/trunk/src/libged/png.c 2011-01-12 19:13:30 UTC (rev 42163)
@@ -445,7 +445,7 @@
break;
case 's':
- if (sscanf(bu_optarg, "%d", &size) != 1) {
+ if (sscanf(bu_optarg, "%u", &size) != 1) {
bu_vls_printf(&gedp->ged_result_str, "%s: bad size - %s",
argv[0], bu_optarg);
return GED_ERROR;
}
Modified: brlcad/trunk/src/libged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/libged/wdb_obj.c 2011-01-12 19:06:15 UTC (rev 42162)
+++ brlcad/trunk/src/libged/wdb_obj.c 2011-01-12 19:13:30 UTC (rev 42163)
@@ -2023,7 +2023,7 @@
{
struct bu_vls vls;
struct directory *dp;
- int i;
+ size_t i;
int c;
int aflag = 0; /* print all objects without formatting */
int cflag = 0; /* print combinations */
Modified: brlcad/trunk/src/libwdb/dynamic_geometry.c
===================================================================
--- brlcad/trunk/src/libwdb/dynamic_geometry.c 2011-01-12 19:06:15 UTC (rev
42162)
+++ brlcad/trunk/src/libwdb/dynamic_geometry.c 2011-01-12 19:13:30 UTC (rev
42163)
@@ -226,7 +226,7 @@
*/
{
struct bu_vls tmp_name;
- int i, base_len, count=0;
+ size_t i, base_len, count=0;
struct directory *dp;
struct rt_db_internal intern;
struct soltab *stp;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
