Revision: 57218
http://sourceforge.net/p/brlcad/code/57218
Author: brlcad
Date: 2013-08-28 13:02:12 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
reduce var scope
Modified Paths:
--------------
brlcad/trunk/src/conv/enf-g.c
brlcad/trunk/src/conv/fast4-g.c
Modified: brlcad/trunk/src/conv/enf-g.c
===================================================================
--- brlcad/trunk/src/conv/enf-g.c 2013-08-28 12:34:51 UTC (rev 57217)
+++ brlcad/trunk/src/conv/enf-g.c 2013-08-28 13:02:12 UTC (rev 57218)
@@ -292,15 +292,17 @@
bu_vls_trunc( &vls, max_name_len );
}
while ( db_lookup( fd_out->dbip, bu_vls_addr( &vls ), LOOKUP_QUIET ) !=
RT_DIR_NULL) {
- int digits, val=10;
+ count++;
- count++;
if ( max_name_len ) {
- digits = 1;
+ int digits = 1;
+ int val = 10;
+
while ( count >= val ) {
digits++;
val *= 10;
}
+
bu_vls_trunc( &vls, 0 );
bu_vls_printf( &vls, "s.%s", tmp_name );
bu_vls_trunc( &vls, max_name_len - digits - 1 );
@@ -321,11 +323,12 @@
bu_vls_trunc( &vls, max_name_len );
}
while ( db_lookup( fd_out->dbip, bu_vls_addr( &vls ), LOOKUP_QUIET) !=
RT_DIR_NULL ) {
- int digits, val=10;
+ count++;
- count++;
if ( max_name_len ) {
- digits = 1;
+ int digits = 1;
+ int val = 10;
+
while ( count >= val ) {
digits++;
val *= 10;
Modified: brlcad/trunk/src/conv/fast4-g.c
===================================================================
--- brlcad/trunk/src/conv/fast4-g.c 2013-08-28 12:34:51 UTC (rev 57217)
+++ brlcad/trunk/src/conv/fast4-g.c 2013-08-28 13:02:12 UTC (rev 57218)
@@ -491,7 +491,6 @@
struct name_tree *nptr_model, *rptr_model;
struct name_tree *new_ptr;
int foundn, foundr;
- int diff;
if (debug)
bu_log("Insert_region_name(name=%s, reg_id=%d\n", name, reg_id);
@@ -529,6 +528,8 @@
if (!name_root) {
name_root = new_ptr;
} else {
+ int diff;
+
diff = bu_strcmp(name, nptr_model->name);
if (diff > 0) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
