Update of /cvsroot/brlcad/brlcad/src/conv
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv340
Modified Files:
dbupgrade.c g-acad.c g-euclid.c g-euclid1.c g-nff.c g-nmg.c
g-obj.c g-stl.c g-tankill.c g-xxx_facets.c g2asc.c g4-g5.c
g5-g4.c nmg-bot.c nmg-rib.c nmg-sgp.c
Log Message:
Added check of return value from db_dirbuild()
Index: dbupgrade.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/dbupgrade.c,v
retrieving revision 14.10
retrieving revision 14.11
diff -w -u -r14.10 -r14.11
--- dbupgrade.c 23 Jan 2007 01:13:25 -0000 14.10
+++ dbupgrade.c 29 Apr 2007 02:05:02 -0000 14.11
@@ -144,7 +144,10 @@
RT_CK_DBI(dbip);
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
if( (strcmp( dbip->dbi_title, "Untitled v4 BRL-CAD Database" )==0) && (dbip->dbi_version == 4) ) {
dbip->dbi_title=bu_strdup( "Untitled BRL-CAD Database" );
Index: g-acad.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-acad.c,v
retrieving revision 14.19
retrieving revision 14.20
diff -w -u -r14.19 -r14.20
--- g-acad.c 5 Apr 2007 04:08:31 -0000 14.19
+++ g-acad.c 29 Apr 2007 02:05:02 -0000 14.20
@@ -223,7 +223,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
BN_CK_TOL(tree_state.ts_tol);
RT_CK_TESS_TOL(tree_state.ts_ttol);
Index: g-euclid.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-euclid.c,v
retrieving revision 14.14
retrieving revision 14.15
diff -w -u -r14.14 -r14.15
--- g-euclid.c 2 Feb 2007 08:48:28 -0000 14.14
+++ g-euclid.c 29 Apr 2007 02:05:02 -0000 14.15
@@ -592,7 +592,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
if( out_file == NULL )
fp_out = stdout;
Index: g-euclid1.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-euclid1.c,v
retrieving revision 14.14
retrieving revision 14.15
diff -w -u -r14.14 -r14.15
--- g-euclid1.c 2 Feb 2007 08:48:28 -0000 14.14
+++ g-euclid1.c 29 Apr 2007 02:05:02 -0000 14.15
@@ -528,7 +528,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
bu_optind++;
/* Walk indicated tree(s). Each region will be output separately */
Index: g-nff.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-nff.c,v
retrieving revision 14.18
retrieving revision 14.19
diff -w -u -r14.18 -r14.19
--- g-nff.c 5 Apr 2007 04:08:31 -0000 14.18
+++ g-nff.c 29 Apr 2007 02:05:02 -0000 14.19
@@ -237,7 +237,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
BN_CK_TOL(tree_state.ts_tol);
RT_CK_TESS_TOL(tree_state.ts_ttol);
Index: g-nmg.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-nmg.c,v
retrieving revision 14.21
retrieving revision 14.22
diff -w -u -r14.21 -r14.22
--- g-nmg.c 2 Feb 2007 08:48:28 -0000 14.21
+++ g-nmg.c 29 Apr 2007 02:05:02 -0000 14.22
@@ -518,7 +518,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
if ((fp_out = wdb_fopen( out_file )) == NULL) {
perror( out_file );
Index: g-obj.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-obj.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -w -u -r1.11 -r1.12
--- g-obj.c 5 Apr 2007 04:08:31 -0000 1.11
+++ g-obj.c 29 Apr 2007 02:05:02 -0000 1.12
@@ -240,7 +240,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
BN_CK_TOL(tree_state.ts_tol);
RT_CK_TESS_TOL(tree_state.ts_ttol);
Index: g-stl.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-stl.c,v
retrieving revision 14.18
retrieving revision 14.19
diff -w -u -r14.18 -r14.19
--- g-stl.c 27 Jan 2007 01:41:32 -0000 14.18
+++ g-stl.c 29 Apr 2007 02:05:02 -0000 14.19
@@ -262,7 +262,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
BN_CK_TOL(tree_state.ts_tol);
RT_CK_TESS_TOL(tree_state.ts_ttol);
Index: g-tankill.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-tankill.c,v
retrieving revision 14.16
retrieving revision 14.17
diff -w -u -r14.16 -r14.17
--- g-tankill.c 2 Feb 2007 08:48:28 -0000 14.16
+++ g-tankill.c 29 Apr 2007 02:05:02 -0000 14.17
@@ -749,7 +749,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
if( out_file == NULL )
fp_out = stdout;
Index: g-xxx_facets.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g-xxx_facets.c,v
retrieving revision 14.17
retrieving revision 14.18
diff -w -u -r14.17 -r14.18
--- g-xxx_facets.c 2 Feb 2007 08:48:28 -0000 14.17
+++ g-xxx_facets.c 29 Apr 2007 02:05:02 -0000 14.18
@@ -184,7 +184,10 @@
perror(argv[0]);
exit(1);
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
BN_CK_TOL(tree_state.ts_tol);
RT_CK_TESS_TOL(tree_state.ts_ttol);
Index: g2asc.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g2asc.c,v
retrieving revision 14.20
retrieving revision 14.21
diff -w -u -r14.20 -r14.21
--- g2asc.c 27 Jan 2007 01:41:32 -0000 14.20
+++ g2asc.c 29 Apr 2007 02:05:02 -0000 14.21
@@ -227,7 +227,10 @@
exit(4);
}
RT_CK_DBI(dbip);
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
/* write out the title and units special */
if( dbip->dbi_title[0] ) {
Index: g4-g5.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g4-g5.c,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- g4-g5.c 27 Jan 2007 01:41:32 -0000 14.9
+++ g4-g5.c 29 Apr 2007 02:05:02 -0000 14.10
@@ -97,7 +97,10 @@
}
RT_CK_DBI(dbip);
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
db_update_ident( fp->dbip, dbip->dbi_title, dbip->dbi_local2base );
Index: g5-g4.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/g5-g4.c,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- g5-g4.c 27 Jan 2007 01:41:32 -0000 14.9
+++ g5-g4.c 29 Apr 2007 02:05:02 -0000 14.10
@@ -103,7 +103,10 @@
}
RT_CK_DBI(dbip);
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
mk_id_units( fp, dbip->dbi_title, bu_units_string( dbip->dbi_local2base ) );
Index: nmg-bot.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/nmg-bot.c,v
retrieving revision 14.14
retrieving revision 14.15
diff -w -u -r14.14 -r14.15
--- nmg-bot.c 27 Jan 2007 01:41:32 -0000 14.14
+++ nmg-bot.c 29 Apr 2007 02:05:02 -0000 14.15
@@ -131,7 +131,10 @@
perror( argv[0] );
bu_bomb( "Cannot open output file\n" );
}
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
/* Visit all records in input database, and spew them out,
* modifying NMG objects into BoTs.
Index: nmg-rib.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/nmg-rib.c,v
retrieving revision 14.11
retrieving revision 14.12
diff -w -u -r14.11 -r14.12
--- nmg-rib.c 2 Feb 2007 08:48:28 -0000 14.11
+++ nmg-rib.c 29 Apr 2007 02:05:02 -0000 14.12
@@ -206,7 +206,10 @@
if (++arg_index >= ac) usage("No NMG specified\n");
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
/* process each remaining argument */
for ( ; arg_index < ac ; arg_index++ ) {
Index: nmg-sgp.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/nmg-sgp.c,v
retrieving revision 14.16
retrieving revision 14.17
diff -w -u -r14.16 -r14.17
--- nmg-sgp.c 2 Feb 2007 08:48:28 -0000 14.16
+++ nmg-sgp.c 29 Apr 2007 02:05:02 -0000 14.17
@@ -206,7 +206,10 @@
edge_len_limits =
}
#endif
- db_dirbuild( dbip );
+ if( db_dirbuild( dbip ) ) {
+ bu_log( "db_dirbuild failed\n" );
+ exit(1);
+ }
if( out_file == NULL )
fp_out = stdout;
|