Thread: [brlcad-commits] SF.net SVN: brlcad:[34596] brlcad/trunk/src/libged (Page 3)
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <eri...@us...> - 2009-05-27 20:53:38
|
Revision: 34596 http://brlcad.svn.sourceforge.net/brlcad/?rev=34596&view=rev Author: erikgreenwald Date: 2009-05-27 20:53:21 +0000 (Wed, 27 May 2009) Log Message: ----------- remove svn:executable prop on .c files. Property Changed: ---------------- brlcad/trunk/src/libged/rotate_extrude.c brlcad/trunk/src/libged/scale_extrude.c brlcad/trunk/src/libged/translate_extrude.c Property changes on: brlcad/trunk/src/libged/rotate_extrude.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: brlcad/trunk/src/libged/scale_extrude.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: brlcad/trunk/src/libged/translate_extrude.c ___________________________________________________________________ Deleted: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-02 12:53:14
|
Revision: 34630 http://brlcad.svn.sourceforge.net/brlcad/?rev=34630&view=rev Author: brlcad Date: 2009-06-02 12:36:32 +0000 (Tue, 02 Jun 2009) Log Message: ----------- collapse a handful of common code patterns with the corresponding GED_ macro. on a quest to have no command directly peek into the ged structure. Modified Paths: -------------- brlcad/trunk/src/libged/3ptarb.c brlcad/trunk/src/libged/adjust.c brlcad/trunk/src/libged/analyze.c Modified: brlcad/trunk/src/libged/3ptarb.c =================================================================== --- brlcad/trunk/src/libged/3ptarb.c 2009-06-02 12:02:19 UTC (rev 34629) +++ brlcad/trunk/src/libged/3ptarb.c 2009-06-02 12:36:32 UTC (rev 34630) @@ -87,10 +87,7 @@ return GED_MORE; } - if ( db_lookup( gedp->ged_wdbp->dbip, argv[1], LOOKUP_QUIET) != DIR_NULL ) { - bu_vls_printf(&gedp->ged_result_str, "%s: %s already exists\n", argv[0], argv[1]); - return GED_ERROR; - } + GED_CHECK_EXISTS(gedp, argv[1], LOOKUP_QUIET, GED_ERROR); /* read the three points */ prompts = &p_arb3pt[0]; @@ -256,18 +253,9 @@ VJOIN1( aip->pt[i+4], aip->pt[i], thick, norm ); } - if ( (dp = db_diradd( gedp->ged_wdbp->dbip, argv[1], -1L, 0, DIR_SOLID, (genptr_t)&internal.idb_type)) == DIR_NULL ) - { - bu_vls_printf(&gedp->ged_result_str, "%s: Cannot add %s to the directory\n", argv[0], argv[1]); - return GED_ERROR; - } + GED_DB_DIRADD(gedp, dp, argv[1], -1L, 0, DIR_SOLID, (genptr_t)&internal.idb_type, GED_ERROR); - if ( rt_db_put_internal( dp, gedp->ged_wdbp->dbip, &internal, &rt_uniresource ) < 0 ) - { - rt_db_free_internal( &internal, &rt_uniresource ); - bu_vls_printf(&gedp->ged_result_str, "%s: Database write error, aborting\n", argv[0]); - return GED_ERROR; - } + GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, GED_ERROR); return GED_OK; } Modified: brlcad/trunk/src/libged/adjust.c =================================================================== --- brlcad/trunk/src/libged/adjust.c 2009-06-02 12:02:19 UTC (rev 34629) +++ brlcad/trunk/src/libged/adjust.c 2009-06-02 12:36:32 UTC (rev 34630) @@ -62,18 +62,11 @@ name = (char *)argv[1]; /* Verify that this wdb supports lookup operations (non-null dbip) */ - RT_CK_DBI(gedp->ged_wdbp->dbip); + GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); - dp = db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET); - if (dp == DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, "%s: not found", name); - return GED_ERROR; - } + GED_DB_LOOKUP(gedp, dp, name, LOOKUP_QUIET, GED_ERROR); - if (rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, (matp_t)NULL, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "rt_db_get_internal(%s) failure", name); - return GED_ERROR; - } + GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, GED_ERROR); RT_CK_DB_INTERNAL(&intern); /* Find out what type of object we are dealing with and tweak it. */ Modified: brlcad/trunk/src/libged/analyze.c =================================================================== --- brlcad/trunk/src/libged/analyze.c 2009-06-02 12:02:19 UTC (rev 34629) +++ brlcad/trunk/src/libged/analyze.c 2009-06-02 12:36:32 UTC (rev 34630) @@ -90,10 +90,7 @@ if ( (ndp = db_lookup( gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY )) == DIR_NULL ) continue; - if ( rt_db_get_internal( &intern, ndp, gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource ) < 0 ) { - bu_vls_printf(&gedp->ged_result_str, "%s: rt_db_get_internal() error\n", argv[0]); - return GED_ERROR; - } + GED_DB_GET_INTERNAL(gedp, &intern, ndp, bn_mat_identity, &rt_uniresource, GED_ERROR); ged_do_list(gedp, ndp, 1); ged_do_anal(gedp, &intern); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-02 12:58:27
|
Revision: 34632 http://brlcad.svn.sourceforge.net/brlcad/?rev=34632&view=rev Author: brlcad Date: 2009-06-02 12:58:20 +0000 (Tue, 02 Jun 2009) Log Message: ----------- more GED pattern collapsing Modified Paths: -------------- brlcad/trunk/src/libged/arced.c brlcad/trunk/src/libged/attr.c brlcad/trunk/src/libged/bev.c Modified: brlcad/trunk/src/libged/arced.c =================================================================== --- brlcad/trunk/src/libged/arced.c 2009-06-02 12:44:54 UTC (rev 34631) +++ brlcad/trunk/src/libged/arced.c 2009-06-02 12:58:20 UTC (rev 34632) @@ -84,6 +84,7 @@ bu_vls_printf(&gedp->ged_result_str, "%s: not a combination", dp->d_namep); return GED_ERROR; } + /* GED_DB_GET_INTERNAL(gedp, &intern, (fastf_t *)NULL, &rt_uniresource, GED_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"); Modified: brlcad/trunk/src/libged/attr.c =================================================================== --- brlcad/trunk/src/libged/attr.c 2009-06-02 12:44:54 UTC (rev 34631) +++ brlcad/trunk/src/libged/attr.c 2009-06-02 12:58:20 UTC (rev 34632) @@ -62,15 +62,9 @@ /* 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; - } + GED_CHECK_DATABASE_OPEN(gedp, GED_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; - } + GED_DB_LOOKUP(gedp, dp, argv[2], LOOKUP_QUIET, GED_ERROR); bu_avs_init_empty(&avs); if (db5_get_attributes(gedp->ged_wdbp->dbip, &avs, dp)) { Modified: brlcad/trunk/src/libged/bev.c =================================================================== --- brlcad/trunk/src/libged/bev.c 2009-06-02 12:44:54 UTC (rev 34631) +++ brlcad/trunk/src/libged/bev.c 2009-06-02 12:58:20 UTC (rev 34632) @@ -119,10 +119,7 @@ return GED_ERROR; } - if ( db_lookup( gedp->ged_wdbp->dbip, newname, LOOKUP_QUIET ) != DIR_NULL ) { - bu_vls_printf(&gedp->ged_result_str, "%s: solid '%s' already exists, aborting\n", cmdname, newname); - return GED_ERROR; - } + GED_CHECK_EXISTS(gedp, newname, LOOKUP_QUIET, GED_ERROR); bu_vls_printf(&gedp->ged_result_str, "%s: tessellating primitives with tolerances a=%g, r=%g, n=%g\n", @@ -279,18 +276,9 @@ intern.idb_ptr = (genptr_t)ged_nmg_model; ged_nmg_model = (struct model *)NULL; - if ( (dp=db_diradd( gedp->ged_wdbp->dbip, newname, -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type)) == DIR_NULL ) { - bu_vls_printf(&gedp->ged_result_str, "%s: Cannot add %s to directory\n", cmdname, newname); - return GED_ERROR; - } + GED_DB_DIRADD(gedp, dp, newname, -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR); + GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR); - if ( rt_db_put_internal( dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource ) < 0 ) - { - rt_db_free_internal( &intern, &rt_uniresource ); - bu_vls_printf(&gedp->ged_result_str, "%s: Database write error, aborting\n", cmdname); - return GED_ERROR; - } - tmp_tree->tr_d.td_r = (struct nmgregion *)NULL; /* Free boolean tree, and the regions in it. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-07 17:27:36
|
Revision: 34692 http://brlcad.svn.sourceforge.net/brlcad/?rev=34692&view=rev Author: brlcad Date: 2009-06-07 17:27:35 +0000 (Sun, 07 Jun 2009) Log Message: ----------- collapse the rest of the bot_* commands where there were GED macro patterns. 164->54 .. and now 10% complete with all ged commands (oof!). Modified Paths: -------------- brlcad/trunk/src/libged/bot_condense.c brlcad/trunk/src/libged/bot_decimate.c brlcad/trunk/src/libged/bot_dump.c brlcad/trunk/src/libged/bot_face_fuse.c brlcad/trunk/src/libged/bot_face_sort.c brlcad/trunk/src/libged/bot_flip.c brlcad/trunk/src/libged/bot_merge.c brlcad/trunk/src/libged/bot_smooth.c brlcad/trunk/src/libged/bot_split.c brlcad/trunk/src/libged/bot_sync.c brlcad/trunk/src/libged/bot_vertex_fuse.c Modified: brlcad/trunk/src/libged/bot_condense.c =================================================================== --- brlcad/trunk/src/libged/bot_condense.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_condense.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -65,9 +65,8 @@ GED_DB_LOOKUP(gedp, old_dp, argv[2], LOOKUP_NOISY, GED_ERROR & GED_QUIET); GED_DB_GET_INTERNAL(gedp, &intern, old_dp, bn_mat_identity, &rt_uniresource, GED_ERROR); - if ( intern.idb_type != ID_BOT ) - { - bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!!!\n", argv[0], argv[2]); + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { + bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[2]); return GED_ERROR; } Modified: brlcad/trunk/src/libged/bot_decimate.c =================================================================== --- brlcad/trunk/src/libged/bot_decimate.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_decimate.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -115,8 +115,7 @@ GED_DB_GET_INTERNAL(gedp, &intern, dp, NULL, gedp->ged_wdbp->wdb_resp, GED_ERROR); /* make sure this is a BOT solid */ - if ( intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || - intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT ) { + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { bu_vls_printf(&gedp->ged_result_str, "%s is not a BOT solid\n", argv[1]); rt_db_free_internal( &intern, gedp->ged_wdbp->wdb_resp ); return GED_ERROR; Modified: brlcad/trunk/src/libged/bot_dump.c =================================================================== --- brlcad/trunk/src/libged/bot_dump.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_dump.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -763,7 +763,6 @@ /* get the internal form */ i=rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, mat, &rt_uniresource); - if (i < 0) { fprintf(stderr, "%s: rt_get_internal failure %d on %s\n", cmd_name, i, dp->d_namep); continue; Modified: brlcad/trunk/src/libged/bot_face_fuse.c =================================================================== --- brlcad/trunk/src/libged/bot_face_fuse.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_face_fuse.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -61,18 +61,12 @@ return GED_ERROR; } - if ( (old_dp = db_lookup( gedp->ged_wdbp->dbip, argv[2], LOOKUP_NOISY )) == DIR_NULL ) - return GED_ERROR; + GED_DB_LOOKUP(gedp, old_dp, argv[2], LOOKUP_NOISY, GED_ERROR & GED_QUIET); + GED_DB_GET_INERNAL(gedp, &intern, old_dp, bn_mat_identity, &rt_uniresource, GED_ERROR); - if ( rt_db_get_internal( &intern, old_dp, gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource ) < 0 ) - { - bu_vls_printf(&gedp->ged_result_str, "%s: rt_db_get_internal() error\n", argv[0]); - return GED_ERROR; - } - if ( intern.idb_type != ID_BOT ) { - bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!!!\n", argv[0], argv[2]); + bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[2]); return GED_ERROR; } @@ -81,19 +75,9 @@ (void) rt_bot_face_fuse( bot ); - if ( (new_dp=db_diradd( gedp->ged_wdbp->dbip, argv[1], -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type)) == DIR_NULL ) - { - bu_vls_printf(&gedp->ged_result_str, "%s: Cannot add %s to directory\n", argv[0], argv[1]); - return GED_ERROR; - } + GED_DB_DIRADD(gedp, new_dp, argv[1], -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR); + GED_DB_PUT_INTERNAL(gedp, new_dp, &intern, &rt_uniresource, GED_ERROR); - if ( rt_db_put_internal( new_dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource ) < 0 ) - { - rt_db_free_internal( &intern, &rt_uniresource ); - bu_vls_printf(&gedp->ged_result_str, "%s: Database write error, aborting\n", argv[0]); - return GED_ERROR; - } - return GED_OK; } Modified: brlcad/trunk/src/libged/bot_face_sort.c =================================================================== --- brlcad/trunk/src/libged/bot_face_sort.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_face_sort.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -78,14 +78,9 @@ continue; } - if ((id=rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, bn_mat_identity, gedp->ged_wdbp->wdb_resp)) < 0) { - bu_vls_printf(&gedp->ged_result_str, - "Failed to get internal form of %s, not sorting this one\n", - dp->d_namep); - continue; - } + GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, gedp->ged_wdbp->wdb_resp, GED_ERROR); - if (id != ID_BOT) { + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { rt_db_free_internal(&intern, gedp->ged_wdbp->wdb_resp); bu_vls_printf(&gedp->ged_result_str, "%s is not a BOT primitive, skipped\n", @@ -106,13 +101,7 @@ continue; } - if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, gedp->ged_wdbp->wdb_resp)) { - bu_vls_printf(&gedp->ged_result_str, - "Failed to write sorted BOT (%s) to database!!!", - dp->d_namep); - rt_db_free_internal(&intern, gedp->ged_wdbp->wdb_resp); - return GED_ERROR; - } + GED_DB_PUT_INTERNAL(gedp, dp, &intern, gedp->ged_wdbp->wdb_resp, GED_ERROR); } return GED_OK; Modified: brlcad/trunk/src/libged/bot_flip.c =================================================================== --- brlcad/trunk/src/libged/bot_flip.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_flip.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -63,26 +63,17 @@ continue; } - if (rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "%s: rt_db_get_internal(%s) error\n", argv[0], argv[i]); - return GED_ERROR; - } + GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, GED_ERROR); - if (intern.idb_type != ID_BOT) { - bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!!!\n", argv[0], argv[i]); + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { + bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[i]); continue; } bot = (struct rt_bot_internal *)intern.idb_ptr; rt_bot_flip(bot); - if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, gedp->ged_wdbp->wdb_resp)) { - bu_vls_printf(&gedp->ged_result_str, - "Failed to write BOT (%s) to database!!!", - dp->d_namep); - rt_db_free_internal(&intern, gedp->ged_wdbp->wdb_resp); - return GED_ERROR; - } + GED_DB_PUT_INTERNAL(gedp, dp, &intern, gedp->ged_wdbp->wdb_resp, GED_ERROR); } return GED_OK; Modified: brlcad/trunk/src/libged/bot_merge.c =================================================================== --- brlcad/trunk/src/libged/bot_merge.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_merge.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -41,7 +41,7 @@ struct directory *dp, *new_dp; struct rt_db_internal intern; struct rt_bot_internal **bots; - int i, idx, retval; + int i, idx; int avail_vert, avail_face, face; static const char *usage = "bot_dest bot1_src [botn_src]"; @@ -60,8 +60,6 @@ bots = bu_calloc(sizeof(struct rt_bot_internal), argc, "bot internal"); - retval = GED_OK; - /* create a new bot */ BU_GETSTRUCT(bots[0], rt_bot_internal); bots[0]->mode = 0; @@ -86,15 +84,10 @@ continue; } - if ( rt_db_get_internal( &intern, dp, gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource ) < 0 ) { - bu_vls_printf(&gedp->ged_result_str, "%s: rt_db_get_internal(%s) error\n", argv[0], argv[i]); - retval = GED_ERROR; - continue; - } + GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, GED_ERROR); - if ( intern.idb_type != ID_BOT ) { - bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!!! skipping\n", argv[0], argv[i]); - retval = GED_ERROR; + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { + bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid! Skipping.\n", argv[0], argv[i]); continue; } @@ -189,19 +182,9 @@ intern.idb_meth = &rt_functab[ID_BOT]; intern.idb_ptr = (genptr_t)bots[0]; - if ( (new_dp=db_diradd( gedp->ged_wdbp->dbip, argv[1], -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type)) == DIR_NULL ) - { - bu_vls_printf(&gedp->ged_result_str, "%s: Cannot add %s to directory\n", argv[0], argv[1]); - return GED_ERROR; - } + GED_DB_DIRADD(gedp, new_dp, argv[1], -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR); + GED_DB_PUT_INTERNAL(gedp, new_dp, &intern, &rt_uniresource, GED_ERROR); - if ( rt_db_put_internal( new_dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource ) < 0 ) - { - rt_db_free_internal( &intern, &rt_uniresource ); - bu_vls_printf(&gedp->ged_result_str, "%s: Database write error, aborting\n", argv[0]); - return GED_ERROR; - } - bu_free(bots, "bots"); return GED_OK; Modified: brlcad/trunk/src/libged/bot_smooth.c =================================================================== --- brlcad/trunk/src/libged/bot_smooth.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_smooth.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -43,13 +43,14 @@ struct rt_db_internal intern; fastf_t tolerance_angle=180.0; int arg_index=1; - int id; static const char *usage = "[-t ntol] new_bot old_bot"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); GED_CHECK_READ_ONLY(gedp, GED_ERROR); GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR); + dp_old = dp_new = DIR_NULL; + /* initialize result */ bu_vls_trunc(&gedp->ged_result_str, 0); @@ -90,27 +91,17 @@ new_bot_name = (char *)argv[arg_index++]; old_bot_name = (char *)argv[arg_index]; - if ( (dp_old=db_lookup( gedp->ged_wdbp->dbip, old_bot_name, LOOKUP_QUIET ) ) == DIR_NULL ) { - bu_vls_printf(&gedp->ged_result_str, "%s does not exist!!\n", old_bot_name); - return GED_ERROR; - } + GED_DB_LOOKUP(gedp, dp_old, old_bot_name, LOOKUP_QUIET, GED_ERROR); if ( strcmp( old_bot_name, new_bot_name ) ) { - - if ( (dp_new=db_lookup( gedp->ged_wdbp->dbip, new_bot_name, LOOKUP_QUIET ) ) != DIR_NULL ) { - bu_vls_printf(&gedp->ged_result_str, "%s already exists!!\n", new_bot_name); - return GED_ERROR; - } + GED_CHECK_EXISTS(gedp, new_bot_name, LOOKUP_QUIET, GED_ERROR); } else { dp_new = dp_old; } - if ( (id=rt_db_get_internal( &intern, dp_old, gedp->ged_wdbp->dbip, NULL, gedp->ged_wdbp->wdb_resp ) ) < 0 ) { - bu_vls_printf(&gedp->ged_result_str, "Failed to get internal form of %s\n", old_bot_name); - return GED_ERROR; - } + GED_DB_GET_INTERNAL(gedp, &intern, dp_old, NULL, gedp->ged_wdbp->wdb_resp, GED_ERROR); - if ( id != ID_BOT ) { + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { bu_vls_printf(&gedp->ged_result_str, "%s is not a BOT primitive\n", old_bot_name); rt_db_free_internal( &intern, gedp->ged_wdbp->wdb_resp ); return GED_ERROR; @@ -126,26 +117,15 @@ } if ( dp_new == DIR_NULL ) { - if ( (dp_new=db_diradd( gedp->ged_wdbp->dbip, new_bot_name, -1L, 0, DIR_SOLID, - (genptr_t)&intern.idb_type)) == DIR_NULL ) { - rt_db_free_internal(&intern, gedp->ged_wdbp->wdb_resp); - bu_vls_printf(&gedp->ged_result_str, "Cannot add %s to directory\n", new_bot_name); - return GED_ERROR; - } + GED_DB_DIRADD(gedp, dp_new, new_bot_name, -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR); } - if ( rt_db_put_internal( dp_new, gedp->ged_wdbp->dbip, &intern, gedp->ged_wdbp->wdb_resp ) < 0 ) { - rt_db_free_internal(&intern, gedp->ged_wdbp->wdb_resp); - bu_vls_printf(&gedp->ged_result_str, "Database write error, aborting.\n"); - return GED_ERROR; - } - + GED_DB_PUT_INTERNAL(gedp, dp_new, &intern, gedp->ged_wdbp->wdb_resp, GED_ERROR); rt_db_free_internal( &intern, gedp->ged_wdbp->wdb_resp ); return GED_OK; } - /* * Local Variables: * tab-width: 8 Modified: brlcad/trunk/src/libged/bot_split.c =================================================================== --- brlcad/trunk/src/libged/bot_split.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_split.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -68,21 +68,14 @@ bots = bu_calloc(sizeof(struct rt_bot_internal), bot_count, "bot internal"); - if ((dp = db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_NOISY)) == DIR_NULL) { - return GED_ERROR; - } + GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, GED_ERROR & GED_QUIET); + GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, GED_ERROR); - if ( rt_db_get_internal( &intern, dp, gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource ) < 0 ) { - bu_vls_printf(&gedp->ged_result_str, "%s: rt_db_get_internal(%s) error\n", argv[0], argv[1]); + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { + bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[1]); return GED_ERROR; - } - if ( intern.idb_type != ID_BOT ) { - bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!!!\n", argv[0], argv[1]); - return GED_ERROR; - } - bot = (struct rt_bot_internal *)intern.idb_ptr; edges = bu_calloc(bot->num_faces, 3, "num_edges"); Modified: brlcad/trunk/src/libged/bot_sync.c =================================================================== --- brlcad/trunk/src/libged/bot_sync.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_sync.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -63,26 +63,17 @@ continue; } - if (rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "%s: rt_db_get_internal(%s) error\n", argv[0], argv[i]); - return GED_ERROR; - } + GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, GED_ERROR); - if (intern.idb_type != ID_BOT) { - bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!!!\n", argv[0], argv[i]); + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { + bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[i]); continue; } bot = (struct rt_bot_internal *)intern.idb_ptr; rt_bot_sync(bot); - if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, gedp->ged_wdbp->wdb_resp)) { - bu_vls_printf(&gedp->ged_result_str, - "Failed to write BOT (%s) to database!!!", - dp->d_namep); - rt_db_free_internal(&intern, gedp->ged_wdbp->wdb_resp); - return GED_ERROR; - } + GED_DB_PUT_INTERNAL(gedp, dp, &intern, gedp->ged_wdbp->wdb_resp, GED_ERROR); } return GED_OK; Modified: brlcad/trunk/src/libged/bot_vertex_fuse.c =================================================================== --- brlcad/trunk/src/libged/bot_vertex_fuse.c 2009-06-06 22:57:37 UTC (rev 34691) +++ brlcad/trunk/src/libged/bot_vertex_fuse.c 2009-06-07 17:27:35 UTC (rev 34692) @@ -62,21 +62,14 @@ return GED_ERROR; } - if ( (old_dp = db_lookup( gedp->ged_wdbp->dbip, argv[2], LOOKUP_NOISY )) == DIR_NULL ) - return GED_ERROR; + GED_DB_LOOKUP(gedp, old_dp, argv[2], LOOKUP_NOISY, GED_ERROR & GED_QUIET); + GED_DB_GET_INTERNAL(gedp, &intern, old_dp, bn_mat_identity, &rt_uniresource, GED_ERROR); - if ( rt_db_get_internal( &intern, old_dp, gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource ) < 0 ) - { - bu_vls_printf(&gedp->ged_result_str, "%s: rt_db_get_internal(%s) error\n", argv[0], argv[2]); + if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) { + bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[2]); return GED_ERROR; } - if ( intern.idb_type != ID_BOT ) - { - bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!!!\n", argv[0], argv[2]); - return GED_ERROR; - } - bot = (struct rt_bot_internal *)intern.idb_ptr; RT_BOT_CK_MAGIC( bot ); @@ -84,19 +77,9 @@ if ( count1 ) (void)rt_bot_condense( bot ); - if ( (new_dp=db_diradd( gedp->ged_wdbp->dbip, argv[1], -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type)) == DIR_NULL ) - { - bu_vls_printf(&gedp->ged_result_str, "%s: Cannot add %s to directory\n", argv[0], argv[1]); - return GED_ERROR; - } + GED_DB_DIRADD(gedp, new_dp, argv[1], -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR); + GED_DB_PUT_INTERNAL(gedp, new_dp, &intern, &rt_uniresource, GED_ERROR); - if ( rt_db_put_internal( new_dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource ) < 0 ) - { - rt_db_free_internal( &intern, &rt_uniresource ); - bu_vls_printf(&gedp->ged_result_str, "%s: Database write error, aborting\n", argv[0]); - return GED_ERROR; - } - return GED_OK; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-08 15:04:59
|
Revision: 34697 http://brlcad.svn.sourceforge.net/brlcad/?rev=34697&view=rev Author: brlcad Date: 2009-06-08 15:04:58 +0000 (Mon, 08 Jun 2009) Log Message: ----------- more pattern collapsing to GED macros Modified Paths: -------------- brlcad/trunk/src/libged/clone.c brlcad/trunk/src/libged/comb.c brlcad/trunk/src/libged/comb_std.c brlcad/trunk/src/libged/copy.c brlcad/trunk/src/libged/copyeval.c Modified: brlcad/trunk/src/libged/clone.c =================================================================== --- brlcad/trunk/src/libged/clone.c 2009-06-08 14:12:13 UTC (rev 34696) +++ brlcad/trunk/src/libged/clone.c 2009-06-08 15:04:58 UTC (rev 34697) @@ -916,11 +916,7 @@ if (!argv[bu_optind]) return GED_ERROR; - state->src = db_lookup(gedp->ged_wdbp->dbip, argv[bu_optind], LOOKUP_QUIET); - if (!state->src) { - bu_vls_printf(&gedp->ged_result_str, "clone: Cannot find source object\n"); - return GED_ERROR; - } + GED_DB_LOOKUP(gedp, state->src, argv[bu_optind], LOOKUP_QUIET, GED_ERROR); VSCALE(state->trans, state->trans, gedp->ged_wdbp->dbip->dbi_local2base); VSCALE(state->rpnt, state->rpnt, gedp->ged_wdbp->dbip->dbi_local2base); Modified: brlcad/trunk/src/libged/comb.c =================================================================== --- brlcad/trunk/src/libged/comb.c 2009-06-08 14:12:13 UTC (rev 34696) +++ brlcad/trunk/src/libged/comb.c 2009-06-08 15:04:58 UTC (rev 34697) @@ -99,10 +99,7 @@ } } - if (db_lookup(gedp->ged_wdbp->dbip, comb_name, LOOKUP_QUIET) == DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, "Error: %s not created", comb_name); - return GED_ERROR; - } + GED_DB_LOOKUP(gedp, dp, comb_name, LOOKUP_QUIET, GED_ERROR); return GED_OK; } @@ -149,13 +146,8 @@ intern.idb_type = ID_COMBINATION; intern.idb_meth = &rt_functab[ID_COMBINATION]; - /* Update the in-core directory */ - if ((dp = db_diradd(gedp->ged_wdbp->dbip, combname, -1, 0, flags, (genptr_t)&intern.idb_type)) == DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, - "An error has occured while adding '%s' to the database.\n", - combname); - return DIR_NULL; - } + /* Update the in-core directory (DIR_NULL happens to work since it's a zero-value) */ + GED_DB_DIRADD(gedp, dp, combname, -1, 0, flags, (genptr_t)&intern.idb_type, (int)DIR_NULL); BU_GETSTRUCT(comb, rt_comb_internal); intern.idb_ptr = (genptr_t)comb; @@ -186,10 +178,8 @@ tp->tr_l.tl_mat = (matp_t)NULL; comb->tree = tp; - if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "Failed to write %s", dp->d_namep); - return DIR_NULL; - } + /* DIR_NULL happens to work as the macro flag because it's a zero value */ + GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, (int)DIR_NULL); return dp; } else if (!(dp->d_flags & DIR_COMB)) { bu_vls_printf(&gedp->ged_result_str, "%s exists, but is not a combination\n"); @@ -197,10 +187,8 @@ } /* combination exists, add a new member */ - if (rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, (fastf_t *)NULL, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "read error, aborting\n"); - return DIR_NULL; - } + /* DIR_NULL happens to work as the macro flag because it's a zero value */ + GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, (int)DIR_NULL); comb = (struct rt_comb_internal *)intern.idb_ptr; RT_CK_COMB(comb); @@ -260,10 +248,8 @@ comb->tree = (union tree *)db_mkgift_tree( tree_list, node_count, &rt_uniresource ); /* and finally, write it out */ - if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "Failed to write %s", dp->d_namep); - return DIR_NULL; - } + /* DIR_NULL happens to work as the macro flag because it's a zero value */ + GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, (int)DIR_NULL); bu_free((char *)tree_list, "combadd: tree_list"); Modified: brlcad/trunk/src/libged/comb_std.c =================================================================== --- brlcad/trunk/src/libged/comb_std.c 2009-06-08 14:12:13 UTC (rev 34696) +++ brlcad/trunk/src/libged/comb_std.c 2009-06-08 15:04:58 UTC (rev 34697) @@ -432,7 +432,7 @@ char *comb_name; int ch; int region_flag = -1; - register struct directory *dp; + register struct directory *dp = DIR_NULL; struct rt_db_internal intern; struct rt_comb_internal *comb = NULL; struct tokens tok_hd; @@ -491,18 +491,14 @@ /* * Set/Reset the REGION flag of an existing combination */ - if ((dp = db_lookup(gedp->ged_wdbp->dbip, comb_name, LOOKUP_NOISY)) == DIR_NULL) - return GED_ERROR; + GED_DB_LOOKUP(gedp, dp, comb_name, LOOKUP_NOISY, GED_ERROR & GED_QUIET); if (!(dp->d_flags & DIR_COMB)) { bu_vls_printf(&gedp->ged_result_str, "%s is not a combination\n", comb_name); return GED_ERROR; } - if (rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, (fastf_t *)NULL, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "Database read error, aborting\n"); - return GED_ERROR; - } + GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, GED_ERROR); comb = (struct rt_comb_internal *)intern.idb_ptr; RT_CK_COMB(comb); @@ -519,11 +515,7 @@ else comb->region_flag = 0; - if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource) < 0) { - rt_db_free_internal(&intern, &rt_uniresource); - bu_vls_printf(&gedp->ged_result_str, "Database write error, aborting\n"); - return GED_ERROR; - } + GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR); return GED_OK; } @@ -536,11 +528,8 @@ * Otherwise, make sure to set its c_flags according to region_flag. */ - dp = db_lookup( gedp->ged_wdbp->dbip, comb_name, LOOKUP_QUIET ); - if (dp != DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, "ERROR: %s already exists\n", comb_name); - return GED_ERROR; - } + GED_CHECK_EXISTS(gedp, comb_name, LOOKUP_QUIET, GED_ERROR); + dp = DIR_NULL; /* parse Boolean expression */ BU_LIST_INIT(&tok_hd.l); @@ -640,11 +629,7 @@ case GED_TOK_TREE: if (!strcmp(tok->tp->tr_l.tl_name, comb_name)) { db_free_tree( tok->tp, &rt_uniresource ); - if (rt_db_get_internal(&intern1, dp, gedp->ged_wdbp->dbip, (fastf_t *)NULL, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "Cannot get records for %s\n", comb_name); - bu_vls_printf(&gedp->ged_result_str, "Database read error, aborting\n"); - return GED_ERROR; - } + GED_DB_GET_INTERNAL(gedp, &intern1, dp, (fastf_t *)NULL, &rt_uniresource, GED_ERROR); comb1 = (struct rt_comb_internal *)intern1.idb_ptr; RT_CK_COMB(comb1); @@ -697,15 +682,8 @@ intern.idb_meth = &rt_functab[ID_COMBINATION]; intern.idb_ptr = (genptr_t)comb; - if ((dp=db_diradd(gedp->ged_wdbp->dbip, comb_name, -1L, 0, flags, (genptr_t)&intern.idb_type)) == DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, "Failed to add %s to directory, aborting\n", comb_name); - return GED_ERROR; - } - - if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "Failed to write %s", dp->d_namep); - return GED_ERROR; - } + GED_DB_DIRADD(gedp, dp, comb_name, -1L, 0, flags, (genptr_t)&intern.idb_type, GED_ERROR); + GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR); } else { db_delete(gedp->ged_wdbp->dbip, dp); @@ -714,10 +692,7 @@ db_free_tree(comb->tree, &rt_uniresource); comb->tree = final_tree; - if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "Failed to write %s", dp->d_namep); - return GED_ERROR; - } + GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, GED_ERROR); } return GED_OK; Modified: brlcad/trunk/src/libged/copy.c =================================================================== --- brlcad/trunk/src/libged/copy.c 2009-06-08 14:12:13 UTC (rev 34696) +++ brlcad/trunk/src/libged/copy.c 2009-06-08 15:04:58 UTC (rev 34697) @@ -60,23 +60,16 @@ } - if ((proto = db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_NOISY)) == DIR_NULL) - return GED_ERROR; + GED_DB_LOOKUP(gedp, proto, argv[1], LOOKUP_NOISY, GED_ERROR & GED_QUIET); - if (db_lookup(gedp->ged_wdbp->dbip, argv[2], LOOKUP_QUIET) != DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, "%s: already exists", argv[2]); - return GED_ERROR; - } + GED_CHECK_EXISTS(gedp, argv[2], LOOKUP_QUIET, GED_ERROR); if (db_get_external(&external, proto, gedp->ged_wdbp->dbip)) { bu_vls_printf(&gedp->ged_result_str, "Database read error, aborting\n"); return GED_ERROR; } - if ((dp=db_diradd(gedp->ged_wdbp->dbip, argv[2], -1, 0, proto->d_flags, (genptr_t)&proto->d_minor_type)) == DIR_NULL ) { - bu_vls_printf(&gedp->ged_result_str, "An error has occured while adding a new object to the database."); - return GED_ERROR; - } + GED_DB_DIRADD(gedp, dp, argv[2], -1, 0, proto->d_flags, (genptr_t)&proto->d_minor_type, GED_ERROR); if (db_put_external(&external, dp, gedp->ged_wdbp->dbip) < 0) { bu_free_external(&external); Modified: brlcad/trunk/src/libged/copyeval.c =================================================================== --- brlcad/trunk/src/libged/copyeval.c 2009-06-08 14:12:13 UTC (rev 34696) +++ brlcad/trunk/src/libged/copyeval.c 2009-06-08 15:04:58 UTC (rev 34697) @@ -69,10 +69,7 @@ gtd.gtd_prflag = 0; /* check if new solid name already exists in description */ - if (db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_QUIET) != DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, "%s: alread exists\n", argv[1]); - return GED_ERROR; - } + GED_CHECK_EXISTS(gedp, argv[1], LOOKUP_QUIET, GED_ERROR); MAT_IDN(start_mat); @@ -84,14 +81,13 @@ tok = strtok((char *)argv[2], "/"); while (tok) { - if ((gtd.gtd_obj[endpos++] = db_lookup(gedp->ged_wdbp->dbip, tok, LOOKUP_NOISY)) == DIR_NULL) - return GED_ERROR; + GED_DB_LOOKUP(gedp, gtd.gtd_obj[endpos], tok, LOOKUP_NOISY, GED_ERROR & GED_QUIET); + endpos++; tok = strtok((char *)NULL, "/"); } } else { for (i=2; i<argc; i++) { - if ((gtd.gtd_obj[i-2] = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) == DIR_NULL) - return GED_ERROR; + GED_DB_LOOKUP(gedp, gtd.gtd_obj[i-2], argv[i], LOOKUP_NOISY, GED_ERROR & GED_QUIET); } endpos = argc - 2; } @@ -99,14 +95,11 @@ gtd.gtd_objpos = endpos - 1; /* Make sure that final component in path is a solid */ - if ((id = rt_db_get_internal(&internal, gtd.gtd_obj[endpos - 1], gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource)) < 0) { - bu_vls_printf(&gedp->ged_result_str, "import failure on %s\n", argv[argc-1]); - return GED_ERROR; - } + GED_DB_GET_INTERNAL(gedp, &internal, gtd.gtd_obj[endpos - 1], bn_mat_identity, &rt_uniresource, GED_ERROR); - if (id >= ID_COMBINATION) { + if (internal.idb_type == ID_COMBINATION) { rt_db_free_internal(&internal, &rt_uniresource); - bu_vls_printf(&gedp->ged_result_str, "final component on path must be a primitive!!!\n"); + bu_vls_printf(&gedp->ged_result_str, "final component on path must be a primitive!\n"); return GED_ERROR; } @@ -135,6 +128,9 @@ return GED_ERROR; } + /* should call GED_DB_DIRADD() but need to deal with freeing the + * internals on failure. + */ if ((dp=db_diradd(gedp->ged_wdbp->dbip, argv[1], -1L, 0, gtd.gtd_obj[endpos-1]->d_flags, (genptr_t)&new_int.idb_type)) == DIR_NULL) { @@ -144,6 +140,9 @@ return GED_ERROR; } + /* should call GED_DB_DIRADD() but need to deal with freeing the + * internals on failure. + */ if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &new_int, &rt_uniresource) < 0) { rt_db_free_internal(&internal, &rt_uniresource); rt_db_free_internal(&new_int, &rt_uniresource); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eri...@us...> - 2009-07-14 18:17:21
|
Revision: 35109 http://brlcad.svn.sourceforge.net/brlcad/?rev=35109&view=rev Author: erikgreenwald Date: 2009-07-14 18:17:15 +0000 (Tue, 14 Jul 2009) Log Message: ----------- Some warning cleanup. Added missing headers, fixed varargs stuff with too many or too few arguments provided. Minor type fixes. Etc. Modified Paths: -------------- brlcad/trunk/src/libged/adc.c brlcad/trunk/src/libged/attr.c brlcad/trunk/src/libged/bigE.c brlcad/trunk/src/libged/bot_dump.c brlcad/trunk/src/libged/bot_smooth.c brlcad/trunk/src/libged/brep.c brlcad/trunk/src/libged/clone.c brlcad/trunk/src/libged/comb_std.c brlcad/trunk/src/libged/concat.c brlcad/trunk/src/libged/copymat.c brlcad/trunk/src/libged/dg_obj.c brlcad/trunk/src/libged/editit.c brlcad/trunk/src/libged/edmater.c brlcad/trunk/src/libged/facetize.c brlcad/trunk/src/libged/ged.c brlcad/trunk/src/libged/get_comb.c brlcad/trunk/src/libged/get_obj_bounds.c brlcad/trunk/src/libged/gqa.c brlcad/trunk/src/libged/grid.c brlcad/trunk/src/libged/illum.c brlcad/trunk/src/libged/importFg4Section.c brlcad/trunk/src/libged/inside.c brlcad/trunk/src/libged/label.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/make_pnts.c brlcad/trunk/src/libged/move.c brlcad/trunk/src/libged/move_all.c brlcad/trunk/src/libged/nmg_collapse.c brlcad/trunk/src/libged/pathsum.c brlcad/trunk/src/libged/png.c brlcad/trunk/src/libged/push.c brlcad/trunk/src/libged/qray.c brlcad/trunk/src/libged/rcodes.c brlcad/trunk/src/libged/rect.c brlcad/trunk/src/libged/red.c brlcad/trunk/src/libged/rmap.c brlcad/trunk/src/libged/rt.c brlcad/trunk/src/libged/rtcheck.c brlcad/trunk/src/libged/search.c brlcad/trunk/src/libged/set_output_script.c brlcad/trunk/src/libged/set_uplotOutputMode.c brlcad/trunk/src/libged/showmats.c brlcad/trunk/src/libged/tables.c brlcad/trunk/src/libged/tree.c brlcad/trunk/src/libged/zap.c Modified: brlcad/trunk/src/libged/adc.c =================================================================== --- brlcad/trunk/src/libged/adc.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/adc.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -413,7 +413,7 @@ i = (int)user_pt[X]; if (i < 0 || 2 < i) { - bu_vls_printf(&gedp->ged_result_str, "The '%s anchor_pos' parameter accepts values of 0, 1, or 2."); + bu_vls_printf(&gedp->ged_result_str, "The '%d anchor_pos' parameter accepts values of 0, 1, or 2.", i); return GED_ERROR; } Modified: brlcad/trunk/src/libged/attr.c =================================================================== --- brlcad/trunk/src/libged/attr.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/attr.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -56,7 +56,7 @@ /* 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); + 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."); return GED_ERROR; } Modified: brlcad/trunk/src/libged/bigE.c =================================================================== --- brlcad/trunk/src/libged/bigE.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/bigE.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -298,12 +298,12 @@ struct seg *ptr; if (!seg) - bu_log("%s - NULL seg list\n", str); + bu_log("%d - NULL seg list\n", str); else { if (BU_LIST_IS_EMPTY(seg)) - bu_log("%s - empty\n", str); + bu_log("%d - empty\n", str); else { - bu_log("%s:\n", str); + bu_log("%d:\n", str); for (BU_LIST_FOR (ptr, seg, seg)) { if (ptr->seg_stp == ON_SURF) bu_log("\t %g to %g (ON_SURF)\n", ptr->seg_in.hit_dist, ptr->seg_out.hit_dist); Modified: brlcad/trunk/src/libged/bot_dump.c =================================================================== --- brlcad/trunk/src/libged/bot_dump.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/bot_dump.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -29,6 +29,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <string.h> +#include <ctype.h> #include "bio.h" #include "vmath.h" Modified: brlcad/trunk/src/libged/bot_smooth.c =================================================================== --- brlcad/trunk/src/libged/bot_smooth.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/bot_smooth.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <stdlib.h> #include <string.h> #include "bio.h" Modified: brlcad/trunk/src/libged/brep.c =================================================================== --- brlcad/trunk/src/libged/brep.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/brep.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,9 @@ #include "common.h" +#include <stdlib.h> +#include <string.h> + #include "bio.h" #include "./ged_private.h" @@ -47,10 +50,12 @@ int ged_brep(struct ged *gedp, int argc, const char *argv[]) { + struct bn_vlblock*vbp; + /* unused? int ret; - struct bn_vlblock*vbp; FILE *fp; double char_size; + */ char *solid_name; char *command; static const char *usage = "brepsolidname [command]"; @@ -135,8 +140,8 @@ } else if (argc == 3) { brep_info(bs, &gedp->ged_result_str); } else if (argc == 5) { - char *part = argv[3]; - char *strindex = argv[4]; + const char *part = argv[3]; + const char *strindex = argv[4]; if (strcmp(strindex,"?") == 0) { /* printout indedx options */ bu_vls_printf(&gedp->ged_result_str, "\tinfo S [index] - return information for specific BREP 'surface'\n"); @@ -163,8 +168,8 @@ bu_vls_printf( &gedp->ged_result_str, "%s", usage); brep_info(bs, &gedp->ged_result_str); } else if (argc >= 5) { - char *part = argv[3]; - char *strindex = argv[4]; + const char *part = argv[3]; + const char *strindex = argv[4]; if (strcmp(strindex,"?") == 0) { /* printout indedx options */ bu_vls_printf(&gedp->ged_result_str, "\tplot S [index] - plot specific BREP 'surface'\n"); @@ -176,7 +181,7 @@ if (strcmp(part,"S") == 0) { bu_vls_printf(&gedp->ged_result_str, "%s plot:", solid_name); if (argc == 6) { - char *strres = argv[5]; + const char *strres = argv[5]; plotres = atoi(strres); } vbp = rt_vlblock_init(); Modified: brlcad/trunk/src/libged/clone.c =================================================================== --- brlcad/trunk/src/libged/clone.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/clone.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -214,11 +214,11 @@ /* Ugh. This needs much repair/cleanup. */ if ( state->updpos == 0 ) { - sscanf(dp->d_namep, "%[!-/,:-~]%d%[!-/,:-~]%512s", &prefix, &num, &suffix, &suffix2); /* CLONE_BUFSIZE */ + sscanf(dp->d_namep, "%[!-/,:-~]%d%[!-/,:-~]%512s", prefix, &num, suffix, &suffix2); /* CLONE_BUFSIZE */ snprintf(suffix, CLONE_BUFSIZE, "%s%s", suffix, suffix2); } else if ( state->updpos == 1 ) { int num2 = 0; - sscanf(dp->d_namep, "%[!-/,:-~]%d%[!-/,:-~]%d%[!-/,:-~]", &prefix, &num2, &suffix2, &num, &suffix); + sscanf(dp->d_namep, "%[!-/,:-~]%d%[!-/,:-~]%d%[!-/,:-~]", prefix, &num2, suffix2, &num, suffix); if (num > 0) { snprintf(prefix, CLONE_BUFSIZE, "%s%d%s", prefix, num2, suffix2); } else { Modified: brlcad/trunk/src/libged/comb_std.c =================================================================== --- brlcad/trunk/src/libged/comb_std.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/comb_std.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -670,7 +670,7 @@ comb->los = gedp->ged_wdbp->wdb_los_default; comb->GIFTmater = gedp->ged_wdbp->wdb_mat_default; bu_vls_printf(&gedp->ged_result_str, - "Creating region id=%d, air=%d, los=%d, GIFTmaterial=%d\n", + "Creating region id=%ld, air=%ld, los=%ld, GIFTmaterial=%ld\n", comb->region_id, comb->aircode, comb->los, comb->GIFTmater); flags |= DIR_REGION; Modified: brlcad/trunk/src/libged/concat.c =================================================================== --- brlcad/trunk/src/libged/concat.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/concat.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -295,7 +295,7 @@ /* make sure it fits for v4 */ if ( cc_data->old_dbip->dbi_version < 5 ) { if (bu_vls_strlen(&new_name) > GED_V4_MAXNAME) { - bu_log("ERROR: generated new name [%s] is too long (%ld > %ld)\n", bu_vls_addr(&new_name), bu_vls_strlen(&new_name), GED_V4_MAXNAME); + bu_log("ERROR: generated new name [%s] is too long (%d > %d)\n", bu_vls_addr(&new_name), bu_vls_strlen(&new_name), GED_V4_MAXNAME); } return NULL; } Modified: brlcad/trunk/src/libged/copymat.c =================================================================== --- brlcad/trunk/src/libged/copymat.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/copymat.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -107,7 +107,7 @@ else { bu_vls_printf(&gedp->ged_result_str, "%s: Non-combination directory <x%lx> '%s' for combination rt_db_internal <x%lx>\nThis should not happen\n", - argv[0], (long)dp, dp->d_namep, &intern); + argv[0], (long)dp, dp->d_namep, (long)&intern); } /* Fall through this case */ default: Modified: brlcad/trunk/src/libged/dg_obj.c =================================================================== --- brlcad/trunk/src/libged/dg_obj.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/dg_obj.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -33,6 +33,8 @@ #include <string.h> #include <limits.h> #include <errno.h> +#include <sys/types.h> +#include <sys/wait.h> #include "bio.h" #include "tcl.h" Modified: brlcad/trunk/src/libged/editit.c =================================================================== --- brlcad/trunk/src/libged/editit.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/editit.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -24,6 +24,9 @@ */ #include <stdlib.h> +#include <sys/types.h> +#include <sys/wait.h> + #include "bio.h" #include "ged.h" Modified: brlcad/trunk/src/libged/edmater.c =================================================================== --- brlcad/trunk/src/libged/edmater.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/edmater.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,9 +25,10 @@ * */ +#include <unistd.h> + #include "ged.h" - int ged_edmater(struct ged *gedp, int argc, const char *argv[]) { Modified: brlcad/trunk/src/libged/facetize.c =================================================================== --- brlcad/trunk/src/libged/facetize.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/facetize.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -245,7 +245,7 @@ if ( (dp=db_diradd( dbip, newname, -1L, 0, DIR_SOLID, (genptr_t)&intern.idb_type)) == DIR_NULL ) { - bu_vls_printf(&gedp->ged_result_str, "Cannot add ", newname, " to directory\n"); + bu_vls_printf(&gedp->ged_result_str, "Cannot add %s to directory\n", newname); return GED_ERROR; } Modified: brlcad/trunk/src/libged/ged.c =================================================================== --- brlcad/trunk/src/libged/ged.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/ged.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -34,8 +34,9 @@ #include "common.h" +#include <stdio.h> #include <stdlib.h> -#include <stdio.h> +#include <string.h> #include <math.h> #include "bio.h" Modified: brlcad/trunk/src/libged/get_comb.c =================================================================== --- brlcad/trunk/src/libged/get_comb.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/get_comb.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -108,7 +108,7 @@ bu_vls_printf(&gedp->ged_result_str, "%s", dp->d_namep); if (comb->region_flag) { - bu_vls_printf(&gedp->ged_result_str, " Yes %d %d %d %d", + bu_vls_printf(&gedp->ged_result_str, " Yes %ld %ld %ld %ld", comb->region_id, comb->aircode, comb->GIFTmater, comb->los); } else { bu_vls_printf(&gedp->ged_result_str, " No"); Modified: brlcad/trunk/src/libged/get_obj_bounds.c =================================================================== --- brlcad/trunk/src/libged/get_obj_bounds.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/get_obj_bounds.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -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); + bu_vls_printf(&gedp->ged_result_str, "rt_new_rti failure for %s\n", gedp->ged_wdbp->dbip->dbi_filename); return GED_ERROR; } @@ -62,7 +62,7 @@ /* Get full_path structure for argument */ db_full_path_init(&path); 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]); + bu_vls_printf(&gedp->ged_result_str, "db_string_to_path failed for %s\n", argv[i]); rt_free_rti(rtip); return GED_ERROR; } @@ -74,7 +74,7 @@ db_full_path_init(&tmp_path); 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); + bu_vls_printf(&gedp->ged_result_str, "db_string_to_path failed for %s\n", regp->reg_name); rt_free_rti(rtip); return GED_ERROR; } @@ -87,7 +87,7 @@ /* if we don't already have it, get it */ if (!gottree && rt_gettree(rtip, path.fp_names[0]->d_namep)) { - bu_vls_printf(&gedp->ged_result_str, "rt_gettree failed for ", argv[i]); + bu_vls_printf(&gedp->ged_result_str, "rt_gettree failed for %s\n", argv[i]); rt_free_rti(rtip); return GED_ERROR; } @@ -120,7 +120,7 @@ if (regp != REGION_NULL) { /* input name was a region */ if (rt_bound_tree(regp->reg_treetop, reg_min, reg_max)) { - bu_vls_printf(&gedp->ged_result_str, "rt_bound_tree failed for ", regp->reg_name); + bu_vls_printf(&gedp->ged_result_str, "rt_bound_tree failed for %s\n", regp->reg_name); rt_free_rti(rtip); return TCL_ERROR; } @@ -144,7 +144,7 @@ /* This is part of the group */ if (rt_bound_tree(regp->reg_treetop, reg_min, reg_max)) { - bu_vls_printf(&gedp->ged_result_str, "rt_bound_tree failed for ", regp->reg_name); + bu_vls_printf(&gedp->ged_result_str, "rt_bound_tree failed for %s\n", regp->reg_name); rt_free_rti(rtip); return TCL_ERROR; } Modified: brlcad/trunk/src/libged/gqa.c =================================================================== --- brlcad/trunk/src/libged/gqa.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/gqa.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -687,7 +687,7 @@ case 'U' : use_air = strtol(bu_optarg, (char **)NULL, 10); if (errno == ERANGE || errno == EINVAL) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error in air argument\n", bu_optarg); + bu_vls_printf(&ged_current_gedp->ged_result_str, "error in air argument %s\n", bu_optarg); return -1; } break; Modified: brlcad/trunk/src/libged/grid.c =================================================================== --- brlcad/trunk/src/libged/grid.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/grid.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -26,6 +26,7 @@ #include "common.h" #include <math.h> +#include <string.h> #include "bio.h" #include "bu.h" Modified: brlcad/trunk/src/libged/illum.c =================================================================== --- brlcad/trunk/src/libged/illum.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/illum.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -23,6 +23,8 @@ * */ +#include <string.h> + #include "ged.h" #include "solid.h" Modified: brlcad/trunk/src/libged/importFg4Section.c =================================================================== --- brlcad/trunk/src/libged/importFg4Section.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/importFg4Section.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -133,7 +133,7 @@ if ( (num_normals > 0) && (fp->dbip->dbi_version < 5 ) ) { bu_log( "You are using an old database format which does not support surface normals for BOT primitives\n" ); - bu_log( "You are attempting to create a BOT primitive named \"%s\" with surface normals\n" ); + bu_log( "You are attempting to create a BOT primitive named \"%s\" with surface normals\n", name ); bu_log( "The surface normals will not be saved\n" ); bu_log( "Please upgrade to the current database format by using \"dbupgrade\"\n" ); } Modified: brlcad/trunk/src/libged/inside.c =================================================================== --- brlcad/trunk/src/libged/inside.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/inside.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -1135,7 +1135,7 @@ case ID_NMG: if (argc < arg+1) { - bu_vls_printf(&gedp->ged_result_str, "%s", p_nmgin); + bu_vls_printf(&gedp->ged_result_str, "%s", *p_nmgin); return GED_MORE; } thick[0] = atof(argv[arg]) * gedp->ged_wdbp->dbip->dbi_local2base; Modified: brlcad/trunk/src/libged/label.c =================================================================== --- brlcad/trunk/src/libged/label.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/label.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -44,7 +44,7 @@ /* initialize result */ bu_vls_trunc(&gedp->ged_result_str, 0); - bu_vls_printf(&gedp->ged_result_str, "Not yet implemented!", argv[0], usage); + bu_vls_printf(&gedp->ged_result_str, "Not yet implemented!\n%s\n%s\n", argv[0], usage); return GED_OK; } Modified: brlcad/trunk/src/libged/list.c =================================================================== --- brlcad/trunk/src/libged/list.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/list.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <stdlib.h> #include <string.h> #include "bio.h" Modified: brlcad/trunk/src/libged/log.c =================================================================== --- brlcad/trunk/src/libged/log.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/log.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -23,9 +23,9 @@ * */ +#include <string.h> #include "ged.h" - /** * Get the output from bu_log and append it to clientdata vls. */ Modified: brlcad/trunk/src/libged/ls.c =================================================================== --- brlcad/trunk/src/libged/ls.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/ls.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <stdlib.h> #include <string.h> #include "bio.h" Modified: brlcad/trunk/src/libged/make.c =================================================================== --- brlcad/trunk/src/libged/make.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/make.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -27,6 +27,8 @@ #include <signal.h> #include <stdlib.h> +#include <string.h> + #include "bio.h" #include "rtgeom.h" Modified: brlcad/trunk/src/libged/make_name.c =================================================================== --- brlcad/trunk/src/libged/make_name.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/make_name.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -23,9 +23,9 @@ * */ +#include <string.h> #include "ged.h" - int ged_make_name(struct ged *gedp, int argc, const char *argv[]) { Modified: brlcad/trunk/src/libged/make_pnts.c =================================================================== --- brlcad/trunk/src/libged/make_pnts.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/make_pnts.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -211,7 +211,7 @@ index2++; } } - temp_string[index2] = (char)NULL; + temp_string[index2] = '\0'; remove_whitespace(temp_string); @@ -390,7 +390,7 @@ int format_string_length = 0; /* number of characters in format_string, NOT including null terminator character */ int raw_format_string_length = 0; /* number of characters in raw_format_string, NOT including null terminator character */ - int num_doubles_per_point = 0; + unsigned int num_doubles_per_point = 0; void *point; @@ -581,7 +581,7 @@ perror("ERROR: Problem reading file, system error message"); fclose(fp); bu_vls_printf(&gedp->ged_result_str, "Make '%s' failed. ", argv[1]); - bu_vls_printf(&gedp->ged_result_str, "Unable to read file at byte '%d'.\n", num_characters_read_from_file); + bu_vls_printf(&gedp->ged_result_str, "Unable to read file at byte '%lu'.\n", num_characters_read_from_file); bu_free(format_string, "ged_make_pnts: format_string"); rt_db_free_internal(&internal, &rt_uniresource); return GED_ERROR; @@ -634,7 +634,7 @@ rt_db_free_internal(&internal, &rt_uniresource); return GED_ERROR; } - temp_string[temp_string_index] = (char)NULL; + temp_string[temp_string_index] = '\0'; /* do not convert string to double for format character '?' */ if (format_string[format_string_index] != '?') { Modified: brlcad/trunk/src/libged/move.c =================================================================== --- brlcad/trunk/src/libged/move.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/move.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <stdlib.h> #include <string.h> #include "bio.h" Modified: brlcad/trunk/src/libged/move_all.c =================================================================== --- brlcad/trunk/src/libged/move_all.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/move_all.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <stdlib.h> #include <string.h> #include "bio.h" @@ -64,7 +65,7 @@ } if (gedp->ged_wdbp->dbip->dbi_version < 5 && (int)strlen(argv[2]) > NAMESIZE) { - bu_vls_printf(&gedp->ged_result_str, "ERROR: name length limited to %d characters in v4 databases\n"); + bu_vls_printf(&gedp->ged_result_str, "ERROR: name length limited to %d characters in v4 databases\n", strlen(argv[2])); return GED_ERROR; } @@ -226,7 +227,7 @@ if (found) { bu_vls_free(&gdlp->gdl_path); - bu_vls_printf(&gdlp->gdl_path, "%S", &new_path); + bu_vls_printf(&gdlp->gdl_path, "%s", bu_vls_addr(&new_path)); } free((void *)dup); Modified: brlcad/trunk/src/libged/nmg_collapse.c =================================================================== --- brlcad/trunk/src/libged/nmg_collapse.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/nmg_collapse.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <stdlib.h> #include <string.h> #include "bio.h" Modified: brlcad/trunk/src/libged/pathsum.c =================================================================== --- brlcad/trunk/src/libged/pathsum.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/pathsum.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -109,7 +109,7 @@ for (i=0; i<gtd.gtd_objpos; i++) bu_vls_printf(&gedp->ged_result_str, "/%s", gtd.gtd_obj[i]->d_namep); - bu_vls_printf(&gedp->ged_result_str, " NOT FOUND\n", (char *)NULL); + bu_vls_printf(&gedp->ged_result_str, " NOT FOUND\n"); } return GED_OK; Modified: brlcad/trunk/src/libged/png.c =================================================================== --- brlcad/trunk/src/libged/png.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/png.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -42,7 +42,7 @@ static fastf_t ged_png_color_sf = 1.0/255.0; static unsigned int size = 512; static unsigned int half_size = 256; -static linewidth = 2; +static int linewidth = 2; static unsigned char bg_red = 255; static unsigned char bg_green = 255; Modified: brlcad/trunk/src/libged/push.c =================================================================== --- brlcad/trunk/src/libged/push.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/push.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <stdlib.h> #include <string.h> #include "bio.h" Modified: brlcad/trunk/src/libged/qray.c =================================================================== --- brlcad/trunk/src/libged/qray.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/qray.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -471,7 +471,7 @@ register struct bu_list *vhead; register struct ged_qray_dataList *ndlp; vect_t in_pt, out_pt; - vect_t last_out_pt; + vect_t last_out_pt = { 0, 0, 0 }; for (BU_LIST_FOR(ndlp, ged_qray_dataList, &headp->l)) { if (do_overlaps) Modified: brlcad/trunk/src/libged/rcodes.c =================================================================== --- brlcad/trunk/src/libged/rcodes.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/rcodes.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -67,7 +67,7 @@ } if ((fp = fopen(argv[1], "r")) == NULL) { - bu_vls_printf(&gedp->ged_result_str, "%s: Failed to read file - %s", argv[1]); + bu_vls_printf(&gedp->ged_result_str, "%s: Failed to read file - %s", argv[0], argv[1]); return GED_ERROR; } Modified: brlcad/trunk/src/libged/rect.c =================================================================== --- brlcad/trunk/src/libged/rect.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/rect.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <string.h> #include <math.h> #include "bio.h" Modified: brlcad/trunk/src/libged/red.c =================================================================== --- brlcad/trunk/src/libged/red.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/red.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -131,7 +131,7 @@ if (!gedp->ged_wdbp->dbip->dbi_read_only) { if ((node_count = ged_check_comb(gedp)) < 0) { /* Do some quick checking on the edited file */ - bu_vls_printf(&gedp->ged_result_str, "%s: Error in edited region, no changes made\n"); + bu_vls_printf(&gedp->ged_result_str, "%s: Error in edited region, no changes made\n", *argv); if (comb) intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); (void)unlink(ged_tmpfil); @@ -141,7 +141,7 @@ if (comb) { if (ged_save_comb(gedp, dp)) { /* Save combination to a temp name */ - bu_vls_printf(&gedp->ged_result_str, "%s: No changes made\n"); + bu_vls_printf(&gedp->ged_result_str, "%s: No changes made\n", *argv); intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); (void)unlink(ged_tmpfil); return GED_OK; @@ -149,10 +149,10 @@ } if (ged_build_comb(gedp, comb, dp, node_count, (char *)argv[1])) { - bu_vls_printf(&gedp->ged_result_str, "%s: Unable to construct new %s", dp->d_namep); + bu_vls_printf(&gedp->ged_result_str, "%s: Unable to construct new %s", *argv, dp->d_namep); if (comb) { ged_restore_comb(gedp, dp); - bu_vls_printf(&gedp->ged_result_str, "%s: \toriginal restored\n"); + bu_vls_printf(&gedp->ged_result_str, "%s: \toriginal restored\n", *argv); intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); } @@ -168,7 +168,7 @@ (void)ged_kill(gedp, 2, (const char **)av); } } else { - bu_vls_printf(&gedp->ged_result_str, "%s: Because the database is READ-ONLY no changes were made.\n"); + bu_vls_printf(&gedp->ged_result_str, "%s: Because the database is READ-ONLY no changes were made.\n", *argv); } } @@ -905,10 +905,10 @@ fprintf(fp, "NAME=%s\n", name); if (comb->region_flag) { fprintf(fp, "REGION=Yes\n"); - fprintf(fp, "REGION_ID=%d\n", comb->region_id); - fprintf(fp, "AIRCODE=%d\n", comb->aircode); - fprintf(fp, "GIFT_MATERIAL=%d\n", comb->GIFTmater); - fprintf(fp, "LOS=%d\n", comb->los); + fprintf(fp, "REGION_ID=%ld\n", comb->region_id); + fprintf(fp, "AIRCODE=%ld\n", comb->aircode); + fprintf(fp, "GIFT_MATERIAL=%ld\n", comb->GIFTmater); + fprintf(fp, "LOS=%ld\n", comb->los); } else { fprintf(fp, "REGION=No\n"); fprintf(fp, "REGION_ID=\n"); Modified: brlcad/trunk/src/libged/rmap.c =================================================================== --- brlcad/trunk/src/libged/rmap.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/rmap.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -131,7 +131,7 @@ bu_vls_free(&inp->name); bu_free((genptr_t)inp, "ged_rmap: inp"); } - bu_vls_printf(&gedp->ged_result_str, " } ", itnp->id); + bu_vls_printf(&gedp->ged_result_str, " } "); /* , itnp->id); */ BU_LIST_DEQUEUE(&itnp->l); bu_free((genptr_t)itnp, "ged_rmap: itnp"); Modified: brlcad/trunk/src/libged/rt.c =================================================================== --- brlcad/trunk/src/libged/rt.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/rt.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -26,6 +26,8 @@ #include "common.h" #include <stdlib.h> +#include <sys/types.h> +#include <sys/wait.h> #include "bio.h" #include "tcl.h" Modified: brlcad/trunk/src/libged/rtcheck.c =================================================================== --- brlcad/trunk/src/libged/rtcheck.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/rtcheck.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -26,6 +26,8 @@ #include "common.h" #include <stdlib.h> +#include <sys/types.h> +#include <sys/wait.h> #include "bio.h" #include "cmd.h" Modified: brlcad/trunk/src/libged/search.c =================================================================== --- brlcad/trunk/src/libged/search.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/search.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -89,6 +89,7 @@ #include <string.h> #include <stdlib.h> +#include <ctype.h> #include <time.h> #include <regex.h> #include "bio.h" Modified: brlcad/trunk/src/libged/set_output_script.c =================================================================== --- brlcad/trunk/src/libged/set_output_script.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/set_output_script.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -23,6 +23,7 @@ * */ +#include <string.h> #include "ged.h" /* Modified: brlcad/trunk/src/libged/set_uplotOutputMode.c =================================================================== --- brlcad/trunk/src/libged/set_uplotOutputMode.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/set_uplotOutputMode.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -23,10 +23,10 @@ * */ +#include <string.h> #include "ged.h" #include "plot3.h" - /* * Set/get the unix plot output mode * Modified: brlcad/trunk/src/libged/showmats.c =================================================================== --- brlcad/trunk/src/libged/showmats.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/showmats.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -93,7 +93,7 @@ if (rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, (fastf_t *)NULL, &rt_uniresource) < 0) { bu_vls_printf(&gedp->ged_result_str, "Database read error, aborting.\n"); - GED_ERROR; + return GED_ERROR; } comb = (struct rt_comb_internal *)intern.idb_ptr; Modified: brlcad/trunk/src/libged/tables.c =================================================================== --- brlcad/trunk/src/libged/tables.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/tables.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -188,7 +188,7 @@ if ( (dp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) != DIR_NULL ) ged_new_tables(gedp, dp, &cur_path, (fastf_t *)bn_mat_identity, flag); else - bu_vls_printf(&gedp->ged_result_str, "%s: skip this object\n"); + bu_vls_printf(&gedp->ged_result_str, "%s: skip this object\n", argv[i]); } bu_vls_printf(&gedp->ged_result_str, "Summary written in: %s\n", argv[1]); Modified: brlcad/trunk/src/libged/tree.c =================================================================== --- brlcad/trunk/src/libged/tree.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/tree.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,7 @@ #include "common.h" +#include <stdlib.h> #include <errno.h> #include <limits.h> #include "bio.h" Modified: brlcad/trunk/src/libged/zap.c =================================================================== --- brlcad/trunk/src/libged/zap.c 2009-07-14 18:12:48 UTC (rev 35108) +++ brlcad/trunk/src/libged/zap.c 2009-07-14 18:17:15 UTC (rev 35109) @@ -25,6 +25,8 @@ #include "common.h" +#include <stdlib.h> + #include "bio.h" #include "solid.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_r...@us...> - 2009-07-15 12:11:21
|
Revision: 35130 http://brlcad.svn.sourceforge.net/brlcad/?rev=35130&view=rev Author: d_rossberg Date: 2009-07-15 12:11:17 +0000 (Wed, 15 Jul 2009) Log Message: ----------- MSVC does not provide all POSIX headers handled this with the HAVE_~_H macros Modified Paths: -------------- brlcad/trunk/src/libged/dg_obj.c brlcad/trunk/src/libged/editit.c brlcad/trunk/src/libged/edmater.c brlcad/trunk/src/libged/rt.c brlcad/trunk/src/libged/rtcheck.c Modified: brlcad/trunk/src/libged/dg_obj.c =================================================================== --- brlcad/trunk/src/libged/dg_obj.c 2009-07-15 11:42:12 UTC (rev 35129) +++ brlcad/trunk/src/libged/dg_obj.c 2009-07-15 12:11:17 UTC (rev 35130) @@ -33,8 +33,15 @@ #include <string.h> #include <limits.h> #include <errno.h> -#include <sys/types.h> -#include <sys/wait.h> + +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif + #include "bio.h" #include "tcl.h" Modified: brlcad/trunk/src/libged/editit.c =================================================================== --- brlcad/trunk/src/libged/editit.c 2009-07-15 11:42:12 UTC (rev 35129) +++ brlcad/trunk/src/libged/editit.c 2009-07-15 12:11:17 UTC (rev 35130) @@ -24,9 +24,15 @@ */ #include <stdlib.h> -#include <sys/types.h> -#include <sys/wait.h> +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif + #include "bio.h" #include "ged.h" Modified: brlcad/trunk/src/libged/edmater.c =================================================================== --- brlcad/trunk/src/libged/edmater.c 2009-07-15 11:42:12 UTC (rev 35129) +++ brlcad/trunk/src/libged/edmater.c 2009-07-15 12:11:17 UTC (rev 35130) @@ -25,7 +25,9 @@ * */ -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include "ged.h" Modified: brlcad/trunk/src/libged/rt.c =================================================================== --- brlcad/trunk/src/libged/rt.c 2009-07-15 11:42:12 UTC (rev 35129) +++ brlcad/trunk/src/libged/rt.c 2009-07-15 12:11:17 UTC (rev 35130) @@ -26,8 +26,15 @@ #include "common.h" #include <stdlib.h> -#include <sys/types.h> -#include <sys/wait.h> + +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif + #include "bio.h" #include "tcl.h" Modified: brlcad/trunk/src/libged/rtcheck.c =================================================================== --- brlcad/trunk/src/libged/rtcheck.c 2009-07-15 11:42:12 UTC (rev 35129) +++ brlcad/trunk/src/libged/rtcheck.c 2009-07-15 12:11:17 UTC (rev 35130) @@ -26,8 +26,15 @@ #include "common.h" #include <stdlib.h> -#include <sys/types.h> -#include <sys/wait.h> + +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif + #include "bio.h" #include "cmd.h" @@ -401,7 +408,7 @@ /* wait for the forked process */ while ((rpid = wait(&retcode)) != rtcp->pid && rpid != -1) { - + ged_wait_status(&rtcp->gedp->ged_result_str, retcode); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-15 02:10:35
|
Revision: 36188 http://brlcad.svn.sourceforge.net/brlcad/?rev=36188&view=rev Author: starseeker Date: 2009-10-15 02:10:26 +0000 (Thu, 15 Oct 2009) Log Message: ----------- Start converting private ged structures, defines and functions to using an underscore prefix. Done through _ged_getspace. Modified Paths: -------------- brlcad/trunk/src/libged/analyze.c brlcad/trunk/src/libged/bb.c brlcad/trunk/src/libged/bigE.c brlcad/trunk/src/libged/blast.c brlcad/trunk/src/libged/brep.c brlcad/trunk/src/libged/cat.c brlcad/trunk/src/libged/clip.c brlcad/trunk/src/libged/color.c brlcad/trunk/src/libged/comb.c brlcad/trunk/src/libged/concat.c brlcad/trunk/src/libged/copyeval.c brlcad/trunk/src/libged/dg_obj.c brlcad/trunk/src/libged/draw.c brlcad/trunk/src/libged/dup.c brlcad/trunk/src/libged/erase.c brlcad/trunk/src/libged/erase_all.c brlcad/trunk/src/libged/ged.c brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/get_comb.c brlcad/trunk/src/libged/get_obj_bounds.c brlcad/trunk/src/libged/globals.c brlcad/trunk/src/libged/gqa.c brlcad/trunk/src/libged/group.c brlcad/trunk/src/libged/how.c brlcad/trunk/src/libged/instance.c brlcad/trunk/src/libged/kill.c brlcad/trunk/src/libged/killrefs.c brlcad/trunk/src/libged/killtree.c brlcad/trunk/src/libged/list.c brlcad/trunk/src/libged/loadview.c brlcad/trunk/src/libged/ls.c brlcad/trunk/src/libged/make_bb.c brlcad/trunk/src/libged/nirt.c brlcad/trunk/src/libged/ocenter.c brlcad/trunk/src/libged/open.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/plot.c brlcad/trunk/src/libged/png.c brlcad/trunk/src/libged/prcolor.c brlcad/trunk/src/libged/preview.c brlcad/trunk/src/libged/ps.c brlcad/trunk/src/libged/put_comb.c brlcad/trunk/src/libged/red.c brlcad/trunk/src/libged/region.c brlcad/trunk/src/libged/rmap.c brlcad/trunk/src/libged/rrt.c brlcad/trunk/src/libged/rt.c brlcad/trunk/src/libged/rtcheck.c brlcad/trunk/src/libged/set_transparency.c brlcad/trunk/src/libged/sphgroup.c brlcad/trunk/src/libged/summary.c brlcad/trunk/src/libged/tops.c brlcad/trunk/src/libged/trace.c brlcad/trunk/src/libged/tree.c brlcad/trunk/src/libged/vdraw.c brlcad/trunk/src/libged/wdb_obj.c brlcad/trunk/src/libged/which.c brlcad/trunk/src/libged/zap.c Modified: brlcad/trunk/src/libged/analyze.c =================================================================== --- brlcad/trunk/src/libged/analyze.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/analyze.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -92,7 +92,7 @@ GED_DB_GET_INTERNAL(gedp, &intern, ndp, bn_mat_identity, &rt_uniresource, GED_ERROR); - ged_do_list(gedp, ndp, 1); + _ged_do_list(gedp, ndp, 1); ged_do_anal(gedp, &intern); rt_db_free_internal(&intern, &rt_uniresource); } Modified: brlcad/trunk/src/libged/bb.c =================================================================== --- brlcad/trunk/src/libged/bb.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/bb.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -124,7 +124,7 @@ VSETALL(rpp_min, MAX_FASTF); VSETALL(rpp_max, -MAX_FASTF); for (i = 0; i < argc; i++) { - if (ged_get_obj_bounds(gedp, argc - i, (const char **)argv+i, use_air, obj_min, obj_max) == GED_ERROR) + if (_ged_get_obj_bounds(gedp, argc - i, (const char **)argv+i, use_air, obj_min, obj_max) == GED_ERROR) return GED_ERROR; VMINMAX(rpp_min, rpp_max, (double *)obj_min); VMINMAX(rpp_min, rpp_max, (double *)obj_max); Modified: brlcad/trunk/src/libged/bigE.c =================================================================== --- brlcad/trunk/src/libged/bigE.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/bigE.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -45,7 +45,7 @@ /* #define debug 1 */ -union E_tree *build_etree(union tree *tp, struct ged_client_data *dgcdp); +union E_tree *build_etree(union tree *tp, struct _ged_client_data *dgcdp); /* segment types (stored in the "seg_stp" field of the (struct seg) */ #define ON_SURF (struct soltab *)0x1 @@ -112,7 +112,7 @@ HIDDEN union E_tree * add_solid(const struct directory *dp, matp_t mat, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { union E_tree *eptr; struct nmgregion *r; @@ -246,7 +246,7 @@ /* build an E_tree corresponding to the region tree (tp) */ union E_tree * build_etree(union tree *tp, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { union E_tree *eptr = NULL; struct soltab *stp; @@ -323,7 +323,7 @@ /* given a segment list, eliminate any overlaps in the segments */ HIDDEN void eliminate_overlaps(struct bu_list *seghead, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { struct seg *a, *b, *nextb; @@ -363,7 +363,7 @@ struct seg *B, struct bu_list *seghead, struct soltab *type, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { struct seg *tmp=(struct seg *)NULL; @@ -404,7 +404,7 @@ do_subtract(struct seg *A, struct seg *B, struct bu_list *seghead, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { struct seg *tmp=(struct seg *)NULL; @@ -456,7 +456,7 @@ do_union(struct seg *A, struct seg *B, struct bu_list *seghead, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { struct seg *tmp; @@ -494,7 +494,7 @@ HIDDEN void promote_ints(struct bu_list *head, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { struct seg *a, *b, *tmp; @@ -696,7 +696,7 @@ eval_op(struct bu_list *A, int op, struct bu_list *B, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { struct seg *sega, *segb, *tmp, *next; struct bu_list ret, ons, ins; @@ -1016,7 +1016,7 @@ /* evaluate an E-tree */ HIDDEN struct bu_list * eval_etree(union E_tree *eptr, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { struct bu_list *A, *B; @@ -1080,7 +1080,7 @@ } HIDDEN struct soltab * -classify_seg(struct seg *seg, struct soltab *shoot, struct xray *rp, struct ged_client_data *dgcdp) +classify_seg(struct seg *seg, struct soltab *shoot, struct xray *rp, struct _ged_client_data *dgcdp) { fastf_t mid_dist; struct xray new_rp; @@ -1177,7 +1177,7 @@ int skip_leaf2, union E_tree *eptr, struct soltab *type, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { struct xray rp; struct ray_data rd; @@ -1403,7 +1403,7 @@ HIDDEN void Eplot(union E_tree *eptr, struct bu_list *vhead, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { point_t start_pt; int leaf_no; @@ -1765,7 +1765,7 @@ HIDDEN void free_etree(union E_tree *eptr, - struct ged_client_data *dgcdp) + struct _ged_client_data *dgcdp) { CK_ETREE(eptr); @@ -1802,7 +1802,7 @@ /* convert all "half" solids to polysolids */ HIDDEN void -fix_halfs(struct ged_client_data *dgcdp) +fix_halfs(struct _ged_client_data *dgcdp) { point_t max, min; int i, count=0; @@ -2084,7 +2084,7 @@ register int c; int ac = 1; char *av[2]; - struct ged_client_data *dgcdp; + struct _ged_client_data *dgcdp; static const char *usage = "[-C#/#/# -s] objects(s)"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); @@ -2103,15 +2103,15 @@ if (bu_debug&BU_DEBUG_MEM_CHECK && bu_mem_barriercheck()) bu_log("Error at start of 'E'\n"); - BU_GETSTRUCT(dgcdp, ged_client_data); + BU_GETSTRUCT(dgcdp, _ged_client_data); dgcdp->gedp = gedp; dgcdp->do_polysolids = 0; dgcdp->wireframe_color_override = 0; dgcdp->transparency = 0; #if 1 - dgcdp->dmode = GED_BOOL_EVAL; + dgcdp->dmode = _GED_BOOL_EVAL; #else - dgcdp->dmode = GED_WIREFRAME; + dgcdp->dmode = _GED_WIREFRAME; #endif /* Parse options. */ Modified: brlcad/trunk/src/libged/blast.c =================================================================== --- brlcad/trunk/src/libged/blast.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/blast.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -58,7 +58,7 @@ av[0] = "zap"; av[1] = (char *)0; - ged_zap(gedp, 1, av); + _ged_zap(gedp, 1, av); } /* Draw the new object(s) */ Modified: brlcad/trunk/src/libged/brep.c =================================================================== --- brlcad/trunk/src/libged/brep.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/brep.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -121,7 +121,7 @@ snprintf(namebuf, 64, "%s%s_", commtag, solid_name); - ged_cvt_vlblock_to_solids(gedp, vbp, namebuf, 0); + _ged_cvt_vlblock_to_solids(gedp, vbp, namebuf, 0); rt_vlblock_free(vbp); vbp = (struct bn_vlblock *)NULL; Modified: brlcad/trunk/src/libged/cat.c =================================================================== --- brlcad/trunk/src/libged/cat.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/cat.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -61,7 +61,7 @@ if ((dp = db_lookup(gedp->ged_wdbp->dbip, argv[arg], LOOKUP_NOISY)) == DIR_NULL) continue; - ged_do_list(gedp, dp, 0); /* non-verbose */ + _ged_do_list(gedp, dp, 0); /* non-verbose */ } return GED_OK; Modified: brlcad/trunk/src/libged/clip.c =================================================================== --- brlcad/trunk/src/libged/clip.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/clip.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -45,7 +45,7 @@ static int ged_code(fastf_t x, fastf_t y); int -ged_clip(fastf_t *xp1, fastf_t *yp1, fastf_t *xp2, fastf_t *yp2) +_ged_clip(fastf_t *xp1, fastf_t *yp1, fastf_t *xp2, fastf_t *yp2) { char code1, code2; @@ -142,7 +142,7 @@ * if !0 was returned, "a" and "b" have been clipped to the RPP. */ int -ged_vclip(vect_t a, vect_t b, register fastf_t *min, register fastf_t *max) +_ged_vclip(vect_t a, vect_t b, register fastf_t *min, register fastf_t *max) { static vect_t diff; static double sv; Modified: brlcad/trunk/src/libged/color.c =================================================================== --- brlcad/trunk/src/libged/color.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/color.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -94,7 +94,7 @@ while (rt_material_head() != MATER_NULL) { zot = rt_material_head(); rt_new_material_head(zot->mt_forw); - ged_color_zaprec(gedp, zot); + _ged_color_zaprec(gedp, zot); bu_free((genptr_t)zot, "mater rec"); } @@ -116,7 +116,7 @@ mp->mt_b = b; mp->mt_daddr = MATER_NO_ADDR; rt_insert_color(mp); - ged_color_putrec(gedp, mp); + _ged_color_putrec(gedp, mp); } } else { struct bu_vls vls; @@ -219,7 +219,7 @@ mp = rt_material_head(); while (mp != MATER_NULL) { next_mater = mp->mt_forw; - ged_color_zaprec(gedp, mp); + _ged_color_zaprec(gedp, mp); mp = next_mater; } @@ -239,7 +239,7 @@ mp = rt_material_head(); while (mp != MATER_NULL) { next_mater = mp->mt_forw; - ged_color_putrec(gedp, mp); + _ged_color_putrec(gedp, mp); mp = next_mater; } } else { @@ -279,7 +279,7 @@ * In some cases, storage will need to be allocated. */ void -ged_color_putrec(struct ged *gedp, +_ged_color_putrec(struct ged *gedp, register struct mater *mp) { @@ -296,7 +296,7 @@ rec.md.md_b = mp->mt_b; /* Fake up a directory entry for db_* routines */ - RT_DIR_SET_NAMEP( &dir, "ged_color_putrec" ); + RT_DIR_SET_NAMEP( &dir, "_ged_color_putrec" ); dir.d_magic = RT_DIR_MAGIC; dir.d_flags = 0; @@ -324,7 +324,7 @@ * Used to release database resources occupied by a material record. */ void -ged_color_zaprec(struct ged *gedp, +_ged_color_zaprec(struct ged *gedp, register struct mater *mp) { @@ -335,7 +335,7 @@ return; dir.d_magic = RT_DIR_MAGIC; - RT_DIR_SET_NAMEP( &dir, "ged_color_zaprec" ); + RT_DIR_SET_NAMEP( &dir, "_ged_color_zaprec" ); dir.d_len = 1; dir.d_addr = mp->mt_daddr; dir.d_flags = 0; Modified: brlcad/trunk/src/libged/comb.c =================================================================== --- brlcad/trunk/src/libged/comb.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/comb.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -93,7 +93,7 @@ continue; } - if (ged_combadd(gedp, dp, comb_name, 0, oper, 0, 0) == DIR_NULL) { + if (_ged_combadd(gedp, dp, comb_name, 0, oper, 0, 0) == DIR_NULL) { bu_vls_printf(&gedp->ged_result_str, "error in combadd"); return GED_ERROR; } @@ -114,7 +114,7 @@ * Preserves the GIFT semantics. */ struct directory * -ged_combadd(struct ged *gedp, +_ged_combadd(struct ged *gedp, register struct directory *objp, char *combname, int region_flag, /* true if adding region */ Modified: brlcad/trunk/src/libged/concat.c =================================================================== --- brlcad/trunk/src/libged/concat.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/concat.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -149,7 +149,7 @@ } if ( gedp->ged_wdbp->dbip->dbi_version < 5 ) { - if ( bu_vls_strlen(&cc_data.affix) > GED_V4_MAXNAME-1) { + if ( bu_vls_strlen(&cc_data.affix) > _GED_V4_MAXNAME-1) { bu_log("ERROR: affix [%s] is too long for v%d\n", bu_vls_addr(&cc_data.affix), gedp->ged_wdbp->dbip->dbi_version); bu_vls_free( &cc_data.affix ); return GED_ERROR; @@ -294,8 +294,8 @@ /* make sure it fits for v4 */ if ( cc_data->old_dbip->dbi_version < 5 ) { - if (bu_vls_strlen(&new_name) > GED_V4_MAXNAME) { - bu_log("ERROR: generated new name [%s] is too long (%d > %d)\n", bu_vls_addr(&new_name), bu_vls_strlen(&new_name), GED_V4_MAXNAME); + if (bu_vls_strlen(&new_name) > _GED_V4_MAXNAME) { + bu_log("ERROR: generated new name [%s] is too long (%d > %d)\n", bu_vls_addr(&new_name), bu_vls_strlen(&new_name), _GED_V4_MAXNAME); } return NULL; } Modified: brlcad/trunk/src/libged/copyeval.c =================================================================== --- brlcad/trunk/src/libged/copyeval.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/copyeval.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -44,7 +44,7 @@ int i; int endpos; char *tok; - struct ged_trace_data gtd; + struct _ged_trace_data gtd; static const char *usage = "path_to_old_prim new_prim"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); @@ -67,7 +67,7 @@ /* initialize gtd */ gtd.gtd_gedp = gedp; - gtd.gtd_flag = GED_CPEVAL; + gtd.gtd_flag = _GED_CPEVAL; gtd.gtd_prflag = 0; /* check if new solid name already exists in description */ Modified: brlcad/trunk/src/libged/dg_obj.c =================================================================== --- brlcad/trunk/src/libged/dg_obj.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/dg_obj.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -225,7 +225,7 @@ Dgo_Init(Tcl_Interp *interp) { BU_LIST_INIT(&HeadDGObj.l); - BU_LIST_INIT(&FreeSolid.l); + BU_LIST_INIT(&_FreeSolid.l); (void)Tcl_CreateCommand(interp, "dg_open", (Tcl_CmdProc *)dgo_open_tcl, (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL); @@ -295,7 +295,7 @@ BU_LIST_INIT(&dgop->dgo_headVDraw); BU_LIST_INIT(&dgop->dgo_observers.l); BU_LIST_INIT(&dgop->dgo_headRunRt.l); - dgop->dgo_freeSolids = &FreeSolid; + dgop->dgo_freeSolids = &_FreeSolid; dgop->dgo_uplotOutputMode = PL_OUTPUT_MODE_BINARY; dgo_init_qray(dgop); @@ -1456,7 +1456,7 @@ nsp = BU_LIST_PNEXT(solid, sp); BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &_FreeSolid.l); sp = nsp; } } @@ -3277,7 +3277,7 @@ dp = db_diradd(dgop->dgo_wdbp->dbip, name, RT_DIR_PHONY_ADDR, 0, DIR_SOLID, (genptr_t)&type); /* Obtain a fresh solid structure, and fill it in */ - GET_SOLID(sp, &FreeSolid.l); + GET_SOLID(sp, &_FreeSolid.l); if (copy) { BU_LIST_INIT(&(sp->s_vlist)); @@ -3393,7 +3393,7 @@ if (!existing_sp) { /* Handling a new solid */ - GET_SOLID(sp, &FreeSolid.l); + GET_SOLID(sp, &_FreeSolid.l); /* NOTICE: The structure is dirty & not initialized for you! */ sp->s_dlist = BU_LIST_LAST(solid, &dgcdp->dgop->dgo_headSolid)->s_dlist + 1; @@ -3632,7 +3632,7 @@ nsp = BU_LIST_PNEXT(solid, sp); if (db_full_path_subset(&sp->s_fullpath, &subpath, 0)) { BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &_FreeSolid.l); } sp = nsp; } @@ -3689,7 +3689,7 @@ goto end; BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &_FreeSolid.l); end: sp = nsp; } @@ -3722,7 +3722,7 @@ nsp = BU_LIST_PNEXT(solid, sp); if (db_full_path_subset(&sp->s_fullpath, &subpath, 0)) { BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &_FreeSolid.l); } sp = nsp; } Modified: brlcad/trunk/src/libged/draw.c =================================================================== --- brlcad/trunk/src/libged/draw.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/draw.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -35,7 +35,7 @@ #include "./ged_private.h" -/* declare our callbacks used by ged_drawtrees() */ +/* declare our callbacks used by _ged_drawtrees() */ static union tree *ged_bot_check_region_end(register struct db_tree_state *tsp, struct db_full_path *pathp, union tree *curtree, @@ -45,7 +45,7 @@ struct rt_db_internal *ip, genptr_t client_data); -static int ged_drawtrees_depth = 0; +static int _ged_drawtrees_depth = 0; /** @@ -116,13 +116,13 @@ * This routine must be prepared to run in parallel. */ void -ged_drawH_part2(int dashflag, struct bu_list *vhead, struct db_full_path *pathp, struct db_tree_state *tsp, struct solid *existing_sp, struct ged_client_data *dgcdp) +ged_drawH_part2(int dashflag, struct bu_list *vhead, struct db_full_path *pathp, struct db_tree_state *tsp, struct solid *existing_sp, struct _ged_client_data *dgcdp) { register struct solid *sp; if (!existing_sp) { /* Handling a new solid */ - GET_SOLID(sp, &FreeSolid.l); + GET_SOLID(sp, &_FreeSolid.l); /* NOTICE: The structure is dirty & not initialized for you! */ sp->s_dlist = BU_LIST_LAST(solid, &dgcdp->gdlp->gdl_headSolid)->s_dlist + 1; @@ -205,7 +205,7 @@ union tree *curtree; int dashflag; /* draw with dashed lines */ struct bu_list vhead; - struct ged_client_data *dgcdp = (struct ged_client_data *)client_data; + struct _ged_client_data *dgcdp = (struct _ged_client_data *)client_data; RT_CK_TESS_TOL(tsp->ts_ttol); BN_CK_TOL(tsp->ts_tol); @@ -290,7 +290,7 @@ mat_t xform; matp_t matp; struct bu_list vhead; - struct ged_client_data *dgcdp = (struct ged_client_data *)client_data; + struct _ged_client_data *dgcdp = (struct _ged_client_data *)client_data; if (RT_G_DEBUG&DEBUG_TREEWALK) { char *sofar = db_path_to_string(pathp); @@ -390,7 +390,7 @@ struct nmgregion *r; struct bu_list vhead; int failed; - struct ged_client_data *dgcdp = (struct ged_client_data *)client_data; + struct _ged_client_data *dgcdp = (struct _ged_client_data *)client_data; RT_CK_TESS_TOL(tsp->ts_ttol); BN_CK_TOL(tsp->ts_tol); @@ -503,7 +503,7 @@ * C V T _ V L B L O C K _ T O _ S O L I D S */ void -ged_cvt_vlblock_to_solids(struct ged *gedp, struct bn_vlblock *vbp, char *name, int copy) +_ged_cvt_vlblock_to_solids(struct ged *gedp, struct bn_vlblock *vbp, char *name, int copy) { int i; char shortname[32]; @@ -516,7 +516,7 @@ continue; snprintf(namebuf, 64, "%s%lx", shortname, vbp->rgb[i]); - ged_invent_solid(gedp, namebuf, &vbp->head[i], vbp->rgb[i], copy, 0.0, 0); + _ged_invent_solid(gedp, namebuf, &vbp->head[i], vbp->rgb[i], copy, 0.0, 0); } } @@ -538,7 +538,7 @@ * -1 On major error */ int -ged_drawtrees(struct ged *gedp, int argc, const char *argv[], int kind, struct ged_client_data *_dgcdp) +_ged_drawtrees(struct ged *gedp, int argc, const char *argv[], int kind, struct _ged_client_data *_dgcdp) { int ret = 0; register int c; @@ -546,7 +546,7 @@ int dgo_nmg_use_tnurbs = 0; int dgo_enable_fastpath = 0; struct model *dgo_nmg_model; - struct ged_client_data *dgcdp; + struct _ged_client_data *dgcdp; register int i; int ac = 1; char *av[2]; @@ -556,16 +556,16 @@ if (argc <= 0) return(-1); /* FAIL */ - ++ged_drawtrees_depth; + ++_ged_drawtrees_depth; av[1] = (char *)0; /* options are already parsed into _dgcdp */ - if (_dgcdp != (struct ged_client_data *)0) { - BU_GETSTRUCT(dgcdp, ged_client_data); + if (_dgcdp != (struct _ged_client_data *)0) { + BU_GETSTRUCT(dgcdp, _ged_client_data); *dgcdp = *_dgcdp; /* struct copy */ } else { - BU_GETSTRUCT(dgcdp, ged_client_data); + BU_GETSTRUCT(dgcdp, _ged_client_data); dgcdp->gedp = gedp; /* Initial values for options, must be reset each time */ @@ -682,8 +682,8 @@ default: { bu_vls_printf(&gedp->ged_result_str, "unrecognized option - %c\n", c); - bu_free((genptr_t)dgcdp, "ged_drawtrees: dgcdp"); - --ged_drawtrees_depth; + bu_free((genptr_t)dgcdp, "_ged_drawtrees: dgcdp"); + --_ged_drawtrees_depth; return GED_ERROR; } } @@ -698,12 +698,12 @@ } else if (0 <= dgcdp->shaded_mode_override) dgcdp->dmode = dgcdp->shaded_mode_override; else - dgcdp->dmode = GED_WIREFRAME; + dgcdp->dmode = _GED_WIREFRAME; break; case 2: case 3: - dgcdp->dmode = GED_BOOL_EVAL; + dgcdp->dmode = _GED_BOOL_EVAL; break; } @@ -712,8 +712,8 @@ switch (kind) { default: bu_vls_printf(&gedp->ged_result_str, "ERROR, bad kind\n"); - bu_free((genptr_t)dgcdp, "ged_drawtrees: dgcdp"); - --ged_drawtrees_depth; + bu_free((genptr_t)dgcdp, "_ged_drawtrees: dgcdp"); + --_ged_drawtrees_depth; return(-1); case 1: /* Wireframes */ { @@ -726,12 +726,12 @@ * greater than 0, then draw shaded polygons for each object's primitives if possible. * * Note - - * If shaded_mode is GED_SHADED_MODE_BOTS, only BOTS and polysolids + * If shaded_mode is _GED_SHADED_MODE_BOTS, only BOTS and polysolids * will be shaded. The rest is drawn as wireframe. - * If shaded_mode is GED_SHADED_MODE_ALL, everything except pipe solids + * If shaded_mode is _GED_SHADED_MODE_ALL, everything except pipe solids * are drawn as shaded polygons. */ - if (GED_SHADED_MODE_BOTS <= dgcdp->dmode && dgcdp->dmode <= GED_SHADED_MODE_ALL) { + if (_GED_SHADED_MODE_BOTS <= dgcdp->dmode && dgcdp->dmode <= _GED_SHADED_MODE_ALL) { reg_end_func = ged_bot_check_region_end; leaf_func = ged_bot_check_leaf; } else { @@ -740,7 +740,7 @@ } for (i = 0; i < argc; ++i) { - if (ged_drawtrees_depth == 1) + if (_ged_drawtrees_depth == 1) dgcdp->gdlp = ged_addToDisplay(gedp, argv[i]); if (dgcdp->gdlp == GED_DISPLAY_LIST_NULL) @@ -761,8 +761,8 @@ break; case 2: /* Big-E */ bu_vls_printf(&gedp->ged_result_str, "drawtrees: can't do big-E here\n"); - bu_free((genptr_t)dgcdp, "ged_drawtrees: dgcdp"); - --ged_drawtrees_depth; + bu_free((genptr_t)dgcdp, "_ged_drawtrees: dgcdp"); + --_ged_drawtrees_depth; return (-1); case 3: { @@ -775,7 +775,7 @@ } for (i = 0; i < argc; ++i) { - if (ged_drawtrees_depth == 1) + if (_ged_drawtrees_depth == 1) dgcdp->gdlp = ged_addToDisplay(gedp, argv[i]); if (dgcdp->gdlp == GED_DISPLAY_LIST_NULL) @@ -794,7 +794,7 @@ } if (dgcdp->draw_edge_uses) { - ged_cvt_vlblock_to_solids(gedp, dgcdp->draw_edge_uses_vbp, "_EDGEUSES_", 0); + _ged_cvt_vlblock_to_solids(gedp, dgcdp->draw_edge_uses_vbp, "_EDGEUSES_", 0); rt_vlblock_free(dgcdp->draw_edge_uses_vbp); dgcdp->draw_edge_uses_vbp = (struct bn_vlblock *)NULL; } @@ -805,14 +805,14 @@ } } - --ged_drawtrees_depth; + --_ged_drawtrees_depth; if (dgcdp->fastpath_count) { bu_log("%d region%s rendered through polygon fastpath\n", dgcdp->fastpath_count, dgcdp->fastpath_count==1?"":"s"); } - bu_free((genptr_t)dgcdp, "ged_drawtrees: dgcdp"); + bu_free((genptr_t)dgcdp, "_ged_drawtrees: dgcdp"); if (ret < 0) return (-1); @@ -840,7 +840,7 @@ union tree *curtree; int ac = 1; const char *av[2]; - struct ged_client_data *dgcdp = (struct ged_client_data *)client_data; + struct _ged_client_data *dgcdp = (struct _ged_client_data *)client_data; av[0] = db_path_to_string(pathp); av[1] = (char *)0; @@ -855,7 +855,7 @@ */ switch (dgcdp->dmode) { - case GED_SHADED_MODE_BOTS: + case _GED_SHADED_MODE_BOTS: if (ip->idb_major_type == DB5_MAJORTYPE_BRLCAD && ip->idb_minor_type == DB5_MINORTYPE_BRLCAD_BOT) { struct bu_list vhead; @@ -881,9 +881,9 @@ /* turn shaded mode off for this non-bot/non-poly object */ dgcdp->gedp->ged_gdp->gd_shaded_mode = 0; dgcdp->shaded_mode_override = -1; - dgcdp->dmode = GED_WIREFRAME; + dgcdp->dmode = _GED_WIREFRAME; - ged_drawtrees(dgcdp->gedp, ac, av, 1, client_data); + _ged_drawtrees(dgcdp->gedp, ac, av, 1, client_data); /* restore shaded mode states */ dgcdp->gedp->ged_gdp->gd_shaded_mode = save_dgo_shaded_mode; @@ -892,7 +892,7 @@ } break; - case GED_SHADED_MODE_ALL: + case _GED_SHADED_MODE_ALL: if (ip->idb_major_type == DB5_MAJORTYPE_BRLCAD && ip->idb_minor_type != DB5_MINORTYPE_BRLCAD_PIPE) { if (ip->idb_minor_type == DB5_MINORTYPE_BRLCAD_BOT) { @@ -910,7 +910,7 @@ (void)rt_pg_plot_poly(&vhead, ip, tsp->ts_ttol, tsp->ts_tol); ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); } else - ged_drawtrees(dgcdp->gedp, ac, av, 3, client_data); + _ged_drawtrees(dgcdp->gedp, ac, av, 3, client_data); } else { /* save shaded mode states */ int save_dgo_shaded_mode = dgcdp->gedp->ged_gdp->gd_shaded_mode; @@ -920,9 +920,9 @@ /* turn shaded mode off for this pipe object */ dgcdp->gedp->ged_gdp->gd_shaded_mode = 0; dgcdp->shaded_mode_override = -1; - dgcdp->dmode = GED_WIREFRAME; + dgcdp->dmode = _GED_WIREFRAME; - ged_drawtrees(dgcdp->gedp, ac, av, 1, client_data); + _ged_drawtrees(dgcdp->gedp, ac, av, 1, client_data); /* restore shaded mode states */ dgcdp->gedp->ged_gdp->gd_shaded_mode = save_dgo_shaded_mode; @@ -949,7 +949,7 @@ * This parallels much of the code in dodraw.c */ int -ged_invent_solid(struct ged *gedp, +_ged_invent_solid(struct ged *gedp, char *name, struct bu_list *vhead, long int rgb, @@ -968,7 +968,7 @@ if ((dp = db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET)) != DIR_NULL) { if (dp->d_addr != RT_DIR_PHONY_ADDR) { bu_vls_printf(&gedp->ged_result_str, - "ged_invent_solid(%s) would clobber existing database entry, ignored\n", name); + "_ged_invent_solid(%s) would clobber existing database entry, ignored\n", name); return (-1); } @@ -982,7 +982,7 @@ dp = db_diradd(gedp->ged_wdbp->dbip, name, RT_DIR_PHONY_ADDR, 0, DIR_SOLID, (genptr_t)&type); /* Obtain a fresh solid structure, and fill it in */ - GET_SOLID(sp, &FreeSolid.l); + GET_SOLID(sp, &_FreeSolid.l); if (copy) { BU_LIST_INIT( &(sp->s_vlist) ); @@ -1219,7 +1219,7 @@ ged_erasePathFromDisplay(gedp, new_argv[i], 0); } - ged_drawtrees(gedp, new_argc, (const char **)new_argv, kind, (struct ged_client_data *)0); + _ged_drawtrees(gedp, new_argc, (const char **)new_argv, kind, (struct _ged_client_data *)0); bu_vls_free( &vls ); bu_free( (char *)new_argv, "ged_draw_guts new_argv" ); } else { @@ -1236,7 +1236,7 @@ ged_erasePathFromDisplay(gedp, argv[i], 0); } - ged_drawtrees(gedp, argc, argv, kind, (struct ged_client_data *)0); + _ged_drawtrees(gedp, argc, argv, kind, (struct _ged_client_data *)0); } ged_color_soltab(&gedp->ged_gdp->gd_headDisplay); Modified: brlcad/trunk/src/libged/dup.c =================================================================== --- brlcad/trunk/src/libged/dup.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/dup.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -110,7 +110,7 @@ } /* Get array to hold names of duplicates */ - if ((dirp0 = ged_getspace(gedp->ged_wdbp->dbip, 0)) == (struct directory **) 0) { + if ((dirp0 = _ged_getspace(gedp->ged_wdbp->dbip, 0)) == (struct directory **) 0) { bu_vls_printf(&gedp->ged_result_str, "f_dup: unable to get memory\n"); db_close( newdbp ); return GED_ERROR; @@ -123,23 +123,23 @@ if ( newdbp->dbi_version < 5 ) { if (db_scan(newdbp, ged_dir_check, 0, (genptr_t)&dcs) < 0) { bu_vls_printf(&gedp->ged_result_str, "dup: db_scan failure"); - bu_free((genptr_t)dirp0, "ged_getspace array"); + bu_free((genptr_t)dirp0, "_ged_getspace array"); db_close(newdbp); return GED_ERROR; } } else { if ( db5_scan( newdbp, ged_dir_check5, (genptr_t)&dcs) < 0) { bu_vls_printf(&gedp->ged_result_str, "dup: db_scan failure"); - bu_free((genptr_t)dirp0, "ged_getspace array"); + bu_free((genptr_t)dirp0, "_ged_getspace array"); db_close(newdbp); return GED_ERROR; } } rt_mempurge( &(newdbp->dbi_freep) ); /* didn't really build a directory */ - ged_vls_col_pr4v(&gedp->ged_result_str, dirp0, (int)(dcs.dup_dirp - dirp0), 0); + _ged_vls_col_pr4v(&gedp->ged_result_str, dirp0, (int)(dcs.dup_dirp - dirp0), 0); bu_vls_printf(&gedp->ged_result_str, "\n ----- %d duplicate names found -----", gedp->ged_wdbp->wdb_num_dups); - bu_free((genptr_t)dirp0, "ged_getspace array"); + bu_free((genptr_t)dirp0, "_ged_getspace array"); db_close(newdbp); return GED_OK; @@ -186,9 +186,9 @@ bu_vls_strncpy( &local, bu_vls_addr( &dcsp->wdbp->wdb_prestr ), dcsp->wdbp->wdb_ncharadd ); bu_vls_strcat( &local, name ); } else { - bu_vls_strncpy( &local, name, GED_V4_MAXNAME ); + bu_vls_strncpy( &local, name, _GED_V4_MAXNAME ); } - bu_vls_trunc( &local, GED_V4_MAXNAME ); + bu_vls_trunc( &local, _GED_V4_MAXNAME ); } else { if (dcsp->wdbp->wdb_ncharadd > 0) { (void)bu_vls_vlscat( &local, &dcsp->wdbp->wdb_prestr ); @@ -234,9 +234,9 @@ bu_vls_strncpy( &local, bu_vls_addr( &dcsp->wdbp->wdb_prestr ), dcsp->wdbp->wdb_ncharadd ); bu_vls_strcat( &local, name ); } else { - bu_vls_strncpy( &local, name, GED_V4_MAXNAME ); + bu_vls_strncpy( &local, name, _GED_V4_MAXNAME ); } - bu_vls_trunc( &local, GED_V4_MAXNAME ); + bu_vls_trunc( &local, _GED_V4_MAXNAME ); } else { if (dcsp->wdbp->wdb_ncharadd > 0) { bu_vls_vlscat( &local, &dcsp->wdbp->wdb_prestr ); Modified: brlcad/trunk/src/libged/erase.c =================================================================== --- brlcad/trunk/src/libged/erase.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/erase.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -277,12 +277,12 @@ RT_CK_DIR(dp); if (dp->d_addr == RT_DIR_PHONY_ADDR) { if (db_dirdelete(gedp->ged_wdbp->dbip, dp) < 0) { - bu_vls_printf(&gedp->ged_result_str, "ged_zap: db_dirdelete failed\n"); + bu_vls_printf(&gedp->ged_result_str, "_ged_zap: db_dirdelete failed\n"); } } BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &_FreeSolid.l); } BU_LIST_DEQUEUE(&gdlp->l); @@ -300,7 +300,7 @@ if (db_full_path_match_top(&subpath, &sp->s_fullpath)) { BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &_FreeSolid.l); need_split = 1; } @@ -342,7 +342,7 @@ * */ void -ged_eraseAllNamesFromDisplay(struct ged *gedp, +_ged_eraseAllNamesFromDisplay(struct ged *gedp, const char *name, const int skip_first) { @@ -371,7 +371,7 @@ } if (!strcmp(tok, name)) { - ged_freeDisplayListItem(gedp, gdlp); + _ged_freeDisplayListItem(gedp, gdlp); found = 1; break; @@ -385,7 +385,7 @@ struct db_full_path subpath; if (db_string_to_path(&subpath, gedp->ged_wdbp->dbip, name) == 0) { - ged_eraseAllSubpathsFromSolidList(gedp, gdlp, &subpath, skip_first); + _ged_eraseAllSubpathsFromSolidList(gedp, gdlp, &subpath, skip_first); db_free_full_path(&subpath); } } @@ -399,7 +399,7 @@ * Erase/remove display list item from headDisplay if path is a subset of item's path. */ void -ged_eraseAllPathsFromDisplay(struct ged *gedp, +_ged_eraseAllPathsFromDisplay(struct ged *gedp, const char *path, const int skip_first) { @@ -414,9 +414,9 @@ if (db_string_to_path(&fullpath, gedp->ged_wdbp->dbip, bu_vls_addr(&gdlp->gdl_path)) == 0) { if (db_full_path_subset(&fullpath, &subpath, skip_first)) { - ged_freeDisplayListItem(gedp, gdlp); + _ged_freeDisplayListItem(gedp, gdlp); } else { - ged_eraseAllSubpathsFromSolidList(gedp, gdlp, &subpath, skip_first); + _ged_eraseAllSubpathsFromSolidList(gedp, gdlp, &subpath, skip_first); } db_free_full_path(&fullpath); @@ -430,7 +430,7 @@ } void -ged_eraseAllSubpathsFromSolidList(struct ged *gedp, +_ged_eraseAllSubpathsFromSolidList(struct ged *gedp, struct ged_display_list *gdlp, struct db_full_path *subpath, const int skip_first) @@ -443,14 +443,14 @@ nsp = BU_LIST_PNEXT(solid, sp); if (db_full_path_subset(&sp->s_fullpath, subpath, skip_first)) { BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &_FreeSolid.l); } sp = nsp; } } void -ged_freeDisplayListItem (struct ged *gedp, +_ged_freeDisplayListItem (struct ged *gedp, struct ged_display_list *gdlp) { register struct solid *sp; @@ -462,12 +462,12 @@ RT_CK_DIR(dp); if (dp->d_addr == RT_DIR_PHONY_ADDR) { if (db_dirdelete(gedp->ged_wdbp->dbip, dp) < 0) { - bu_vls_printf(&gedp->ged_result_str, "ged_zap: db_dirdelete failed\n"); + bu_vls_printf(&gedp->ged_result_str, "_ged_zap: db_dirdelete failed\n"); } } BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &_FreeSolid.l); } /* Free up the display list */ Modified: brlcad/trunk/src/libged/erase_all.c =================================================================== --- brlcad/trunk/src/libged/erase_all.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/erase_all.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -60,7 +60,7 @@ } for (i = 1; i < argc; ++i) - ged_eraseAllPathsFromDisplay(gedp, argv[i], 0); + _ged_eraseAllPathsFromDisplay(gedp, argv[i], 0); return GED_OK; } Modified: brlcad/trunk/src/libged/ged.c =================================================================== --- brlcad/trunk/src/libged/ged.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/ged.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -104,7 +104,7 @@ #endif BU_LIST_INIT(&gdp->gd_headRunRt.l); - gdp->gd_freeSolids = &FreeSolid; + gdp->gd_freeSolids = &_FreeSolid; gdp->gd_uplotOutputMode = PL_OUTPUT_MODE_BINARY; ged_init_qray(gdp); } @@ -236,7 +236,7 @@ if (strcmp(dbtype, "db") == 0) { struct db_i *dbip; - if ((dbip = ged_open_dbip(filename, existing_only)) == DBI_NULL) { + if ((dbip = _ged_open_dbip(filename, existing_only)) == DBI_NULL) { /* Restore RT's material head */ rt_new_material_head(save_materp); @@ -315,7 +315,7 @@ * Open/Create the database and build the in memory directory. */ struct db_i * -ged_open_dbip(const char *filename, int existing_only) +_ged_open_dbip(const char *filename, int existing_only) { struct db_i *dbip; @@ -327,7 +327,7 @@ * Check to see if we can access the database */ if (bu_file_exists(filename) && !bu_file_readable(filename)) { - bu_log("ged_open_dbip: %s is not readable", filename); + bu_log("_ged_open_dbip: %s is not readable", filename); return DBI_NULL; } @@ -337,7 +337,7 @@ /* db_create does a db_dirbuild */ if ((dbip = db_create(filename, 5)) == DBI_NULL) { - bu_log("ged_open_dbip: failed to create %s\n", filename); + bu_log("_ged_open_dbip: failed to create %s\n", filename); return DBI_NULL; } @@ -350,7 +350,7 @@ } void -ged_print_node(struct ged *gedp, +_ged_print_node(struct ged *gedp, register struct directory *dp, int pathpos, int indentSize, @@ -457,7 +457,7 @@ bu_vls_printf(&gedp->ged_result_str, "%s\n", rt_tree_array[i].tl_tree->tr_l.tl_name); } else { if (currdisplayDepth < displayDepth) { - ged_print_node(gedp, nextdp, pathpos+1, indentSize, op, cflag, displayDepth, currdisplayDepth+1); + _ged_print_node(gedp, nextdp, pathpos+1, indentSize, op, cflag, displayDepth, currdisplayDepth+1); } } db_free_tree(rt_tree_array[i].tl_tree, &rt_uniresource); Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/ged_private.h 2009-10-15 02:10:26 UTC (rev 36188) @@ -37,33 +37,33 @@ __BEGIN_DECLS -#define GED_V4_MAXNAME NAMESIZE -#define GED_TERMINAL_WIDTH 80 -#define GED_COLUMNS ((GED_TERMINAL_WIDTH + GED_V4_MAXNAME - 1) / GED_V4_MAXNAME) +#define _GED_V4_MAXNAME NAMESIZE +#define _GED_TERMINAL_WIDTH 80 +#define _GED_COLUMNS ((_GED_TERMINAL_WIDTH + _GED_V4_MAXNAME - 1) / _GED_V4_MAXNAME) -#define GED_MAX_LEVELS 12 -#define GED_CPEVAL 0 -#define GED_LISTPATH 1 -#define GED_LISTEVAL 2 -#define GED_EVAL_ONLY 3 +#define _GED_MAX_LEVELS 12 +#define _GED_CPEVAL 0 +#define _GED_LISTPATH 1 +#define _GED_LISTEVAL 2 +#define _GED_EVAL_ONLY 3 + +#define _GED_WIREFRAME 0 +#define _GED_SHADED_MODE_BOTS 1 +#define _GED_SHADED_MODE_ALL 2 +#define _GED_BOOL_EVAL 3 -#define GED_WIREFRAME 0 -#define GED_SHADED_MODE_BOTS 1 -#define GED_SHADED_MODE_ALL 2 -#define GED_BOOL_EVAL 3 - -struct ged_id_names { +struct _ged_id_names { struct bu_list l; struct bu_vls name; /**< name associated with region id */ }; -struct ged_id_to_names { +struct _ged_id_to_names { struct bu_list l; int id; /**< starting id (i.e. region id or air code) */ - struct ged_id_names headName; /**< head of list of names */ + struct _ged_id_names headName; /**< head of list of names */ }; -struct ged_client_data { +struct _ged_client_data { struct ged *gedp; struct ged_display_list *gdlp; int wireframe_color_override; @@ -93,15 +93,15 @@ int num_halfs; }; -struct ged_rt_client_data { +struct _ged_rt_client_data { struct ged_run_rt *rrtp; struct ged *gedp; }; -struct ged_trace_data { +struct _ged_trace_data { struct ged *gtd_gedp; - struct directory *gtd_path[GED_MAX_LEVELS]; - struct directory *gtd_obj[GED_MAX_LEVELS]; + struct directory *gtd_path[_GED_MAX_LEVELS]; + struct directory *gtd_obj[_GED_MAX_LEVELS]; mat_t gtd_xform; int gtd_objpos; int gtd_prflag; @@ -109,10 +109,10 @@ }; /* defined in globals.c */ -extern struct solid FreeSolid; +extern struct solid _FreeSolid; /* defined in ged.c */ -BU_EXTERN (void ged_print_node, +BU_EXTERN (void _ged_print_node, (struct ged *gedp, register struct directory *dp, int pathpos, @@ -121,33 +121,33 @@ int cflag, int displayDepth, int currdisplayDepth)); -BU_EXTERN (struct db_i *ged_open_dbip, +BU_EXTERN (struct db_i *_ged_open_dbip, (const char *filename, int existing_only)); /* defined in clip.c */ -BU_EXTERN (int ged_clip, +BU_EXTERN (int _ged_clip, (fastf_t *xp1, fastf_t *yp1, fastf_t *xp2, fastf_t *yp2)); -BU_EXTERN (int ged_vclip, +BU_EXTERN (int _ged_vclip, (vect_t a, vect_t b, register fastf_t *min, register fastf_t *max)); /* defined in color.c */ -BU_EXTERN (void ged_color_putrec, +BU_EXTERN (void _ged_color_putrec, (struct ged *gedp, register struct mater *mp)); -BU_EXTERN (void ged_color_zaprec, +BU_EXTERN (void _ged_color_zaprec, (struct ged *gedp, register struct mater *mp)); /* defined in comb.c */ -BU_EXTERN (struct directory *ged_combadd, +BU_EXTERN (struct directory *_ged_combadd, (struct ged *gedp, register struct directory *objp, char *combname, @@ -157,12 +157,12 @@ int air)); /* defined in draw.c */ -BU_EXTERN (void ged_cvt_vlblock_to_solids, +BU_EXTERN (void _ged_cvt_vlblock_to_solids, (struct ged *gedp, struct bn_vlblock *vbp, char *name, int copy)); -BU_EXTERN (int ged_invent_solid, +BU_EXTERN (int _ged_invent_solid, (struct ged *gedp, char *name, struct bu_list *vhead, @@ -170,55 +170,55 @@ int copy, fastf_t transparency, int dmode)); -BU_EXTERN (int ged_drawtrees, +BU_EXTERN (int _ged_drawtrees, (struct ged *gedp, int argc, const char *argv[], int kind, - struct ged_client_data *_dgcdp)); + struct _ged_client_data *_dgcdp)); /* defined in erase.c */ -BU_EXTERN (void ged_eraseobjpath, +BU_EXTERN (void _ged_eraseobjpath, (struct ged *gedp, int argc, const char *argv[], const int noisy, const int all, const int skip_first)); -BU_EXTERN (void ged_eraseobjall, +BU_EXTERN (void _ged_eraseobjall, (struct ged *gedp, register struct directory **dpp, int skip_first)); -BU_EXTERN (void ged_eraseobj, +BU_EXTERN (void _ged_eraseobj, (struct ged *gedp, register struct directory **dpp, int skip_first)); -BU_EXTERN (void ged_eraseAllNamesFromDisplay, +BU_EXTERN (void _ged_eraseAllNamesFromDisplay, (struct ged *gedp, const char *name, int skip_first)); -BU_EXTERN (void ged_eraseAllPathsFromDisplay, +BU_EXTERN (void _ged_eraseAllPathsFromDisplay, (struct ged *gedp, const char *path, int skip_first)); -BU_EXTERN (void ged_eraseAllSubpathsFromSolidList, +BU_EXTERN (void _ged_eraseAllSubpathsFromSolidList, (struct ged *gedp, struct ged_display_list *gdlp, struct db_full_path *subpath, const int skip_first)); -BU_EXTERN (void ged_freeDisplayListItem, +BU_EXTERN (void _ged_freeDisplayListItem, (struct ged *gedp, struct ged_display_list *gdlp)); /* defined in get_comb.c */ -BU_EXTERN(void ged_vls_print_matrix, +BU_EXTERN(void _ged_vls_print_matrix, (struct bu_vls *vls, matp_t matrix)); /* defined in get_obj_bounds.c */ -BU_EXTERN (int ged_get_obj_bounds, +BU_EXTERN (int _ged_get_obj_bounds, (struct ged *gedp, int argc, const char *argv[], @@ -226,59 +226,59 @@ point_t rpp_min, point_t rpp_max)); -BU_EXTERN (int ged_get_obj_bounds2, +BU_EXTERN (int _ged_get_obj_bounds2, (struct ged *gedp, int argc, const char *argv[], - struct ged_trace_data *gtdp, + struct _ged_trace_data *gtdp, point_t rpp_min, point_t rpp_max)); /* defined in how.c */ -BU_EXTERN (struct directory **ged_build_dpp, +BU_EXTERN (struct directory **_ged_build_dpp, (struct ged *gedp, const char *path)); /* defined in list.c */ -BU_EXTERN(void ged_do_list, +BU_EXTERN(void _ged_do_list, (struct ged *gedp, register struct directory *dp, int verbose)); /* defined in loadview.c */ -extern vect_t ged_eye_model; -extern mat_t ged_viewrot; -extern struct ged *ged_current_gedp; -BU_EXTERN (int ged_cm_vsize, +extern vect_t _ged_eye_model; +extern mat_t _ged_viewrot; +extern struct ged *_ged_current_gedp; +BU_EXTERN (int _ged_cm_vsize, (int argc, char **argv)); -BU_EXTERN (int ged_cm_eyept, +BU_EXTERN (int _ged_cm_eyept, (int argc, char **argv)); -BU_EXTERN (int ged_cm_lookat_pt, +BU_EXTERN (int _ged_cm_lookat_pt, (int argc, char **argv)); -BU_EXTERN (int ged_cm_vrot, +BU_EXTERN (int _ged_cm_vrot, (int argc, char **argv)); -BU_EXTERN (int ged_cm_orientation, +BU_EXTERN (int _ged_cm_orientation, (int argc, char **argv)); -BU_EXTERN (int ged_cm_set, +BU_EXTERN (int _ged_cm_set, (int argc, char **argv)); -BU_EXTERN (int ged_cm_null, +BU_EXTERN (int _ged_cm_null, (int argc, char **argv)); /* defined in ls.c */ -BU_EXTERN(void ged_vls_col_pr4v, +BU_EXTERN(void _ged_vls_col_pr4v, (struct bu_vls *vls, struct directory **list_of_names, int num_in_list, int no_decorate)); -BU_EXTERN(void ged_vls_long_dpp, +BU_EXTERN(void _ged_vls_long_dpp, (struct bu_vls *vls, struct directory **list_of_names, int num_in_list, @@ -286,7 +286,7 @@ int cflag, /* print combinations */ int rflag, /* print regions */ int sflag)); /* print solids */ -BU_EXTERN(void ged_vls_line_dpp, +BU_EXTERN(void _ged_vls_line_dpp, (struct bu_vls *vls, struct directory **list_of_names, int num_in_list, @@ -294,7 +294,7 @@ int cflag, /* print combinations */ int rflag, /* print regions */ int sflag)); /* print solids */ -BU_EXTERN(struct directory ** ged_getspace, +BU_EXTERN(struct directory ** _ged_getspace, (struct db_i *dbip, register int num_entries)); @@ -308,7 +308,7 @@ extern char ged_tmpfil[MAXPATHLEN]; extern char ged_tmpcomb[17]; extern char *ged_tmpcomb_init; -extern char delims[]; +extern char _delims[]; BU_EXTERN(int ged_make_tree, (struct ged *gedp, struct rt_comb_internal *comb, @@ -484,7 +484,7 @@ (register struct directory *dp, int pathpos, const mat_t old_xlate, - struct ged_trace_data *gtdp)); + struct _ged_trace_data *gtdp)); /* defined in translate_extrude.c */ BU_EXTERN (int ged_translate_extrude, Modified: brlcad/trunk/src/libged/get_comb.c =================================================================== --- brlcad/trunk/src/libged/get_comb.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/get_comb.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -147,7 +147,7 @@ } bu_vls_printf(&gedp->ged_result_str, " %c %s\t", op, rt_tree_array[i].tl_tree->tr_l.tl_name); - ged_vls_print_matrix(&gedp->ged_result_str, rt_tree_array[i].tl_tree->tr_l.tl_mat); + _ged_vls_print_matrix(&gedp->ged_result_str, rt_tree_array[i].tl_tree->tr_l.tl_mat); bu_vls_printf(&gedp->ged_result_str, "\n"); db_free_tree(rt_tree_array[i].tl_tree, &rt_uniresource); } @@ -166,7 +166,7 @@ } void -ged_vls_print_matrix(struct bu_vls *vls, matp_t matrix) +_ged_vls_print_matrix(struct bu_vls *vls, matp_t matrix) { int k; char buf[64]; Modified: brlcad/trunk/src/libged/get_obj_bounds.c =================================================================== --- brlcad/trunk/src/libged/get_obj_bounds.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/get_obj_bounds.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -35,7 +35,7 @@ int -ged_get_obj_bounds(struct ged *gedp, +_ged_get_obj_bounds(struct ged *gedp, int argc, const char *argv[], int use_air, @@ -169,7 +169,7 @@ ged_get_objpath_mat(struct ged *gedp, int argc, const char *argv[], - struct ged_trace_data *gtdp) + struct _ged_trace_data *gtdp) { int i, pos_in; @@ -180,7 +180,7 @@ /* initialize gtd */ gtdp->gtd_gedp = gedp; - gtdp->gtd_flag = GED_EVAL_ONLY; + gtdp->gtd_flag = _GED_EVAL_ONLY; gtdp->gtd_prflag = 0; pos_in = 0; @@ -228,10 +228,10 @@ * This version works if the last member of the path is a primitive. */ int -ged_get_obj_bounds2(struct ged *gedp, +_ged_get_obj_bounds2(struct ged *gedp, int argc, const char *argv[], - struct ged_trace_data *gtdp, + struct _ged_trace_data *gtdp, point_t rpp_min, point_t rpp_max) { Modified: brlcad/trunk/src/libged/globals.c =================================================================== --- brlcad/trunk/src/libged/globals.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/globals.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -48,7 +48,7 @@ /** * head of free solid list */ -struct solid FreeSolid; +struct solid _FreeSolid; /* * Local Variables: Modified: brlcad/trunk/src/libged/gqa.c =================================================================== --- brlcad/trunk/src/libged/gqa.c 2009-10-13 19:14:13 UTC (rev 36187) +++ brlcad/trunk/src/libged/gqa.c 2009-10-15 02:10:26 UTC (rev 36188) @@ -447,14 +447,14 @@ cvt++; } } - bu_vls_printf(&ged_current_gedp->ged_result_str, "Bad units specifier \"%s\" on value \"%s\"\n", units_string, buf); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "Bad units specifier \"%s\" on value \"%s\"\n", units_string, buf); return 1; found_units: *val = a * cvt->val; return 0; } - bu_vls_printf(&ged_current_gedp->ged_result_str, "%s sscanf problem on \"%s\" got %d\n", BU_FLSTR, buf, i); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "%s sscanf problem on \"%s\" got %d\n", BU_FLSTR, buf, i); return 1; } @@ -563,23 +563,23 @@ analysis_flags |= ANALYSIS_WEIGHT; break; default: - bu_vls_printf(&ged_current_gedp->ged_result_str, "Unknown analysis type \"%c\" requested.\n", *p); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "Unknown analysis type \"%c\" requested.\n", *p); return -1; } } break; } case 'a' : - bu_vls_printf(&ged_current_gedp->ged_result_str, "azimuth not implemented\n"); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "azimuth not implemented\n"); if (sscanf(bu_optarg, "%lg", &azimuth_deg) != 1) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error parsing azimuth \"%s\"\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error parsing azimuth \"%s\"\n", bu_optarg); return -1; } break; case 'e' : - bu_vls_printf(&ged_current_gedp->ged_result_str, "elevation not implemented\n"); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "elevation not implemented\n"); if (sscanf(bu_optarg, "%lg", &elevation_deg) != 1) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error parsing elevation \"%s\"\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error parsing elevation \"%s\"\n", bu_optarg); return -1; } break; @@ -603,7 +603,7 @@ if (read_units_double(&value1, bu_optarg, units_tab[0])) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error parsing grid spacing value \"%s\"\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error parsing grid spacing value \"%s\"\n", bu_optarg); return -1; } @@ -612,7 +612,7 @@ * and lower limit. */ if (read_units_double(&value2, p, units_tab[0])) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error parsing grid spacing limit value \"%s\"\n", p); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error parsing grid spacing limit value \"%s\"\n", p); return -1; } @@ -624,18 +624,18 @@ gridSpacing = 0.0; /* flag it */ } - bu_vls_printf(&ged_current_gedp->ged_result_str, "set grid spacing:%g %s limit:%g %s\n", + bu_vls_printf(&_ged_current_gedp->ged_result_str, "set grid spacing:%g %s limit:%g %s\n", gridSpacing / units[LINE]->val, units[LINE]->name, gridSpacingLimit / units[LINE]->val, units[LINE]->name); break; } case 'G' : makeOverlapAssemblies = 1; - bu_vls_printf(&ged_current_gedp->ged_result_str, "-G option unimplemented\n"); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "-G option unimplemented\n"); return -1; case 'n' : if (sscanf(bu_optarg, "%d", &c) != 1 || c < 0) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "num_hits must be integer value >= 0, not \"%s\"\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "num_hits must be integer value >= 0, not \"%s\"\n", bu_optarg); return -1; } @@ -657,14 +657,14 @@ break; case 'S' : if (sscanf(bu_optarg, "%lg", &a) != 1 || a <= 1.0) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error in specifying minimum samples per model axis: \"%s\"\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error in specifying minimum samples per model axis: \"%s\"\n", bu_optarg); break; } Samples_per_model_axis = a + 1; break; case 't' : if (read_units_double(&overlap_tolerance, bu_optarg, units_tab[0])) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error in overlap tolerance distance \"%s\"\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error in overlap tolerance distance \"%s\"\n", bu_optarg); return -1; } break; @@ -673,13 +673,13 @@ break; case 'V' : if (read_units_double(&volume_tolerance, bu_optarg, units_tab[1])) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error in volume tolerance \"%s\"\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error in volume tolerance \"%s\"\n", bu_optarg); return -1; } break; case 'W' : if (read_units_double(&weight_tolerance, bu_optarg, units_tab[2])) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error in weight tolerance \"%s\"\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error in weight tolerance \"%s\"\n", bu_optarg); return -1; } break; @@ -687,7 +687,7 @@ case 'U' : use_air = strtol(bu_optarg, (char **)NULL, 10); if (errno == ERANGE || errno == EINVAL) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "error in air argument %s\n", bu_optarg); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "error in air argument %s\n", bu_optarg); return -1; } break; @@ -708,18 +708,18 @@ goto found_cv; } } - bu_vls_printf(&ged_current_gedp->ged_result_str, "Units \"%s\" not found in coversion table\n", units_name[i]); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "Units \"%s\" not found in coversion table\n", units_name[i]); return -1; found_cv: units[i] = cv; } } - bu_vls_printf(&ged_current_gedp->ged_result_str, "Units: "); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "Units: "); for (i=0; i < 3; i++) { - bu_vls_printf(&ged_current_gedp->ged_result_str, " %s: %s", dim[i], units[i]->name); + bu_vls_printf(&_ged_current_gedp->ged_result_str, " %s: %s", dim[i], units[i]->name); } - bu_vls_printf(&ged_current_gedp->ged_result_str, "\n"); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "\n"); } break; @@ -778,23 +778,23 @@ idx = strtol(p, &q, 10); if (q == (char *)NULL) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "could not convert idx\n"); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "could not convert idx\n"); return GED_ERROR; } if (idx < 0) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "bad density index (%ld < 0)\n", idx); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "bad density index (%ld < 0)\n", idx); return GED_ERROR; } density = strtod(q, &p); if (q == p) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "could not convert density\n"); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "could not convert density\n"); return GED_ERROR; } if (density < 0.0) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "bad density (%lf < 0)\n", density); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "bad density (%lf < 0)\n", density); return GED_ERROR; } @@ -830,7 +830,7 @@ #ifdef PRINT_DENSITIES for (idx=0; idx < num_densities; idx++) if (densities[idx].magic == DENSITY_MAGIC) - bu_vls_printf(&ged_current_gedp->ged_result_str, "%4d %6g %s\n", + bu_vls_printf(&_ged_current_gedp->ged_result_str, "%4d %6g %s\n", idx, densities[idx].density, densities[idx].name); @@ -854,7 +854,7 @@ if ((fp=fopen(name, "rb")) == (FILE *)NULL) { #if 1 - bu_vls_printf(&ged_current_gedp->ged_result_str, "Could not open file - %s\n", name); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "Could not open file - %s\n", name); #else perror(name); #endif @@ -863,7 +863,7 @@ if (fstat(fileno(fp), &sb)) { #if 1 - bu_vls_printf(&ged_current_gedp->ged_result_str, "Could not fstat file - %s\n", name); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "Could not fstat file - %s\n", name); #else perror(name); #endif @@ -896,13 +896,13 @@ dp = db_lookup(rtip->rti_dbip, "_DENSITIES", LOOKUP_QUIET); if (dp == (struct directory *)NULL) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "No \"_DENSITIES\" density table object in database."); - bu_vls_printf(&ged_current_gedp->ged_result_str, " If you do not have density data you can still get adjacent air, bounding box, exposed air, gaps, volume or overlaps by using the -Aa, -Ab, -Ae, -Ag, -Av, or -Ao options respectively.\n"); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "No \"_DENSITIES\" density table object in database."); + bu_vls_printf(&_ged_current_gedp->ged_result_str, " If you do not have density data you can still get adjacent air, bounding box, exposed air, gaps, volume or overlaps by using the -Aa, -Ab, -Ae, -Ag, -Av, or -Ao options respectively.\n"); return GED_ERROR; } if (rt_db_get_internal(&intern, dp, rtip->rti_dbip, NULL, &rt_uniresource) < 0) { - bu_vls_printf(&ged_current_gedp->ged_result_str, "could not import %s\n", dp->d_namep); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "could not import %s\n", dp->d_namep); return GED_ERROR; } @@ -1052,7 +1052,7 @@ } } else { bu_semaphore_acquire(GED_SEM_WORKER); - bu_vls_printf(&ged_current_gedp->ged_result_str, "overlap %s %s\n", reg1->reg_name, reg2->reg_name); + bu_vls_printf(&_ged_current_gedp->ged_result_str, "overlap %s %s\n", reg1->reg_name, reg2->reg_name); bu_semaphore_release(GED_SEM_WORKER); } @@ -1136,7 +1136,7 @@ VJOIN1(opt, ap->a_ray.r_pt, pp->pt_outhit->hit_dist, ap->a_ray.r_dir); bu_semaphore_acquire(GED_SEM_WORKER); - DLOG(&ged_current_gedp->ged_result_str, "%s %g->%g\n", + DLOG(&_ged_current_gedp->ged_result_str, "%s %g->%g\n", pp->pt_regionp->reg_name, pp->pt_inhit->hit_dist, pp->pt_outhit->hit_dist); @@ -1195,13 +1195,13 @@ /* computing the weight of the objects */ if (analysis_flags & ANALYSIS_WEIGHT) { bu_semaphore_acquire(GED_SEM_WORKER); - DLOG(&ged_current_gedp->ged_result_str, "Hit %s doing weight\n", pp->pt_regionp->reg_name); + DLOG(&_ged_current_gedp->ged_result_str, "Hit %s doing weight\n", pp->pt_regionp->reg_name); bu_semaphore_release(GED_SEM_WORKER); /* make sure mater index is within range of densities */ if (pp->pt_regionp->reg_gmater >= num_densities) { bu_semaphore_acquire(GED_SEM_WORKER); - bu_vls_printf(&ged_current_gedp->ged_result_str, "density index %d on region %s is outside of range of table [1..%d]\nSet GIFTmater on region or add entry to density table\n", + bu_vls_printf(&_ged_current_gedp->ged_result_str, "density index %d on region %s is outside of range of table [1..%d]\nSet GIFTmater on region or add entry to density table\n", pp->pt_regionp->reg_gmater, pp->pt_regionp->reg_name, num_densities); /* XXX this should do something else */ @@ -1257,7 +1257,7 @@ if (los < 1) { bu_semaphore_acquire(GED_SEM_WORKER); - bu_vls_printf(&ged_current_gedp->ged_result_str, "bad LOS (%d) on %s\n", los, pp->pt_regionp->reg_name);... [truncated message content] |
From: <bo...@us...> - 2009-10-15 17:55:38
|
Revision: 36194 http://brlcad.svn.sourceforge.net/brlcad/?rev=36194&view=rev Author: bob1961 Date: 2009-10-15 17:55:30 +0000 (Thu, 15 Oct 2009) Log Message: ----------- Revert function names for _ged_zap and _ged_clip. Modified Paths: -------------- brlcad/trunk/src/libged/blast.c brlcad/trunk/src/libged/clip.c brlcad/trunk/src/libged/erase.c brlcad/trunk/src/libged/loadview.c brlcad/trunk/src/libged/open.c brlcad/trunk/src/libged/preview.c brlcad/trunk/src/libged/zap.c Modified: brlcad/trunk/src/libged/blast.c =================================================================== --- brlcad/trunk/src/libged/blast.c 2009-10-15 17:23:03 UTC (rev 36193) +++ brlcad/trunk/src/libged/blast.c 2009-10-15 17:55:30 UTC (rev 36194) @@ -58,7 +58,7 @@ av[0] = "zap"; av[1] = (char *)0; - _ged_zap(gedp, 1, av); + ged_zap(gedp, 1, av); } /* Draw the new object(s) */ Modified: brlcad/trunk/src/libged/clip.c =================================================================== --- brlcad/trunk/src/libged/clip.c 2009-10-15 17:23:03 UTC (rev 36193) +++ brlcad/trunk/src/libged/clip.c 2009-10-15 17:55:30 UTC (rev 36194) @@ -45,7 +45,7 @@ static int ged_code(fastf_t x, fastf_t y); int -_ged_clip(fastf_t *xp1, fastf_t *yp1, fastf_t *xp2, fastf_t *yp2) +ged_clip(fastf_t *xp1, fastf_t *yp1, fastf_t *xp2, fastf_t *yp2) { char code1, code2; Modified: brlcad/trunk/src/libged/erase.c =================================================================== --- brlcad/trunk/src/libged/erase.c 2009-10-15 17:23:03 UTC (rev 36193) +++ brlcad/trunk/src/libged/erase.c 2009-10-15 17:55:30 UTC (rev 36194) @@ -277,7 +277,7 @@ RT_CK_DIR(dp); if (dp->d_addr == RT_DIR_PHONY_ADDR) { if (db_dirdelete(gedp->ged_wdbp->dbip, dp) < 0) { - bu_vls_printf(&gedp->ged_result_str, "_ged_zap: db_dirdelete failed\n"); + bu_vls_printf(&gedp->ged_result_str, "ged_erasePathFromDisplay: db_dirdelete failed\n"); } } @@ -462,7 +462,7 @@ RT_CK_DIR(dp); if (dp->d_addr == RT_DIR_PHONY_ADDR) { if (db_dirdelete(gedp->ged_wdbp->dbip, dp) < 0) { - bu_vls_printf(&gedp->ged_result_str, "_ged_zap: db_dirdelete failed\n"); + bu_vls_printf(&gedp->ged_result_str, "_ged_freeDisplayListItem: db_dirdelete failed\n"); } } Modified: brlcad/trunk/src/libged/loadview.c =================================================================== --- brlcad/trunk/src/libged/loadview.c 2009-10-15 17:23:03 UTC (rev 36193) +++ brlcad/trunk/src/libged/loadview.c 2009-10-15 17:55:30 UTC (rev 36194) @@ -184,7 +184,7 @@ /* get rid of anything that may be displayed, since we * will load objects that are listed in the script next. */ - (void)_ged_zap(gedp, 1, NULL); + (void)ged_zap(gedp, 1, NULL); /* now get the objects listed */ fscanf(fp, "%10000s", objects); Modified: brlcad/trunk/src/libged/open.c =================================================================== --- brlcad/trunk/src/libged/open.c 2009-10-15 17:23:03 UTC (rev 36193) +++ brlcad/trunk/src/libged/open.c 2009-10-15 17:55:30 UTC (rev 36194) @@ -62,7 +62,7 @@ av[0] = "zap"; av[1] = (char *)0; - _ged_zap(gedp, 1, (const char **)av); + ged_zap(gedp, 1, (const char **)av); /* close current database */ db_close(gedp->ged_wdbp->dbip); Modified: brlcad/trunk/src/libged/preview.c =================================================================== --- brlcad/trunk/src/libged/preview.c 2009-10-15 17:23:03 UTC (rev 36193) +++ brlcad/trunk/src/libged/preview.c 2009-10-15 17:55:30 UTC (rev 36194) @@ -132,7 +132,7 @@ av[0] = "zap"; av[1] = NULL; - (void)_ged_zap(_ged_current_gedp, 1, av ); + (void)ged_zap(_ged_current_gedp, 1, av ); _ged_drawtrees(_ged_current_gedp, _ged_current_gedp->ged_gdp->gd_rt_cmd_len, (const char **)_ged_current_gedp->ged_gdp->gd_rt_cmd, preview_mode, (struct _ged_client_data *)0); ged_color_soltab(&_ged_current_gedp->ged_gdp->gd_headDisplay); } Modified: brlcad/trunk/src/libged/zap.c =================================================================== --- brlcad/trunk/src/libged/zap.c 2009-10-15 17:23:03 UTC (rev 36193) +++ brlcad/trunk/src/libged/zap.c 2009-10-15 17:55:30 UTC (rev 36194) @@ -42,7 +42,7 @@ * */ int -_ged_zap(struct ged *gedp, int argc, const char *argv[]) +ged_zap(struct ged *gedp, int argc, const char *argv[]) { register struct solid *sp; register struct solid *nsp; @@ -67,7 +67,7 @@ RT_CK_DIR(dp); if (dp->d_addr == RT_DIR_PHONY_ADDR) { if (db_dirdelete(gedp->ged_wdbp->dbip, dp) < 0) { - bu_vls_printf(&gedp->ged_result_str, "_ged_zap: db_dirdelete failed\n"); + bu_vls_printf(&gedp->ged_result_str, "ged_zap: db_dirdelete failed\n"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-15 19:12:08
|
Revision: 36196 http://brlcad.svn.sourceforge.net/brlcad/?rev=36196&view=rev Author: starseeker Date: 2009-10-15 19:11:51 +0000 (Thu, 15 Oct 2009) Log Message: ----------- Rename a few more things in ged_private, remove clip and vclip as they're public - still a ways to go. Modified Paths: -------------- brlcad/trunk/src/libged/clip.c brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/plot.c brlcad/trunk/src/libged/png.c brlcad/trunk/src/libged/preview.c brlcad/trunk/src/libged/ps.c brlcad/trunk/src/libged/put_comb.c brlcad/trunk/src/libged/red.c brlcad/trunk/src/libged/rrt.c Modified: brlcad/trunk/src/libged/clip.c =================================================================== --- brlcad/trunk/src/libged/clip.c 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/clip.c 2009-10-15 19:11:51 UTC (rev 36196) @@ -142,7 +142,7 @@ * if !0 was returned, "a" and "b" have been clipped to the RPP. */ int -_ged_vclip(vect_t a, vect_t b, register fastf_t *min, register fastf_t *max) +ged_vclip(vect_t a, vect_t b, register fastf_t *min, register fastf_t *max) { static vect_t diff; static double sv; Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/ged_private.h 2009-10-15 19:11:51 UTC (rev 36196) @@ -125,18 +125,6 @@ (const char *filename, int existing_only)); -/* defined in clip.c */ -BU_EXTERN (int _ged_clip, - (fastf_t *xp1, - fastf_t *yp1, - fastf_t *xp2, - fastf_t *yp2)); -BU_EXTERN (int _ged_vclip, - (vect_t a, - vect_t b, - register fastf_t *min, - register fastf_t *max)); - /* defined in color.c */ BU_EXTERN (void _ged_color_putrec, (struct ged *gedp, @@ -299,17 +287,17 @@ register int num_entries)); /* defined in preview.c */ -BU_EXTERN (void ged_setup_rt, +BU_EXTERN (void _ged_setup_rt, (struct ged *gedp, register char **vp, int printcmd)); /* defined in red.c */ -extern char ged_tmpfil[MAXPATHLEN]; -extern char ged_tmpcomb[17]; -extern char *ged_tmpcomb_init; +extern char _ged_tmpfil[MAXPATHLEN]; +extern char _ged_tmpcomb[17]; +extern char *_ged_tmpcomb_init; extern char _delims[]; -BU_EXTERN(int ged_make_tree, +BU_EXTERN(int _ged_make_tree, (struct ged *gedp, struct rt_comb_internal *comb, struct directory *dp, @@ -318,13 +306,13 @@ const char *new_name, struct rt_tree_array *rt_tree_array, int tree_index)); -BU_EXTERN(int ged_save_comb, +BU_EXTERN(int _ged_save_comb, (struct ged *gedp, struct directory *dpold)); -BU_EXTERN(void ged_restore_comb, +BU_EXTERN(void _ged_restore_comb, (struct ged *gedp, struct directory *dp)); -BU_EXTERN(void ged_print_matrix, +BU_EXTERN(void _ged_print_matrix, (FILE *fp, matp_t matrix)); /* defined in rt.c */ Modified: brlcad/trunk/src/libged/plot.c =================================================================== --- brlcad/trunk/src/libged/plot.c 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/plot.c 2009-10-15 19:11:51 UTC (rev 36196) @@ -240,7 +240,7 @@ VMOVE(last, fin); break; } - if (_ged_vclip(start, fin, clipmin, clipmax) == 0) + if (ged_vclip(start, fin, clipmin, clipmax) == 0) continue; if (Three_D) { Modified: brlcad/trunk/src/libged/png.c =================================================================== --- brlcad/trunk/src/libged/png.c 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/png.c 2009-10-15 19:11:51 UTC (rev 36196) @@ -264,7 +264,7 @@ break; } - if (_ged_vclip(start, fin, clipmin, clipmax) == 0) + if (ged_vclip(start, fin, clipmin, clipmax) == 0) continue; coord1.x = start[0] * half_size + half_size; Modified: brlcad/trunk/src/libged/preview.c =================================================================== --- brlcad/trunk/src/libged/preview.c 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/preview.c 2009-10-15 19:11:51 UTC (rev 36196) @@ -191,7 +191,7 @@ } void -ged_setup_rt(struct ged *gedp, register char **vp, int printcmd) +_ged_setup_rt(struct ged *gedp, register char **vp, int printcmd) { _ged_current_gedp->ged_gdp->gd_rt_cmd_len = vp - _ged_current_gedp->ged_gdp->gd_rt_cmd; _ged_current_gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, @@ -322,7 +322,7 @@ } /* Build list of top-level objects in view, in _ged_current_gedp->ged_gdp->gd_rt_cmd[] */ - ged_setup_rt(gedp, _ged_current_gedp->ged_gdp->gd_rt_cmd, 1); + _ged_setup_rt(gedp, _ged_current_gedp->ged_gdp->gd_rt_cmd, 1); preview_vbp = rt_vlblock_init(); Modified: brlcad/trunk/src/libged/ps.c =================================================================== --- brlcad/trunk/src/libged/ps.c 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/ps.c 2009-10-15 19:11:51 UTC (rev 36196) @@ -216,7 +216,7 @@ break; } - if (_ged_vclip(start, fin, clipmin, clipmax) == 0) + if (ged_vclip(start, fin, clipmin, clipmax) == 0) continue; fprintf(fp, Modified: brlcad/trunk/src/libged/put_comb.c =================================================================== --- brlcad/trunk/src/libged/put_comb.c 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/put_comb.c 2009-10-15 19:11:51 UTC (rev 36196) @@ -74,7 +74,7 @@ return GED_ERROR; } - bu_strlcpy(ged_tmpcomb, ged_tmpcomb_init, sizeof(ged_tmpcomb)); + bu_strlcpy(_ged_tmpcomb, _ged_tmpcomb_init, sizeof(_ged_tmpcomb)); dp = db_lookup(gedp->ged_wdbp->dbip, argv[1], LOOKUP_QUIET); if (dp != DIR_NULL) { if (!(dp->d_flags & DIR_COMB)) { @@ -88,7 +88,7 @@ } comb = (struct rt_comb_internal *)intern.idb_ptr; - ged_save_comb(gedp, dp); /* Save combination to a temp name */ + _ged_save_comb(gedp, dp); /* Save combination to a temp name */ save_comb_flag = 1; } else { comb = (struct rt_comb_internal *)NULL; @@ -155,22 +155,22 @@ if (ged_put_tree_into_comb(gedp, comb, dp, argv[1], new_name, argv[offset + 4]) == GED_ERROR) { if (comb) { - ged_restore_comb(gedp, dp); + _ged_restore_comb(gedp, dp); bu_vls_printf(&gedp->ged_result_str, "%s: \toriginal restored\n", argv[0]); } - (void)unlink(ged_tmpfil); + (void)unlink(_ged_tmpfil); return GED_ERROR; } else if (save_comb_flag) { /* eliminate the temporary combination */ char *av[3]; av[0] = "kill"; - av[1] = ged_tmpcomb; + av[1] = _ged_tmpcomb; av[2] = NULL; (void)ged_kill(gedp, 2, (const char **)av); } - (void)unlink(ged_tmpfil); + (void)unlink(_ged_tmpfil); return GED_OK; } @@ -340,7 +340,7 @@ } bu_list_free(&HeadLines.l); - i = ged_make_tree(gedp, comb, dp, node_count, old_name, new_name, rt_tree_array, tree_index); + i = _ged_make_tree(gedp, comb, dp, node_count, old_name, new_name, rt_tree_array, tree_index); bu_free(str, "dealloc bu_strdup str"); Modified: brlcad/trunk/src/libged/red.c =================================================================== --- brlcad/trunk/src/libged/red.c 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/red.c 2009-10-15 19:11:51 UTC (rev 36196) @@ -39,9 +39,9 @@ static int ged_build_comb(struct ged *gedp, struct rt_comb_internal *comb, struct directory *dp, int node_count, char *old_name); static int ged_write_comb(struct ged *gedp, const struct rt_comb_internal *comb, const char *name); -char ged_tmpfil[MAXPATHLEN] = {0}; -char ged_tmpcomb[17]; -char *ged_tmpcomb_init = "ged_tmp.aXXXXXX"; +char _ged_tmpfil[MAXPATHLEN] = {0}; +char _ged_tmpcomb[17]; +char *_ged_tmpcomb_init = "ged_tmp.aXXXXXX"; char _delims[] = " \t/"; /* allowable delimiters */ int @@ -74,7 +74,7 @@ GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_QUIET, GED_ERROR); GED_CHECK_COMB(gedp, dp, GED_ERROR); - bu_strlcpy(ged_tmpcomb, ged_tmpcomb_init, sizeof(ged_tmpcomb)); + bu_strlcpy(_ged_tmpcomb, _ged_tmpcomb_init, sizeof(_ged_tmpcomb)); if (dp != DIR_NULL) { if (!(dp->d_flags & DIR_COMB)) { @@ -86,36 +86,36 @@ comb = (struct rt_comb_internal *)intern.idb_ptr; /* Make a file for the text editor */ - fp = bu_temp_file(ged_tmpfil, MAXPATHLEN); + fp = bu_temp_file(_ged_tmpfil, MAXPATHLEN); if (fp == (FILE *)0) { bu_vls_printf(&gedp->ged_result_str, "%s: unable to edit %s\n", argv[0], argv[1]); - bu_vls_printf(&gedp->ged_result_str, "%s: unable to create %s\n", argv[0], ged_tmpfil); + bu_vls_printf(&gedp->ged_result_str, "%s: unable to create %s\n", argv[0], _ged_tmpfil); return GED_ERROR; } /* Write the combination components to the file */ if (ged_write_comb(gedp, comb, dp->d_namep)) { bu_vls_printf(&gedp->ged_result_str, "%s: unable to edit %s\n", argv[0], argv[1]); - unlink(ged_tmpfil); + unlink(_ged_tmpfil); return GED_ERROR; } } else { comb = (struct rt_comb_internal *)NULL; /* Make a file for the text editor */ - fp = bu_temp_file(ged_tmpfil, MAXPATHLEN); + fp = bu_temp_file(_ged_tmpfil, MAXPATHLEN); if (fp == (FILE *)0) { bu_vls_printf(&gedp->ged_result_str, "%s: unable to edit %s\n", argv[0], argv[1]); - bu_vls_printf(&gedp->ged_result_str, "%s: unable to create %s\n", argv[0], ged_tmpfil); + bu_vls_printf(&gedp->ged_result_str, "%s: unable to create %s\n", argv[0], _ged_tmpfil); return GED_ERROR; } /* Write the combination components to the file */ if (ged_write_comb(gedp, comb, argv[1])) { bu_vls_printf(&gedp->ged_result_str, "%s: unable to edit %s\n", argv[0], argv[1]); - unlink(ged_tmpfil); + unlink(_ged_tmpfil); return GED_ERROR; } } @@ -123,7 +123,7 @@ (void)fclose(fp); /* Edit the file */ - if (ged_editit(ged_tmpfil)) { + if (ged_editit(_ged_tmpfil)) { /* specifically avoid CHECK_READ_ONLY; above so that * we can delay checking if the geometry is read-only * until here so that red may be used to view objects. @@ -134,16 +134,16 @@ bu_vls_printf(&gedp->ged_result_str, "%s: Error in edited region, no changes made\n", *argv); if (comb) intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); - (void)unlink(ged_tmpfil); + (void)unlink(_ged_tmpfil); return GED_ERROR; } if (comb) { - if (ged_save_comb(gedp, dp)) { + if (_ged_save_comb(gedp, dp)) { /* Save combination to a temp name */ bu_vls_printf(&gedp->ged_result_str, "%s: No changes made\n", *argv); intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); - (void)unlink(ged_tmpfil); + (void)unlink(_ged_tmpfil); return GED_OK; } } @@ -151,19 +151,19 @@ if (ged_build_comb(gedp, comb, dp, node_count, (char *)argv[1])) { bu_vls_printf(&gedp->ged_result_str, "%s: Unable to construct new %s", *argv, dp->d_namep); if (comb) { - ged_restore_comb(gedp, dp); + _ged_restore_comb(gedp, dp); bu_vls_printf(&gedp->ged_result_str, "%s: \toriginal restored\n", *argv); intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); } - (void)unlink(ged_tmpfil); + (void)unlink(_ged_tmpfil); return GED_ERROR; } else if (comb) { /* eliminate the temporary combination */ char *av[3]; av[0] = "kill"; - av[1] = ged_tmpcomb; + av[1] = _ged_tmpcomb; av[2] = NULL; (void)ged_kill(gedp, 2, (const char **)av); } @@ -172,7 +172,7 @@ } } - unlink(ged_tmpfil); + unlink(_ged_tmpfil); return GED_OK; } @@ -226,7 +226,7 @@ int id=0, air=0; int rgb_valid; - if ( (fp=fopen( ged_tmpfil, "r" )) == NULL ) { + if ( (fp=fopen( _ged_tmpfil, "r" )) == NULL ) { perror( "MGED" ); bu_vls_printf(&gedp->ged_result_str, "Cannot open temporary file for reading\n"); return -1; @@ -461,7 +461,7 @@ } int -ged_make_tree(struct ged *gedp, struct rt_comb_internal *comb, struct directory *dp, int node_count, const char *old_name, const char *new_name, struct rt_tree_array *rt_tree_array, int tree_index) +_ged_make_tree(struct ged *gedp, struct rt_comb_internal *comb, struct directory *dp, int node_count, const char *old_name, const char *new_name, struct rt_tree_array *rt_tree_array, int tree_index) { struct rt_db_internal intern; union tree *final_tree; @@ -488,14 +488,14 @@ if (dp != DIR_NULL) { if (db_delete(gedp->ged_wdbp->dbip, dp) || db_dirdelete(gedp->ged_wdbp->dbip, dp)) { - bu_vls_printf(&gedp->ged_result_str, "ged_make_tree: Unable to delete directory entry for %s\n", old_name); + bu_vls_printf(&gedp->ged_result_str, "_ged_make_tree: Unable to delete directory entry for %s\n", old_name); intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); return GED_ERROR; } } if ((dp=db_diradd(gedp->ged_wdbp->dbip, new_name, -1L, 0, flags, (genptr_t)&intern.idb_type)) == DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, "ged_make_tree: Cannot add %s to directory, no changes made\n", new_name); + bu_vls_printf(&gedp->ged_result_str, "_ged_make_tree: Cannot add %s to directory, no changes made\n", new_name); intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); return(1); } @@ -508,7 +508,7 @@ flags = DIR_COMB; if ((dp=db_diradd(gedp->ged_wdbp->dbip, new_name, -1L, 0, flags, (genptr_t)&intern.idb_type)) == DIR_NULL) { - bu_vls_printf(&gedp->ged_result_str, "ged_make_tree: Cannot add %s to directory, no changes made\n", new_name); + bu_vls_printf(&gedp->ged_result_str, "_ged_make_tree: Cannot add %s to directory, no changes made\n", new_name); intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); return GED_ERROR; } @@ -520,7 +520,7 @@ } if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "ged_make_tree: Unable to write new combination into database.\n"); + bu_vls_printf(&gedp->ged_result_str, "_ged_make_tree: Unable to write new combination into database.\n"); return GED_ERROR; } @@ -558,8 +558,8 @@ RT_CK_DIR(dp); } - if ((fp=fopen(ged_tmpfil, "r")) == NULL) { - bu_vls_printf(&gedp->ged_result_str, "ged_build_comb: Cannot open edited file: %s\n", ged_tmpfil); + if ((fp=fopen(_ged_tmpfil, "r")) == NULL) { + bu_vls_printf(&gedp->ged_result_str, "ged_build_comb: Cannot open edited file: %s\n", _ged_tmpfil); return GED_ERROR; } @@ -813,7 +813,7 @@ fclose(fp); - ret = ged_make_tree(gedp, comb, dp, node_count, old_name, new_name, rt_tree_array, tree_index); + ret = _ged_make_tree(gedp, comb, dp, node_count, old_name, new_name, rt_tree_array, tree_index); if (gedp->ged_wdbp->dbip->dbi_version >= 5) { if (name) @@ -825,7 +825,7 @@ } void -ged_print_matrix(FILE *fp, matp_t matrix) +_ged_print_matrix(FILE *fp, matp_t matrix) { int k; char buf[64]; @@ -859,7 +859,7 @@ RT_CK_COMB(comb); /* open the file */ - if ((fp=fopen(ged_tmpfil, "w")) == NULL) { + if ((fp=fopen(_ged_tmpfil, "w")) == NULL) { perror("MGED"); bu_vls_printf(&gedp->ged_result_str, "ged_write_comb: Cannot open temporary file for writing\n"); return GED_ERROR; @@ -953,11 +953,11 @@ } if (fprintf(fp, " %c %s", op, rt_tree_array[i].tl_tree->tr_l.tl_name) <= 0) { bu_vls_printf(&gedp->ged_result_str, "ged_write_comb: Cannot write to temporary file (%s). Aborting edit\n", - ged_tmpfil); + _ged_tmpfil); fclose(fp); return GED_ERROR; } - ged_print_matrix(fp, rt_tree_array[i].tl_tree->tr_l.tl_mat); + _ged_print_matrix(fp, rt_tree_array[i].tl_tree->tr_l.tl_mat); fprintf(fp, "\n"); } fclose(fp); @@ -1000,7 +1000,7 @@ } int -ged_save_comb(struct ged *gedp, struct directory *dpold) +_ged_save_comb(struct ged *gedp, struct directory *dpold) { /* Save a combination under a temporory name */ @@ -1008,29 +1008,29 @@ struct rt_db_internal intern; /* Make a new name */ - ged_mktemp_comb(gedp, ged_tmpcomb); + ged_mktemp_comb(gedp, _ged_tmpcomb); if ( rt_db_get_internal( &intern, dpold, gedp->ged_wdbp->dbip, (fastf_t *)NULL, &rt_uniresource ) < 0 ) { - bu_vls_printf(&gedp->ged_result_str, "ged_save_comb: Database read error, aborting\n"); + bu_vls_printf(&gedp->ged_result_str, "_ged_save_comb: Database read error, aborting\n"); return GED_ERROR; } - if ( (dp=db_diradd( gedp->ged_wdbp->dbip, ged_tmpcomb, -1L, 0, dpold->d_flags, (genptr_t)&intern.idb_type)) == DIR_NULL ) { - bu_vls_printf(&gedp->ged_result_str, "ged_save_comb: Cannot save copy of %s, no changed made\n", dpold->d_namep); + if ( (dp=db_diradd( gedp->ged_wdbp->dbip, _ged_tmpcomb, -1L, 0, dpold->d_flags, (genptr_t)&intern.idb_type)) == DIR_NULL ) { + bu_vls_printf(&gedp->ged_result_str, "_ged_save_comb: Cannot save copy of %s, no changed made\n", dpold->d_namep); return GED_ERROR; } if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &intern, &rt_uniresource) < 0) { - bu_vls_printf(&gedp->ged_result_str, "ged_save_comb: Cannot save copy of %s, no changed made\n", dpold->d_namep); + bu_vls_printf(&gedp->ged_result_str, "_ged_save_comb: Cannot save copy of %s, no changed made\n", dpold->d_namep); return GED_ERROR; } return GED_OK; } -/* restore a combination that was saved in "ged_tmpcomb" */ +/* restore a combination that was saved in "_ged_tmpcomb" */ void -ged_restore_comb(struct ged *gedp, struct directory *dp) +_ged_restore_comb(struct ged *gedp, struct directory *dp) { char *av[4]; char *name; @@ -1045,7 +1045,7 @@ (void)ged_kill(gedp, 2, (const char **)av); av[0] = "mv"; - av[1] = ged_tmpcomb; + av[1] = _ged_tmpcomb; av[2] = name; (void)ged_move(gedp, 3, (const char **)av); Modified: brlcad/trunk/src/libged/rrt.c =================================================================== --- brlcad/trunk/src/libged/rrt.c 2009-10-15 18:09:18 UTC (rev 36195) +++ brlcad/trunk/src/libged/rrt.c 2009-10-15 19:11:51 UTC (rev 36196) @@ -61,7 +61,7 @@ _ged_current_gedp = gedp; - ged_setup_rt(gedp, vp, 1); + _ged_setup_rt(gedp, vp, 1); (void)ged_run_rt(gedp); return GED_OK; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-15 20:17:45
|
Revision: 36198 http://brlcad.svn.sourceforge.net/brlcad/?rev=36198&view=rev Author: starseeker Date: 2009-10-15 20:17:31 +0000 (Thu, 15 Oct 2009) Log Message: ----------- More ged_private renaming. Modified Paths: -------------- brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/get_eyemodel.c brlcad/trunk/src/libged/nirt.c brlcad/trunk/src/libged/preview.c brlcad/trunk/src/libged/protate.c brlcad/trunk/src/libged/pscale.c brlcad/trunk/src/libged/rotate_eto.c brlcad/trunk/src/libged/rotate_extrude.c brlcad/trunk/src/libged/rotate_hyp.c brlcad/trunk/src/libged/rotate_tgc.c brlcad/trunk/src/libged/rt.c brlcad/trunk/src/libged/rtcheck.c brlcad/trunk/src/libged/saveview.c brlcad/trunk/src/libged/scale.c brlcad/trunk/src/libged/scale_ehy.c brlcad/trunk/src/libged/scale_ell.c brlcad/trunk/src/libged/scale_epa.c brlcad/trunk/src/libged/scale_eto.c brlcad/trunk/src/libged/scale_extrude.c brlcad/trunk/src/libged/scale_hyp.c brlcad/trunk/src/libged/scale_part.c brlcad/trunk/src/libged/scale_rhc.c brlcad/trunk/src/libged/scale_rpc.c brlcad/trunk/src/libged/scale_superell.c brlcad/trunk/src/libged/scale_tgc.c brlcad/trunk/src/libged/scale_tor.c brlcad/trunk/src/libged/solids_on_ray.c Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/ged_private.h 2009-10-15 20:17:31 UTC (rev 36198) @@ -316,58 +316,58 @@ (FILE *fp, matp_t matrix)); /* defined in rt.c */ -BU_EXTERN (void ged_rt_set_eye_model, +BU_EXTERN (void _ged_rt_set_eye_model, (struct ged *gedp, vect_t eye_model)); BU_EXTERN (int ged_run_rt, (struct ged *gdp)); -BU_EXTERN (void ged_rt_write, +BU_EXTERN (void _ged_rt_write, (struct ged *gedp, FILE *fp, vect_t eye_model)); -BU_EXTERN (void ged_rt_output_handler, +BU_EXTERN (void _ged_rt_output_handler, (ClientData clientData, int mask)); -BU_EXTERN (int ged_build_tops, +BU_EXTERN (int _ged_build_tops, (struct ged *gedp, char **start, register char **end)); /* defined in rtcheck.c */ -BU_EXTERN (void ged_wait_status, +BU_EXTERN (void _ged_wait_status, (struct bu_vls *log, int status)); /* defined in rotate_eto.c */ -BU_EXTERN (int ged_rotate_eto, +BU_EXTERN (int _ged_rotate_eto, (struct ged *gedp, struct rt_eto_internal *eto, const char *attribute, matp_t rmat)); /* defined in rotate_extrude.c */ -BU_EXTERN (int ged_rotate_extrude, +BU_EXTERN (int _ged_rotate_extrude, (struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, matp_t rmat)); /* defined in rotate_hyp.c */ -BU_EXTERN (int ged_rotate_hyp, +BU_EXTERN (int _ged_rotate_hyp, (struct ged *gedp, struct rt_hyp_internal *hyp, const char *attribute, matp_t rmat)); /* defined in rotate_tgc.c */ -BU_EXTERN (int ged_rotate_tgc, +BU_EXTERN (int _ged_rotate_tgc, (struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, matp_t rmat)); /* defined in scale_ehy.c */ -BU_EXTERN (int ged_scale_ehy, +BU_EXTERN (int _ged_scale_ehy, (struct ged *gedp, struct rt_ehy_internal *ehy, const char *attribute, @@ -375,7 +375,7 @@ int rflag)); /* defined in scale_ell.c */ -BU_EXTERN (int ged_scale_ell, +BU_EXTERN (int _ged_scale_ell, (struct ged *gedp, struct rt_ell_internal *ell, const char *attribute, @@ -383,7 +383,7 @@ int rflag)); /* defined in scale_epa.c */ -BU_EXTERN (int ged_scale_epa, +BU_EXTERN (int _ged_scale_epa, (struct ged *gedp, struct rt_epa_internal *epa, const char *attribute, @@ -391,7 +391,7 @@ int rflag)); /* defined in scale_eto.c */ -BU_EXTERN (int ged_scale_eto, +BU_EXTERN (int _ged_scale_eto, (struct ged *gedp, struct rt_eto_internal *eto, const char *attribute, @@ -399,7 +399,7 @@ int rflag)); /* defined in scale_extrude.c */ -BU_EXTERN (int ged_scale_extrude, +BU_EXTERN (int _ged_scale_extrude, (struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, @@ -407,7 +407,7 @@ int rflag)); /* defined in scale_hyp.c */ -BU_EXTERN (int ged_scale_hyp, +BU_EXTERN (int _ged_scale_hyp, (struct ged *gedp, struct rt_hyp_internal *hyp, const char *attribute, @@ -415,7 +415,7 @@ int rflag)); /* defined in scale_part.c */ -BU_EXTERN (int ged_scale_part, +BU_EXTERN (int _ged_scale_part, (struct ged *gedp, struct rt_part_internal *part, const char *attribute, @@ -423,7 +423,7 @@ int rflag)); /* defined in scale_rhc.c */ -BU_EXTERN (int ged_scale_rhc, +BU_EXTERN (int _ged_scale_rhc, (struct ged *gedp, struct rt_rhc_internal *rhc, const char *attribute, @@ -431,7 +431,7 @@ int rflag)); /* defined in scale_rpc.c */ -BU_EXTERN (int ged_scale_rpc, +BU_EXTERN (int _ged_scale_rpc, (struct ged *gedp, struct rt_rpc_internal *rpc, const char *attribute, @@ -439,7 +439,7 @@ int rflag)); /* defined in scale_superell.c */ -BU_EXTERN (int ged_scale_superell, +BU_EXTERN (int _ged_scale_superell, (struct ged *gedp, struct rt_superell_internal *superell, const char *attribute, @@ -447,7 +447,7 @@ int rflag)); /* defined in scale_tgc.c */ -BU_EXTERN (int ged_scale_tgc, +BU_EXTERN (int _ged_scale_tgc, (struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, @@ -455,7 +455,7 @@ int rflag)); /* defined in scale_tor.c */ -BU_EXTERN (int ged_scale_tor, +BU_EXTERN (int _ged_scale_tor, (struct ged *gedp, struct rt_tor_internal *tor, const char *attribute, Modified: brlcad/trunk/src/libged/get_eyemodel.c =================================================================== --- brlcad/trunk/src/libged/get_eyemodel.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/get_eyemodel.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -56,7 +56,7 @@ return GED_ERROR; } - ged_rt_set_eye_model(gedp, eye_model); + _ged_rt_set_eye_model(gedp, eye_model); quat_mat2quat(quat, gedp->ged_gvp->gv_rotation); bu_vls_printf(&gedp->ged_result_str, "viewsize %.15e;\n", gedp->ged_gvp->gv_size); Modified: brlcad/trunk/src/libged/nirt.c =================================================================== --- brlcad/trunk/src/libged/nirt.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/nirt.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -276,8 +276,8 @@ gedp->ged_gdp->gd_rt_cmd_len = vp - gedp->ged_gdp->gd_rt_cmd; - /* Note - ged_build_tops sets the last vp to (char *)0 */ - gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, + /* Note - _ged_build_tops sets the last vp to (char *)0 */ + gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, vp, &gedp->ged_gdp->gd_rt_cmd[RT_MAXARGS]); @@ -564,7 +564,7 @@ ; /* NULL */ if (retcode != 0) - ged_wait_status(&gedp->ged_result_str, retcode); + _ged_wait_status(&gedp->ged_result_str, retcode); #else /* Wait for program to finish */ WaitForSingleObject( pi.hProcess, INFINITE ); Modified: brlcad/trunk/src/libged/preview.c =================================================================== --- brlcad/trunk/src/libged/preview.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/preview.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -194,7 +194,7 @@ _ged_setup_rt(struct ged *gedp, register char **vp, int printcmd) { _ged_current_gedp->ged_gdp->gd_rt_cmd_len = vp - _ged_current_gedp->ged_gdp->gd_rt_cmd; - _ged_current_gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, + _ged_current_gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, vp, &_ged_current_gedp->ged_gdp->gd_rt_cmd[MAXARGS]); if (printcmd) { Modified: brlcad/trunk/src/libged/protate.c =================================================================== --- brlcad/trunk/src/libged/protate.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/protate.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -97,16 +97,16 @@ switch (intern.idb_minor_type) { case DB5_MINORTYPE_BRLCAD_ETO: - ret = ged_rotate_eto(gedp, (struct rt_eto_internal *)intern.idb_ptr, argv[2], rmat); + ret = _ged_rotate_eto(gedp, (struct rt_eto_internal *)intern.idb_ptr, argv[2], rmat); break; case DB5_MINORTYPE_BRLCAD_EXTRUDE: - ret = ged_rotate_extrude(gedp, (struct rt_extrude_internal *)intern.idb_ptr, argv[2], rmat); + ret = _ged_rotate_extrude(gedp, (struct rt_extrude_internal *)intern.idb_ptr, argv[2], rmat); break; case DB5_MINORTYPE_BRLCAD_HYP: - ret = ged_rotate_hyp(gedp, (struct rt_hyp_internal *)intern.idb_ptr, argv[2], rmat); + ret = _ged_rotate_hyp(gedp, (struct rt_hyp_internal *)intern.idb_ptr, argv[2], rmat); break; case DB5_MINORTYPE_BRLCAD_TGC: - ret = ged_rotate_tgc(gedp, (struct rt_tgc_internal *)intern.idb_ptr, argv[2], rmat); + ret = _ged_rotate_tgc(gedp, (struct rt_tgc_internal *)intern.idb_ptr, argv[2], rmat); break; default: bu_vls_printf(&gedp->ged_result_str, "%s: Object not yet supported.", argv[0]); Modified: brlcad/trunk/src/libged/pscale.c =================================================================== --- brlcad/trunk/src/libged/pscale.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/pscale.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -108,40 +108,40 @@ switch (intern.idb_minor_type) { case DB5_MINORTYPE_BRLCAD_EHY: - ret = ged_scale_ehy(gedp, (struct rt_ehy_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_ehy(gedp, (struct rt_ehy_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_ELL: - ret = ged_scale_ell(gedp, (struct rt_ell_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_ell(gedp, (struct rt_ell_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_EPA: - ret = ged_scale_epa(gedp, (struct rt_epa_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_epa(gedp, (struct rt_epa_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_ETO: - ret = ged_scale_eto(gedp, (struct rt_eto_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_eto(gedp, (struct rt_eto_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_EXTRUDE: - ret = ged_scale_extrude(gedp, (struct rt_extrude_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_extrude(gedp, (struct rt_extrude_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_HYP: - ret = ged_scale_hyp(gedp, (struct rt_hyp_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_hyp(gedp, (struct rt_hyp_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_PARTICLE: - ret = ged_scale_part(gedp, (struct rt_part_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_part(gedp, (struct rt_part_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_RHC: - ret = ged_scale_rhc(gedp, (struct rt_rhc_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_rhc(gedp, (struct rt_rhc_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_RPC: - ret = ged_scale_rpc(gedp, (struct rt_rpc_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_rpc(gedp, (struct rt_rpc_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_SUPERELL: - ret = ged_scale_superell(gedp, (struct rt_superell_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_superell(gedp, (struct rt_superell_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_TGC: - ret = ged_scale_tgc(gedp, (struct rt_tgc_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_tgc(gedp, (struct rt_tgc_internal *)intern.idb_ptr, argv[2], sf, rflag); break; case DB5_MINORTYPE_BRLCAD_TOR: - ret = ged_scale_tor(gedp, (struct rt_tor_internal *)intern.idb_ptr, argv[2], sf, rflag); + ret = _ged_scale_tor(gedp, (struct rt_tor_internal *)intern.idb_ptr, argv[2], sf, rflag); break; default: bu_vls_printf(&gedp->ged_result_str, "%s: Object not yet supported.", argv[0]); Modified: brlcad/trunk/src/libged/rotate_eto.c =================================================================== --- brlcad/trunk/src/libged/rotate_eto.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/rotate_eto.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_rotate_eto(struct ged *gedp, struct rt_eto_internal *eto, const char *attribute, matp_t rmat) +_ged_rotate_eto(struct ged *gedp, struct rt_eto_internal *eto, const char *attribute, matp_t rmat) { fastf_t newrad; Modified: brlcad/trunk/src/libged/rotate_extrude.c =================================================================== --- brlcad/trunk/src/libged/rotate_extrude.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/rotate_extrude.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_rotate_extrude(struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, matp_t rmat) +_ged_rotate_extrude(struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, matp_t rmat) { RT_EXTRUDE_CK_MAGIC(extrude); Modified: brlcad/trunk/src/libged/rotate_hyp.c =================================================================== --- brlcad/trunk/src/libged/rotate_hyp.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/rotate_hyp.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_rotate_hyp(struct ged *gedp, struct rt_hyp_internal *hyp, const char *attribute, matp_t rmat) +_ged_rotate_hyp(struct ged *gedp, struct rt_hyp_internal *hyp, const char *attribute, matp_t rmat) { fastf_t newrad; Modified: brlcad/trunk/src/libged/rotate_tgc.c =================================================================== --- brlcad/trunk/src/libged/rotate_tgc.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/rotate_tgc.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_rotate_tgc(struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, matp_t rmat) +_ged_rotate_tgc(struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, matp_t rmat) { fastf_t newrad; Modified: brlcad/trunk/src/libged/rt.c =================================================================== --- brlcad/trunk/src/libged/rt.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/rt.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -113,7 +113,7 @@ */ if (i == argc) { gedp->ged_gdp->gd_rt_cmd_len = vp - gedp->ged_gdp->gd_rt_cmd; - gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, + gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, vp, &gedp->ged_gdp->gd_rt_cmd[MAXARGS]); } else { @@ -188,8 +188,8 @@ (void)close(pipe_err[1]); - ged_rt_set_eye_model(gedp, eye_model); - ged_rt_write(gedp, fp_in, eye_model); + _ged_rt_set_eye_model(gedp, eye_model); + _ged_rt_write(gedp, fp_in, eye_model); (void)fclose(fp_in); BU_GETSTRUCT(run_rtp, ged_run_rt); @@ -205,7 +205,7 @@ Tcl_CreateFileHandler(run_rtp->fd, TCL_READABLE, - ged_rt_output_handler, + _ged_rt_output_handler, (ClientData)drcdp); return 0; @@ -262,8 +262,8 @@ /* As parent, send view information down pipe */ fp_in = _fdopen( _open_osfhandle((HFILE)pipe_inDup, _O_TEXT), "wb" ); - ged_rt_set_eye_model(gedp, eye_model); - ged_rt_write(gedp, fp_in, eye_model); + _ged_rt_set_eye_model(gedp, eye_model); + _ged_rt_write(gedp, fp_in, eye_model); (void)fclose(fp_in); BU_GETSTRUCT(run_rtp, ged_run_rt); @@ -282,7 +282,7 @@ Tcl_CreateChannelHandler(run_rtp->chan, TCL_READABLE, - ged_rt_output_handler, + _ged_rt_output_handler, (ClientData)drcdp); return 0; @@ -290,7 +290,7 @@ } void -ged_rt_write(struct ged *gedp, +_ged_rt_write(struct ged *gedp, FILE *fp, vect_t eye_model) { @@ -358,7 +358,7 @@ void -ged_rt_output_handler(ClientData clientData, +_ged_rt_output_handler(ClientData clientData, int mask) { struct _ged_rt_client_data *drcdp = (struct _ged_rt_client_data *)clientData; @@ -408,7 +408,7 @@ aborted = run_rtp->aborted; #else Tcl_DeleteChannelHandler(run_rtp->chan, - ged_rt_output_handler, + _ged_rt_output_handler, (ClientData)drcdp); Tcl_Close(brlcad_interp, run_rtp->chan); @@ -443,9 +443,9 @@ /* free run_rtp */ BU_LIST_DEQUEUE(&run_rtp->l); - bu_free((genptr_t)run_rtp, "ged_rt_output_handler: run_rtp"); + bu_free((genptr_t)run_rtp, "_ged_rt_output_handler: run_rtp"); - bu_free((genptr_t)drcdp, "ged_rt_output_handler: drcdp"); + bu_free((genptr_t)drcdp, "_ged_rt_output_handler: drcdp"); return; } @@ -466,7 +466,7 @@ * Build a command line vector of the tops of all objects in view. */ int -ged_build_tops(struct ged *gedp, +_ged_build_tops(struct ged *gedp, char **start, register char **end) { @@ -491,7 +491,7 @@ void -ged_rt_set_eye_model(struct ged *gedp, +_ged_rt_set_eye_model(struct ged *gedp, vect_t eye_model) { if (gedp->ged_gvp->gv_zclip || gedp->ged_gvp->gv_perspective > 0) { Modified: brlcad/trunk/src/libged/rtcheck.c =================================================================== --- brlcad/trunk/src/libged/rtcheck.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/rtcheck.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -149,7 +149,7 @@ */ if (i == argc) { gedp->ged_gdp->gd_rt_cmd_len = vp - gedp->ged_gdp->gd_rt_cmd; - gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, + gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, vp, &gedp->ged_gdp->gd_rt_cmd[MAXARGS]); } else { @@ -196,8 +196,8 @@ (void)close(o_pipe[0]); fp = fdopen(o_pipe[1], "w"); - ged_rt_set_eye_model(gedp, eye_model); - ged_rt_write(gedp, fp, eye_model); + _ged_rt_set_eye_model(gedp, eye_model); + _ged_rt_write(gedp, fp, eye_model); (void)fclose(fp); /* close write end of pipes */ @@ -252,7 +252,7 @@ */ if (i == argc) { gedp->ged_gdp->gd_rt_cmd_len = vp - gedp->ged_gdp->gd_rt_cmd; - gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, + gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, vp, &gedp->ged_gdp->gd_rt_cmd[MAXARGS]); } else { @@ -338,8 +338,8 @@ fp = _fdopen(_open_osfhandle((HFILE)pipe_oDup, _O_TEXT), "wb"); setmode(_fileno(fp), O_BINARY); - ged_rt_set_eye_model(gedp, eye_model); - ged_rt_write(gedp, fp, eye_model); + _ged_rt_set_eye_model(gedp, eye_model); + _ged_rt_write(gedp, fp, eye_model); (void)fclose(fp); BU_GETSTRUCT(rtcp, ged_rtcheck); @@ -409,7 +409,7 @@ /* wait for the forked process */ while ((rpid = wait(&retcode)) != rtcp->pid && rpid != -1) { - ged_wait_status(&rtcp->gedp->ged_result_str, retcode); + _ged_wait_status(&rtcp->gedp->ged_result_str, retcode); } #if 0 @@ -548,7 +548,7 @@ #endif void -ged_wait_status(struct bu_vls *log, +_ged_wait_status(struct bu_vls *log, int status) { int sig = status & 0x7f; Modified: brlcad/trunk/src/libged/saveview.c =================================================================== --- brlcad/trunk/src/libged/saveview.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/saveview.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -149,8 +149,8 @@ { vect_t eye_model; - ged_rt_set_eye_model(gedp, eye_model); - ged_rt_write(gedp, fp, eye_model); + _ged_rt_set_eye_model(gedp, eye_model); + _ged_rt_write(gedp, fp, eye_model); } (void)fprintf(fp, "\nEOF\n"); Modified: brlcad/trunk/src/libged/scale.c =================================================================== --- brlcad/trunk/src/libged/scale.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -34,7 +34,7 @@ int -ged_scale_args(struct ged *gedp, int argc, const char *argv[], fastf_t *sf) +_ged_scale_args(struct ged *gedp, int argc, const char *argv[], fastf_t *sf) { static const char *usage = "sf"; @@ -65,12 +65,12 @@ } int -ged_scale(struct ged *gedp, int argc, const char *argv[]) +_ged_scale(struct ged *gedp, int argc, const char *argv[]) { int ret; fastf_t sf; - if ((ret = ged_scale_args(gedp, argc, argv, &sf)) != GED_OK) + if ((ret = _ged_scale_args(gedp, argc, argv, &sf)) != GED_OK) return ret; if (sf <= SMALL_FASTF || INFINITY < sf) Modified: brlcad/trunk/src/libged/scale_ehy.c =================================================================== --- brlcad/trunk/src/libged/scale_ehy.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_ehy.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -34,7 +34,7 @@ #include "./ged_private.h" int -ged_scale_ehy(struct ged *gedp, struct rt_ehy_internal *ehy, const char *attribute, fastf_t sf, int rflag) +_ged_scale_ehy(struct ged *gedp, struct rt_ehy_internal *ehy, const char *attribute, fastf_t sf, int rflag) { fastf_t ma, mb; fastf_t newrad; Modified: brlcad/trunk/src/libged/scale_ell.c =================================================================== --- brlcad/trunk/src/libged/scale_ell.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_ell.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -34,7 +34,7 @@ #include "./ged_private.h" int -ged_scale_ell(struct ged *gedp, struct rt_ell_internal *ell, const char *attribute, fastf_t sf, int rflag) +_ged_scale_ell(struct ged *gedp, struct rt_ell_internal *ell, const char *attribute, fastf_t sf, int rflag) { fastf_t ma, mb; Modified: brlcad/trunk/src/libged/scale_epa.c =================================================================== --- brlcad/trunk/src/libged/scale_epa.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_epa.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -34,7 +34,7 @@ #include "./ged_private.h" int -ged_scale_epa(struct ged *gedp, struct rt_epa_internal *epa, const char *attribute, fastf_t sf, int rflag) +_ged_scale_epa(struct ged *gedp, struct rt_epa_internal *epa, const char *attribute, fastf_t sf, int rflag) { fastf_t ma, mb; fastf_t newrad; Modified: brlcad/trunk/src/libged/scale_eto.c =================================================================== --- brlcad/trunk/src/libged/scale_eto.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_eto.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_scale_eto(struct ged *gedp, struct rt_eto_internal *eto, const char *attribute, fastf_t sf, int rflag) +_ged_scale_eto(struct ged *gedp, struct rt_eto_internal *eto, const char *attribute, fastf_t sf, int rflag) { fastf_t newrad; Modified: brlcad/trunk/src/libged/scale_extrude.c =================================================================== --- brlcad/trunk/src/libged/scale_extrude.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_extrude.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_scale_extrude(struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, fastf_t sf, int rflag) +_ged_scale_extrude(struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, fastf_t sf, int rflag) { vect_t hvec; Modified: brlcad/trunk/src/libged/scale_hyp.c =================================================================== --- brlcad/trunk/src/libged/scale_hyp.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_hyp.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_scale_hyp(struct ged *gedp, struct rt_hyp_internal *hyp, const char *attribute, fastf_t sf, int rflag) +_ged_scale_hyp(struct ged *gedp, struct rt_hyp_internal *hyp, const char *attribute, fastf_t sf, int rflag) { fastf_t f; point_t old_top; Modified: brlcad/trunk/src/libged/scale_part.c =================================================================== --- brlcad/trunk/src/libged/scale_part.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_part.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -34,7 +34,7 @@ #include "./ged_private.h" int -ged_scale_part(struct ged *gedp, struct rt_part_internal *part, const char *attribute, fastf_t sf, int rflag) +_ged_scale_part(struct ged *gedp, struct rt_part_internal *part, const char *attribute, fastf_t sf, int rflag) { RT_PART_CK_MAGIC(part); Modified: brlcad/trunk/src/libged/scale_rhc.c =================================================================== --- brlcad/trunk/src/libged/scale_rhc.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_rhc.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -34,7 +34,7 @@ #include "./ged_private.h" int -ged_scale_rhc(struct ged *gedp, struct rt_rhc_internal *rhc, const char *attribute, fastf_t sf, int rflag) +_ged_scale_rhc(struct ged *gedp, struct rt_rhc_internal *rhc, const char *attribute, fastf_t sf, int rflag) { fastf_t ma, mb; Modified: brlcad/trunk/src/libged/scale_rpc.c =================================================================== --- brlcad/trunk/src/libged/scale_rpc.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_rpc.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -34,7 +34,7 @@ #include "./ged_private.h" int -ged_scale_rpc(struct ged *gedp, struct rt_rpc_internal *rpc, const char *attribute, fastf_t sf, int rflag) +_ged_scale_rpc(struct ged *gedp, struct rt_rpc_internal *rpc, const char *attribute, fastf_t sf, int rflag) { fastf_t ma, mb; Modified: brlcad/trunk/src/libged/scale_superell.c =================================================================== --- brlcad/trunk/src/libged/scale_superell.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_superell.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -34,7 +34,7 @@ #include "./ged_private.h" int -ged_scale_superell(struct ged *gedp, struct rt_superell_internal *superell, const char *attribute, fastf_t sf, int rflag) +_ged_scale_superell(struct ged *gedp, struct rt_superell_internal *superell, const char *attribute, fastf_t sf, int rflag) { fastf_t ma, mb; Modified: brlcad/trunk/src/libged/scale_tgc.c =================================================================== --- brlcad/trunk/src/libged/scale_tgc.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_tgc.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_scale_tgc(struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, fastf_t sf, int rflag) +_ged_scale_tgc(struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, fastf_t sf, int rflag) { fastf_t ma, mb; Modified: brlcad/trunk/src/libged/scale_tor.c =================================================================== --- brlcad/trunk/src/libged/scale_tor.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/scale_tor.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -36,7 +36,7 @@ int -ged_scale_tor(struct ged *gedp, struct rt_tor_internal *tor, const char *attribute, fastf_t sf, int rflag) +_ged_scale_tor(struct ged *gedp, struct rt_tor_internal *tor, const char *attribute, fastf_t sf, int rflag) { fastf_t newrad; Modified: brlcad/trunk/src/libged/solids_on_ray.c =================================================================== --- brlcad/trunk/src/libged/solids_on_ray.c 2009-10-15 20:11:41 UTC (rev 36197) +++ brlcad/trunk/src/libged/solids_on_ray.c 2009-10-15 20:17:31 UTC (rev 36198) @@ -134,7 +134,7 @@ /* * Build a list of all the top-level objects currently displayed */ - rt_cmd_vec_len = ged_build_tops(gedp, &rt_cmd_vec[0], &rt_cmd_vec[MAXARGS]); + rt_cmd_vec_len = _ged_build_tops(gedp, &rt_cmd_vec[0], &rt_cmd_vec[MAXARGS]); #if 0 start_catching_output(&gedp->ged_result_str); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-15 23:27:53
|
Revision: 36199 http://brlcad.svn.sourceforge.net/brlcad/?rev=36199&view=rev Author: starseeker Date: 2009-10-15 21:13:35 +0000 (Thu, 15 Oct 2009) Log Message: ----------- OK, the remainder of ged_private is now prefixed. Modified Paths: -------------- brlcad/trunk/src/libged/aet.c brlcad/trunk/src/libged/arot.c brlcad/trunk/src/libged/autoview.c brlcad/trunk/src/libged/center.c brlcad/trunk/src/libged/copyeval.c brlcad/trunk/src/libged/eye.c brlcad/trunk/src/libged/eye_pos.c brlcad/trunk/src/libged/ged.c brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/get_obj_bounds.c brlcad/trunk/src/libged/grid.c brlcad/trunk/src/libged/loadview.c brlcad/trunk/src/libged/lookat.c brlcad/trunk/src/libged/mirror.c brlcad/trunk/src/libged/orient.c brlcad/trunk/src/libged/pathsum.c brlcad/trunk/src/libged/perspective.c brlcad/trunk/src/libged/pmat.c brlcad/trunk/src/libged/pov.c brlcad/trunk/src/libged/preview.c brlcad/trunk/src/libged/ptranslate.c brlcad/trunk/src/libged/quat.c brlcad/trunk/src/libged/qvrot.c brlcad/trunk/src/libged/rect.c brlcad/trunk/src/libged/rmat.c brlcad/trunk/src/libged/rot.c brlcad/trunk/src/libged/rrt.c brlcad/trunk/src/libged/rt.c brlcad/trunk/src/libged/scale.c brlcad/trunk/src/libged/setview.c brlcad/trunk/src/libged/size.c brlcad/trunk/src/libged/slew.c brlcad/trunk/src/libged/summary.c brlcad/trunk/src/libged/tops.c brlcad/trunk/src/libged/tra.c brlcad/trunk/src/libged/trace.c brlcad/trunk/src/libged/translate_extrude.c brlcad/trunk/src/libged/translate_tgc.c brlcad/trunk/src/libged/vutil.c brlcad/trunk/src/libged/wdb_obj.c brlcad/trunk/src/libged/ypr.c brlcad/trunk/src/libged/zoom.c Modified: brlcad/trunk/src/libged/aet.c =================================================================== --- brlcad/trunk/src/libged/aet.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/aet.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -76,8 +76,8 @@ } else { VMOVE(gedp->ged_gvp->gv_aet, aet); } - ged_mat_aet(gedp->ged_gvp); - ged_view_update(gedp->ged_gvp); + _ged_mat_aet(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } @@ -106,8 +106,8 @@ } else { VMOVE(gedp->ged_gvp->gv_aet, aet); } - ged_mat_aet(gedp->ged_gvp); - ged_view_update(gedp->ged_gvp); + _ged_mat_aet(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/arot.c =================================================================== --- brlcad/trunk/src/libged/arot.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/arot.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -94,7 +94,7 @@ if ((ret = ged_arot_args(gedp, argc, argv, rmat)) != GED_OK) return ret; - return ged_do_rot(gedp, gedp->ged_gvp->gv_coord, rmat, (int (*)())0); + return _ged_do_rot(gedp, gedp->ged_gvp->gv_coord, rmat, (int (*)())0); } /* Modified: brlcad/trunk/src/libged/autoview.c =================================================================== --- brlcad/trunk/src/libged/autoview.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/autoview.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -112,7 +112,7 @@ gedp->ged_gvp->gv_size = 2.0 * gedp->ged_gvp->gv_scale; gedp->ged_gvp->gv_isize = 1.0 / gedp->ged_gvp->gv_size; - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/center.c =================================================================== --- brlcad/trunk/src/libged/center.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/center.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -85,7 +85,7 @@ VSCALE(center, center, gedp->ged_wdbp->dbip->dbi_local2base); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, center); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/copyeval.c =================================================================== --- brlcad/trunk/src/libged/copyeval.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/copyeval.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -104,7 +104,7 @@ } /* Accumulate the matrices */ - ged_trace(gtd.gtd_obj[0], 0, start_mat, >d); + _ged_trace(gtd.gtd_obj[0], 0, start_mat, >d); if (gtd.gtd_prflag == 0) { bu_vls_printf(&gedp->ged_result_str, "PATH: "); Modified: brlcad/trunk/src/libged/eye.c =================================================================== --- brlcad/trunk/src/libged/eye.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/eye.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -92,7 +92,7 @@ /* First step: put eye at view center (view 0, 0, 0) */ MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, eye_model); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); /* Second step: put eye at view 0, 0, 1. * For eye to be at 0, 0, 1, the old 0, 0, -1 needs to become 0, 0, 0. @@ -100,7 +100,7 @@ VSET(xlate, 0.0, 0.0, -1.0); /* correction factor */ MAT4X3PNT(new_cent, gedp->ged_gvp->gv_view2model, xlate); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, new_cent); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return TCL_OK; } Modified: brlcad/trunk/src/libged/eye_pos.c =================================================================== --- brlcad/trunk/src/libged/eye_pos.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/eye_pos.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -85,7 +85,7 @@ /* update perspective matrix */ ged_mike_persp_mat(gedp->ged_gvp->gv_pmat, gedp->ged_gvp->gv_eye_pos); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/ged.c =================================================================== --- brlcad/trunk/src/libged/ged.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/ged.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -219,8 +219,8 @@ VSET(gvp->gv_view_scale.gos_line_color, 255, 255, 0); VSET(gvp->gv_view_scale.gos_text_color, 255, 255, 255); - ged_mat_aet(gvp); - ged_view_update(gvp); + _ged_mat_aet(gvp); + _ged_view_update(gvp); } struct ged * Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/ged_private.h 2009-10-15 21:13:35 UTC (rev 36199) @@ -464,18 +464,18 @@ /* defined in tops.c */ struct directory ** -ged_dir_getspace(struct db_i *dbip, +_ged_dir_getspace(struct db_i *dbip, register int num_entries); /* defined in trace.c */ -BU_EXTERN (void ged_trace, +BU_EXTERN (void _ged_trace, (register struct directory *dp, int pathpos, const mat_t old_xlate, struct _ged_trace_data *gtdp)); /* defined in translate_extrude.c */ -BU_EXTERN (int ged_translate_extrude, +BU_EXTERN (int _ged_translate_extrude, (struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, @@ -483,7 +483,7 @@ int rflag)); /* defined in translate_tgc.c */ -BU_EXTERN (int ged_translate_tgc, +BU_EXTERN (int _ged_translate_tgc, (struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, @@ -491,19 +491,19 @@ int rflag)); /* defined in vutil.c */ -BU_EXTERN (void ged_view_update, +BU_EXTERN (void _ged_view_update, (struct ged_view *gvp)); -BU_EXTERN (void ged_mat_aet, +BU_EXTERN (void _ged_mat_aet, (struct ged_view *gvp)); -BU_EXTERN (int ged_do_rot, +BU_EXTERN (int _ged_do_rot, (struct ged *gedp, char coord, mat_t rmat, int (*func)())); -BU_EXTERN (int ged_do_slew, +BU_EXTERN (int _ged_do_slew, (struct ged *gedp, vect_t svec)); -BU_EXTERN (int ged_do_tra, +BU_EXTERN (int _ged_do_tra, (struct ged *gedp, char coord, vect_t tvec, Modified: brlcad/trunk/src/libged/get_obj_bounds.c =================================================================== --- brlcad/trunk/src/libged/get_obj_bounds.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/get_obj_bounds.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -218,7 +218,7 @@ } MAT_IDN(gtdp->gtd_xform); - ged_trace(gtdp->gtd_obj[0], 0, bn_mat_identity, gtdp); + _ged_trace(gtdp->gtd_obj[0], 0, bn_mat_identity, gtdp); return GED_OK; } Modified: brlcad/trunk/src/libged/grid.c =================================================================== --- brlcad/trunk/src/libged/grid.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/grid.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -337,7 +337,7 @@ ged_snap_to_grid(gedp, &view_pt[X], &view_pt[Y]); MAT4X3PNT(model_pt, gedp->ged_gvp->gv_view2model, view_pt); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, model_pt); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); } Modified: brlcad/trunk/src/libged/loadview.c =================================================================== --- brlcad/trunk/src/libged/loadview.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/loadview.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -239,7 +239,7 @@ /* First step: put eye at view center (view 0, 0, 0) */ MAT_COPY(gedp->ged_gvp->gv_rotation, _ged_viewrot); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, _ged_eye_model); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/lookat.c =================================================================== --- brlcad/trunk/src/libged/lookat.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/lookat.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -94,12 +94,12 @@ bn_ae_vec(&new_az, &new_el, dir); VSET(gedp->ged_gvp->gv_aet, new_az, new_el, gedp->ged_gvp->gv_aet[Z]); - ged_mat_aet(gedp->ged_gvp); + _ged_mat_aet(gedp->ged_gvp); VJOIN1(new_center, eye, -gedp->ged_gvp->gv_scale, dir); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, new_center); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/mirror.c =================================================================== --- brlcad/trunk/src/libged/mirror.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/mirror.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -193,7 +193,7 @@ NULL }; (void)ged_draw(gedp, 2, e_argv); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); } return GED_OK; Modified: brlcad/trunk/src/libged/orient.c =================================================================== --- brlcad/trunk/src/libged/orient.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/orient.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -74,7 +74,7 @@ } quat_quat2mat(gedp->ged_gvp->gv_rotation, quat); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/pathsum.c =================================================================== --- brlcad/trunk/src/libged/pathsum.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/pathsum.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -101,7 +101,7 @@ MAT_IDN(gtd.gtd_xform); - ged_trace(gtd.gtd_obj[0], 0, bn_mat_identity, >d); + _ged_trace(gtd.gtd_obj[0], 0, bn_mat_identity, >d); if (gtd.gtd_prflag == 0) { /* path not found */ Modified: brlcad/trunk/src/libged/perspective.c =================================================================== --- brlcad/trunk/src/libged/perspective.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/perspective.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -67,7 +67,7 @@ #else ged_mike_persp_mat(gedp->ged_gvp->gv_pmat, gedp->ged_gvp->gv_eye_pos); #endif - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/pmat.c =================================================================== --- brlcad/trunk/src/libged/pmat.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/pmat.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -55,7 +55,7 @@ return TCL_ERROR; MAT_COPY(gedp->ged_gvp->gv_pmat, pmat); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return TCL_OK; } Modified: brlcad/trunk/src/libged/pov.c =================================================================== --- brlcad/trunk/src/libged/pov.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/pov.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -98,7 +98,7 @@ VMOVE(gedp->ged_gvp->gv_eye_pos, eye_pos); gedp->ged_gvp->gv_perspective = perspective; - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/preview.c =================================================================== --- brlcad/trunk/src/libged/preview.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/preview.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -102,7 +102,7 @@ /* First step: put eye at view center (view 0, 0, 0) */ MAT_COPY(_ged_current_gedp->ged_gvp->gv_rotation, _ged_viewrot); MAT_DELTAS_VEC_NEG(_ged_current_gedp->ged_gvp->gv_center, _ged_eye_model); - ged_view_update(_ged_current_gedp->ged_gvp); + _ged_view_update(_ged_current_gedp->ged_gvp); /* * Compute camera orientation notch to right (+X) and up (+Y) @@ -123,7 +123,7 @@ VSET(xlate, 0.0, 0.0, -1.0); /* correction factor */ MAT4X3PNT(new_cent, _ged_current_gedp->ged_gvp->gv_view2model, xlate); MAT_DELTAS_VEC_NEG(_ged_current_gedp->ged_gvp->gv_center, new_cent); - ged_view_update(_ged_current_gedp->ged_gvp); + _ged_view_update(_ged_current_gedp->ged_gvp); /* If new treewalk is needed, get new objects into view. */ if ( preview_tree_walk_needed ) { Modified: brlcad/trunk/src/libged/ptranslate.c =================================================================== --- brlcad/trunk/src/libged/ptranslate.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/ptranslate.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -107,10 +107,10 @@ switch (intern.idb_minor_type) { case DB5_MINORTYPE_BRLCAD_TGC: - ret = ged_translate_tgc(gedp, (struct rt_tgc_internal *)intern.idb_ptr, argv[2], tvec, rflag); + ret = _ged_translate_tgc(gedp, (struct rt_tgc_internal *)intern.idb_ptr, argv[2], tvec, rflag); break; case DB5_MINORTYPE_BRLCAD_EXTRUDE: - ret = ged_translate_extrude(gedp, (struct rt_extrude_internal *)intern.idb_ptr, argv[2], tvec, rflag); + ret = _ged_translate_extrude(gedp, (struct rt_extrude_internal *)intern.idb_ptr, argv[2], tvec, rflag); break; default: bu_vls_printf(&gedp->ged_result_str, "%s: Object not yet supported.", argv[0]); Modified: brlcad/trunk/src/libged/quat.c =================================================================== --- brlcad/trunk/src/libged/quat.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/quat.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -70,7 +70,7 @@ } quat_quat2mat(gedp->ged_gvp->gv_rotation, quat); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/qvrot.c =================================================================== --- brlcad/trunk/src/libged/qvrot.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/qvrot.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -95,7 +95,7 @@ bn_mat_angles(gedp->ged_gvp->gv_rotation, 270.0 + el * bn_radtodeg, 0.0, 270.0 - az * bn_radtodeg); ged_usejoy(gedp, 0.0, 0.0, theta*bn_degtorad); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/rect.c =================================================================== --- brlcad/trunk/src/libged/rect.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/rect.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -551,7 +551,7 @@ /* set the new model center */ MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, new_model_center); gedp->ged_gvp->gv_scale *= sf; - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); #if 0 gedp->ged_gvp->gv_rect.grs_x = -1.0; Modified: brlcad/trunk/src/libged/rmat.c =================================================================== --- brlcad/trunk/src/libged/rmat.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/rmat.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -55,7 +55,7 @@ return GED_ERROR; MAT_COPY(gedp->ged_gvp->gv_rotation, rotation); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return TCL_OK; } Modified: brlcad/trunk/src/libged/rot.c =================================================================== --- brlcad/trunk/src/libged/rot.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/rot.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -103,7 +103,7 @@ if ((ret = ged_rot_args(gedp, argc, argv, &coord, rmat)) != GED_OK) return ret; - return ged_do_rot(gedp, coord, rmat, (int (*)())0); + return _ged_do_rot(gedp, coord, rmat, (int (*)())0); } /* Modified: brlcad/trunk/src/libged/rrt.c =================================================================== --- brlcad/trunk/src/libged/rrt.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/rrt.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -62,7 +62,7 @@ _ged_current_gedp = gedp; _ged_setup_rt(gedp, vp, 1); - (void)ged_run_rt(gedp); + (void)_ged_run_rt(gedp); return GED_OK; } Modified: brlcad/trunk/src/libged/rt.c =================================================================== --- brlcad/trunk/src/libged/rt.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/rt.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -126,14 +126,14 @@ bu_vls_printf(&gedp->ged_result_str, "\n"); } - (void)ged_run_rt(gedp); + (void)_ged_run_rt(gedp); return GED_OK; } int -ged_run_rt(struct ged *gedp) +_ged_run_rt(struct ged *gedp) { register int i; FILE *fp_in; Modified: brlcad/trunk/src/libged/scale.c =================================================================== --- brlcad/trunk/src/libged/scale.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/scale.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -83,7 +83,7 @@ gedp->ged_gvp->gv_scale = RT_MINVIEWSIZE; gedp->ged_gvp->gv_size = 2.0 * gedp->ged_gvp->gv_scale; gedp->ged_gvp->gv_isize = 1.0 / gedp->ged_gvp->gv_size; - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/setview.c =================================================================== --- brlcad/trunk/src/libged/setview.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/setview.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -81,7 +81,7 @@ } bn_mat_angles(gedp->ged_gvp->gv_rotation, rvec[X], rvec[Y], rvec[Z]); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/size.c =================================================================== --- brlcad/trunk/src/libged/size.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/size.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -67,7 +67,7 @@ gedp->ged_gvp->gv_size = RT_MINVIEWSIZE; gedp->ged_gvp->gv_isize = 1.0 / gedp->ged_gvp->gv_size; gedp->ged_gvp->gv_scale = 0.5 * gedp->ged_gvp->gv_size; - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/slew.c =================================================================== --- brlcad/trunk/src/libged/slew.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/slew.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -64,7 +64,7 @@ svec[Z] = 0.0; } - return ged_do_slew(gedp, svec); + return _ged_do_slew(gedp, svec); } if (argc == 3 || argc == 4) { @@ -86,7 +86,7 @@ } else svec[Z] = 0.0; - return ged_do_slew(gedp, svec); + return _ged_do_slew(gedp, svec); } bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage); Modified: brlcad/trunk/src/libged/summary.c =================================================================== --- brlcad/trunk/src/libged/summary.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/summary.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -123,7 +123,7 @@ /* Print all names matching the flags parameter */ /* THIS MIGHT WANT TO BE SEPARATED OUT BY CATEGORY */ - dirp = ged_dir_getspace(gedp->ged_wdbp->dbip, 0); + dirp = _ged_dir_getspace(gedp->ged_wdbp->dbip, 0); dirp0 = dirp; /* * Walk the directory list adding pointers (to the directory entries Modified: brlcad/trunk/src/libged/tops.c =================================================================== --- brlcad/trunk/src/libged/tops.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/tops.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -99,7 +99,7 @@ /* * Find number of possible entries and allocate memory */ - dirp = ged_dir_getspace(gedp->ged_wdbp->dbip, 0); + dirp = _ged_dir_getspace(gedp->ged_wdbp->dbip, 0); dirp0 = dirp; if (gedp->ged_wdbp->dbip->dbi_version < 5) { @@ -153,7 +153,7 @@ * b) the number of entries specified by the argument if > 0. */ struct directory ** -ged_dir_getspace(struct db_i *dbip, +_ged_dir_getspace(struct db_i *dbip, register int num_entries) { register struct directory *dp; Modified: brlcad/trunk/src/libged/tra.c =================================================================== --- brlcad/trunk/src/libged/tra.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/tra.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -99,7 +99,7 @@ if ((ret = ged_tra_args(gedp, argc, argv, &coord, tvec)) != GED_OK) return ret; - return ged_do_tra(gedp, coord, tvec, (int (*)())0); + return _ged_do_tra(gedp, coord, tvec, (int (*)())0); } Modified: brlcad/trunk/src/libged/trace.c =================================================================== --- brlcad/trunk/src/libged/trace.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/trace.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -71,7 +71,7 @@ MAT_COPY(new_xlate, old_xlate); } - ged_trace(nextdp, (*pathpos)+1, new_xlate, gtdp); + _ged_trace(nextdp, (*pathpos)+1, new_xlate, gtdp); } /** @@ -79,7 +79,7 @@ * */ void -ged_trace(register struct directory *dp, +_ged_trace(register struct directory *dp, int pathpos, const mat_t old_xlate, struct _ged_trace_data *gtdp) Modified: brlcad/trunk/src/libged/translate_extrude.c =================================================================== --- brlcad/trunk/src/libged/translate_extrude.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/translate_extrude.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -36,7 +36,7 @@ int -ged_translate_extrude(struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, vect_t tvec, int rflag) +_ged_translate_extrude(struct ged *gedp, struct rt_extrude_internal *extrude, const char *attribute, vect_t tvec, int rflag) { vect_t hvec; Modified: brlcad/trunk/src/libged/translate_tgc.c =================================================================== --- brlcad/trunk/src/libged/translate_tgc.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/translate_tgc.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -36,7 +36,7 @@ int -ged_translate_tgc(struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, vect_t tvec, int rflag) +_ged_translate_tgc(struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, vect_t tvec, int rflag) { fastf_t la, lb, lc, ld; vect_t hvec; Modified: brlcad/trunk/src/libged/vutil.c =================================================================== --- brlcad/trunk/src/libged/vutil.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/vutil.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -31,7 +31,7 @@ void -ged_view_update(struct ged_view *gvp) +_ged_view_update(struct ged_view *gvp) { vect_t work, work1; vect_t temp, temp1; @@ -72,7 +72,7 @@ } void -ged_mat_aet(struct ged_view *gvp) +_ged_mat_aet(struct ged_view *gvp) { mat_t tmat; fastf_t twist; @@ -92,7 +92,7 @@ } int -ged_do_rot(struct ged *gedp, +_ged_do_rot(struct ged *gedp, char coord, mat_t rmat, int (*func)()) @@ -150,25 +150,25 @@ /* pure rotation */ bn_mat_mul2(rmat, gedp->ged_gvp->gv_rotation); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } int -ged_do_slew(struct ged *gedp, vect_t svec) +_ged_do_slew(struct ged *gedp, vect_t svec) { point_t model_center; MAT4X3PNT(model_center, gedp->ged_gvp->gv_view2model, svec); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, model_center); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } int -ged_do_tra(struct ged *gedp, +_ged_do_tra(struct ged *gedp, char coord, vect_t tvec, int (*func)()) @@ -196,20 +196,20 @@ VSUB2(nvc, vc, delta); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, nvc); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } int -ged_do_zoom(struct ged *gedp, fastf_t sf) +_ged_do_zoom(struct ged *gedp, fastf_t sf) { gedp->ged_gvp->gv_scale /= sf; if (gedp->ged_gvp->gv_scale < RT_MINVIEWSCALE) gedp->ged_gvp->gv_scale = RT_MINVIEWSCALE; gedp->ged_gvp->gv_size = 2.0 * gedp->ged_gvp->gv_scale; gedp->ged_gvp->gv_isize = 1.0 / gedp->ged_gvp->gv_size; - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/wdb_obj.c =================================================================== --- brlcad/trunk/src/libged/wdb_obj.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/wdb_obj.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -2357,7 +2357,7 @@ MAT_IDN(gtd.gtd_xform); - ged_trace(gtd.gtd_obj[0], 0, bn_mat_identity, >d); + _ged_trace(gtd.gtd_obj[0], 0, bn_mat_identity, >d); if (gtd.gtd_prflag == 0) { /* path not found */ @@ -3663,7 +3663,7 @@ return TCL_ERROR; } - ged_trace(gtd.gtd_obj[0], 0, start_mat, >d); + _ged_trace(gtd.gtd_obj[0], 0, start_mat, >d); if (gtd.gtd_prflag == 0) { Tcl_AppendResult(interp, "PATH: ", (char *)NULL); Modified: brlcad/trunk/src/libged/ypr.c =================================================================== --- brlcad/trunk/src/libged/ypr.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/ypr.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -82,7 +82,7 @@ anim_dy_p_r2mat(mat, V3ARGS(ypr)); anim_v_permute(mat); bn_mat_trn(gedp->ged_gvp->gv_rotation, mat); - ged_view_update(gedp->ged_gvp); + _ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/zoom.c =================================================================== --- brlcad/trunk/src/libged/zoom.c 2009-10-15 20:17:31 UTC (rev 36198) +++ brlcad/trunk/src/libged/zoom.c 2009-10-15 21:13:35 UTC (rev 36199) @@ -63,7 +63,7 @@ return GED_ERROR; } - return ged_do_zoom(gedp, sf); + return _ged_do_zoom(gedp, sf); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-16 01:18:42
|
Revision: 36200 http://brlcad.svn.sourceforge.net/brlcad/?rev=36200&view=rev Author: starseeker Date: 2009-10-16 01:18:33 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Grumble... ged_private.h duplicates some stuff in ged.h, clear it out of private and revert the _ged notation for those instances. Modified Paths: -------------- brlcad/trunk/src/libged/aet.c brlcad/trunk/src/libged/autoview.c brlcad/trunk/src/libged/center.c brlcad/trunk/src/libged/eye.c brlcad/trunk/src/libged/eye_pos.c brlcad/trunk/src/libged/ged.c brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/grid.c brlcad/trunk/src/libged/loadview.c brlcad/trunk/src/libged/lookat.c brlcad/trunk/src/libged/mirror.c brlcad/trunk/src/libged/nirt.c brlcad/trunk/src/libged/orient.c brlcad/trunk/src/libged/perspective.c brlcad/trunk/src/libged/pmat.c brlcad/trunk/src/libged/pov.c brlcad/trunk/src/libged/preview.c brlcad/trunk/src/libged/quat.c brlcad/trunk/src/libged/qvrot.c brlcad/trunk/src/libged/rect.c brlcad/trunk/src/libged/rmat.c brlcad/trunk/src/libged/rt.c brlcad/trunk/src/libged/rtcheck.c brlcad/trunk/src/libged/scale.c brlcad/trunk/src/libged/setview.c brlcad/trunk/src/libged/size.c brlcad/trunk/src/libged/solids_on_ray.c brlcad/trunk/src/libged/vutil.c brlcad/trunk/src/libged/ypr.c Modified: brlcad/trunk/src/libged/aet.c =================================================================== --- brlcad/trunk/src/libged/aet.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/aet.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -77,7 +77,7 @@ VMOVE(gedp->ged_gvp->gv_aet, aet); } _ged_mat_aet(gedp->ged_gvp); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } @@ -107,7 +107,7 @@ VMOVE(gedp->ged_gvp->gv_aet, aet); } _ged_mat_aet(gedp->ged_gvp); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/autoview.c =================================================================== --- brlcad/trunk/src/libged/autoview.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/autoview.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -112,7 +112,7 @@ gedp->ged_gvp->gv_size = 2.0 * gedp->ged_gvp->gv_scale; gedp->ged_gvp->gv_isize = 1.0 / gedp->ged_gvp->gv_size; - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/center.c =================================================================== --- brlcad/trunk/src/libged/center.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/center.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -85,7 +85,7 @@ VSCALE(center, center, gedp->ged_wdbp->dbip->dbi_local2base); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, center); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/eye.c =================================================================== --- brlcad/trunk/src/libged/eye.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/eye.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -92,7 +92,7 @@ /* First step: put eye at view center (view 0, 0, 0) */ MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, eye_model); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); /* Second step: put eye at view 0, 0, 1. * For eye to be at 0, 0, 1, the old 0, 0, -1 needs to become 0, 0, 0. @@ -100,7 +100,7 @@ VSET(xlate, 0.0, 0.0, -1.0); /* correction factor */ MAT4X3PNT(new_cent, gedp->ged_gvp->gv_view2model, xlate); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, new_cent); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return TCL_OK; } Modified: brlcad/trunk/src/libged/eye_pos.c =================================================================== --- brlcad/trunk/src/libged/eye_pos.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/eye_pos.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -85,7 +85,7 @@ /* update perspective matrix */ ged_mike_persp_mat(gedp->ged_gvp->gv_pmat, gedp->ged_gvp->gv_eye_pos); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/ged.c =================================================================== --- brlcad/trunk/src/libged/ged.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/ged.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -220,7 +220,7 @@ VSET(gvp->gv_view_scale.gos_text_color, 255, 255, 255); _ged_mat_aet(gvp); - _ged_view_update(gvp); + ged_view_update(gvp); } struct ged * Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/ged_private.h 2009-10-16 01:18:33 UTC (rev 36200) @@ -328,10 +328,6 @@ BU_EXTERN (void _ged_rt_output_handler, (ClientData clientData, int mask)); -BU_EXTERN (int _ged_build_tops, - (struct ged *gedp, - char **start, - register char **end)); /* defined in rtcheck.c */ BU_EXTERN (void _ged_wait_status, @@ -491,8 +487,6 @@ int rflag)); /* defined in vutil.c */ -BU_EXTERN (void _ged_view_update, - (struct ged_view *gvp)); BU_EXTERN (void _ged_mat_aet, (struct ged_view *gvp)); BU_EXTERN (int _ged_do_rot, @@ -512,8 +506,6 @@ (struct ged *gedp, fastf_t sf)); - - __END_DECLS #endif /* __GED_PRIVATE_H__ */ Modified: brlcad/trunk/src/libged/grid.c =================================================================== --- brlcad/trunk/src/libged/grid.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/grid.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -337,7 +337,7 @@ ged_snap_to_grid(gedp, &view_pt[X], &view_pt[Y]); MAT4X3PNT(model_pt, gedp->ged_gvp->gv_view2model, view_pt); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, model_pt); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); } Modified: brlcad/trunk/src/libged/loadview.c =================================================================== --- brlcad/trunk/src/libged/loadview.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/loadview.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -239,7 +239,7 @@ /* First step: put eye at view center (view 0, 0, 0) */ MAT_COPY(gedp->ged_gvp->gv_rotation, _ged_viewrot); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, _ged_eye_model); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/lookat.c =================================================================== --- brlcad/trunk/src/libged/lookat.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/lookat.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -99,7 +99,7 @@ VJOIN1(new_center, eye, -gedp->ged_gvp->gv_scale, dir); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, new_center); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/mirror.c =================================================================== --- brlcad/trunk/src/libged/mirror.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/mirror.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -193,7 +193,7 @@ NULL }; (void)ged_draw(gedp, 2, e_argv); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); } return GED_OK; Modified: brlcad/trunk/src/libged/nirt.c =================================================================== --- brlcad/trunk/src/libged/nirt.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/nirt.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -276,8 +276,8 @@ gedp->ged_gdp->gd_rt_cmd_len = vp - gedp->ged_gdp->gd_rt_cmd; - /* Note - _ged_build_tops sets the last vp to (char *)0 */ - gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, + /* Note - ged_build_tops sets the last vp to (char *)0 */ + gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, vp, &gedp->ged_gdp->gd_rt_cmd[RT_MAXARGS]); Modified: brlcad/trunk/src/libged/orient.c =================================================================== --- brlcad/trunk/src/libged/orient.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/orient.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -74,7 +74,7 @@ } quat_quat2mat(gedp->ged_gvp->gv_rotation, quat); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/perspective.c =================================================================== --- brlcad/trunk/src/libged/perspective.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/perspective.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -67,7 +67,7 @@ #else ged_mike_persp_mat(gedp->ged_gvp->gv_pmat, gedp->ged_gvp->gv_eye_pos); #endif - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/pmat.c =================================================================== --- brlcad/trunk/src/libged/pmat.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/pmat.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -55,7 +55,7 @@ return TCL_ERROR; MAT_COPY(gedp->ged_gvp->gv_pmat, pmat); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return TCL_OK; } Modified: brlcad/trunk/src/libged/pov.c =================================================================== --- brlcad/trunk/src/libged/pov.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/pov.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -98,7 +98,7 @@ VMOVE(gedp->ged_gvp->gv_eye_pos, eye_pos); gedp->ged_gvp->gv_perspective = perspective; - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/preview.c =================================================================== --- brlcad/trunk/src/libged/preview.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/preview.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -102,7 +102,7 @@ /* First step: put eye at view center (view 0, 0, 0) */ MAT_COPY(_ged_current_gedp->ged_gvp->gv_rotation, _ged_viewrot); MAT_DELTAS_VEC_NEG(_ged_current_gedp->ged_gvp->gv_center, _ged_eye_model); - _ged_view_update(_ged_current_gedp->ged_gvp); + ged_view_update(_ged_current_gedp->ged_gvp); /* * Compute camera orientation notch to right (+X) and up (+Y) @@ -123,7 +123,7 @@ VSET(xlate, 0.0, 0.0, -1.0); /* correction factor */ MAT4X3PNT(new_cent, _ged_current_gedp->ged_gvp->gv_view2model, xlate); MAT_DELTAS_VEC_NEG(_ged_current_gedp->ged_gvp->gv_center, new_cent); - _ged_view_update(_ged_current_gedp->ged_gvp); + ged_view_update(_ged_current_gedp->ged_gvp); /* If new treewalk is needed, get new objects into view. */ if ( preview_tree_walk_needed ) { @@ -194,7 +194,7 @@ _ged_setup_rt(struct ged *gedp, register char **vp, int printcmd) { _ged_current_gedp->ged_gdp->gd_rt_cmd_len = vp - _ged_current_gedp->ged_gdp->gd_rt_cmd; - _ged_current_gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, + _ged_current_gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, vp, &_ged_current_gedp->ged_gdp->gd_rt_cmd[MAXARGS]); if (printcmd) { Modified: brlcad/trunk/src/libged/quat.c =================================================================== --- brlcad/trunk/src/libged/quat.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/quat.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -70,7 +70,7 @@ } quat_quat2mat(gedp->ged_gvp->gv_rotation, quat); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/qvrot.c =================================================================== --- brlcad/trunk/src/libged/qvrot.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/qvrot.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -95,7 +95,7 @@ bn_mat_angles(gedp->ged_gvp->gv_rotation, 270.0 + el * bn_radtodeg, 0.0, 270.0 - az * bn_radtodeg); ged_usejoy(gedp, 0.0, 0.0, theta*bn_degtorad); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/rect.c =================================================================== --- brlcad/trunk/src/libged/rect.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/rect.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -551,7 +551,7 @@ /* set the new model center */ MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, new_model_center); gedp->ged_gvp->gv_scale *= sf; - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); #if 0 gedp->ged_gvp->gv_rect.grs_x = -1.0; Modified: brlcad/trunk/src/libged/rmat.c =================================================================== --- brlcad/trunk/src/libged/rmat.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/rmat.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -55,7 +55,7 @@ return GED_ERROR; MAT_COPY(gedp->ged_gvp->gv_rotation, rotation); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return TCL_OK; } Modified: brlcad/trunk/src/libged/rt.c =================================================================== --- brlcad/trunk/src/libged/rt.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/rt.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -113,7 +113,7 @@ */ if (i == argc) { gedp->ged_gdp->gd_rt_cmd_len = vp - gedp->ged_gdp->gd_rt_cmd; - gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, + gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, vp, &gedp->ged_gdp->gd_rt_cmd[MAXARGS]); } else { @@ -466,7 +466,7 @@ * Build a command line vector of the tops of all objects in view. */ int -_ged_build_tops(struct ged *gedp, +ged_build_tops(struct ged *gedp, char **start, register char **end) { Modified: brlcad/trunk/src/libged/rtcheck.c =================================================================== --- brlcad/trunk/src/libged/rtcheck.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/rtcheck.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -149,7 +149,7 @@ */ if (i == argc) { gedp->ged_gdp->gd_rt_cmd_len = vp - gedp->ged_gdp->gd_rt_cmd; - gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, + gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, vp, &gedp->ged_gdp->gd_rt_cmd[MAXARGS]); } else { @@ -252,7 +252,7 @@ */ if (i == argc) { gedp->ged_gdp->gd_rt_cmd_len = vp - gedp->ged_gdp->gd_rt_cmd; - gedp->ged_gdp->gd_rt_cmd_len += _ged_build_tops(gedp, + gedp->ged_gdp->gd_rt_cmd_len += ged_build_tops(gedp, vp, &gedp->ged_gdp->gd_rt_cmd[MAXARGS]); } else { Modified: brlcad/trunk/src/libged/scale.c =================================================================== --- brlcad/trunk/src/libged/scale.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/scale.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -34,7 +34,7 @@ int -_ged_scale_args(struct ged *gedp, int argc, const char *argv[], fastf_t *sf) +ged_scale_args(struct ged *gedp, int argc, const char *argv[], fastf_t *sf) { static const char *usage = "sf"; @@ -65,12 +65,12 @@ } int -_ged_scale(struct ged *gedp, int argc, const char *argv[]) +ged_scale(struct ged *gedp, int argc, const char *argv[]) { int ret; fastf_t sf; - if ((ret = _ged_scale_args(gedp, argc, argv, &sf)) != GED_OK) + if ((ret = ged_scale_args(gedp, argc, argv, &sf)) != GED_OK) return ret; if (sf <= SMALL_FASTF || INFINITY < sf) @@ -83,7 +83,7 @@ gedp->ged_gvp->gv_scale = RT_MINVIEWSIZE; gedp->ged_gvp->gv_size = 2.0 * gedp->ged_gvp->gv_scale; gedp->ged_gvp->gv_isize = 1.0 / gedp->ged_gvp->gv_size; - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/setview.c =================================================================== --- brlcad/trunk/src/libged/setview.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/setview.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -81,7 +81,7 @@ } bn_mat_angles(gedp->ged_gvp->gv_rotation, rvec[X], rvec[Y], rvec[Z]); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/size.c =================================================================== --- brlcad/trunk/src/libged/size.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/size.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -67,7 +67,7 @@ gedp->ged_gvp->gv_size = RT_MINVIEWSIZE; gedp->ged_gvp->gv_isize = 1.0 / gedp->ged_gvp->gv_size; gedp->ged_gvp->gv_scale = 0.5 * gedp->ged_gvp->gv_size; - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/solids_on_ray.c =================================================================== --- brlcad/trunk/src/libged/solids_on_ray.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/solids_on_ray.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -134,7 +134,7 @@ /* * Build a list of all the top-level objects currently displayed */ - rt_cmd_vec_len = _ged_build_tops(gedp, &rt_cmd_vec[0], &rt_cmd_vec[MAXARGS]); + rt_cmd_vec_len = ged_build_tops(gedp, &rt_cmd_vec[0], &rt_cmd_vec[MAXARGS]); #if 0 start_catching_output(&gedp->ged_result_str); Modified: brlcad/trunk/src/libged/vutil.c =================================================================== --- brlcad/trunk/src/libged/vutil.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/vutil.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -31,7 +31,7 @@ void -_ged_view_update(struct ged_view *gvp) +ged_view_update(struct ged_view *gvp) { vect_t work, work1; vect_t temp, temp1; @@ -150,7 +150,7 @@ /* pure rotation */ bn_mat_mul2(rmat, gedp->ged_gvp->gv_rotation); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } @@ -162,7 +162,7 @@ MAT4X3PNT(model_center, gedp->ged_gvp->gv_view2model, svec); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, model_center); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } @@ -196,7 +196,7 @@ VSUB2(nvc, vc, delta); MAT_DELTAS_VEC_NEG(gedp->ged_gvp->gv_center, nvc); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } @@ -209,7 +209,7 @@ gedp->ged_gvp->gv_scale = RT_MINVIEWSCALE; gedp->ged_gvp->gv_size = 2.0 * gedp->ged_gvp->gv_scale; gedp->ged_gvp->gv_isize = 1.0 / gedp->ged_gvp->gv_size; - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } Modified: brlcad/trunk/src/libged/ypr.c =================================================================== --- brlcad/trunk/src/libged/ypr.c 2009-10-15 21:13:35 UTC (rev 36199) +++ brlcad/trunk/src/libged/ypr.c 2009-10-16 01:18:33 UTC (rev 36200) @@ -82,7 +82,7 @@ anim_dy_p_r2mat(mat, V3ARGS(ypr)); anim_v_permute(mat); bn_mat_trn(gedp->ged_gvp->gv_rotation, mat); - _ged_view_update(gedp->ged_gvp); + ged_view_update(gedp->ged_gvp); return GED_OK; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-16 01:42:18
|
Revision: 36201 http://brlcad.svn.sourceforge.net/brlcad/?rev=36201&view=rev Author: starseeker Date: 2009-10-16 01:42:11 +0000 (Fri, 16 Oct 2009) Log Message: ----------- add a file to use while trying out ideas for libged results manipulation. Modified Paths: -------------- brlcad/trunk/src/libged/Makefile.am brlcad/trunk/src/libged/ged_private.h Added Paths: ----------- brlcad/trunk/src/libged/ged_util.c Modified: brlcad/trunk/src/libged/Makefile.am =================================================================== --- brlcad/trunk/src/libged/Makefile.am 2009-10-16 01:18:33 UTC (rev 36200) +++ brlcad/trunk/src/libged/Makefile.am 2009-10-16 01:42:11 UTC (rev 36201) @@ -74,6 +74,7 @@ form.c \ fracture.c \ ged.c \ + ged_util.c \ get.c \ get_autoview.c \ get_comb.c \ Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-10-16 01:18:33 UTC (rev 36200) +++ brlcad/trunk/src/libged/ged_private.h 2009-10-16 01:42:11 UTC (rev 36201) @@ -506,6 +506,18 @@ (struct ged *gedp, fastf_t sf)); +/* defined in ged_util.c */ +BU_EXTERN (int _ged_results_append_str, + (char *result_string, + struct ged *gedp)); + +BU_EXTERN (int _ged_results_append_vls, + (struct bu_vls *result_vls, + struct ged *gedp)); + +BU_EXTERN (int _ged_results_clear, + (struct ged *gedp)); + __END_DECLS #endif /* __GED_PRIVATE_H__ */ Added: brlcad/trunk/src/libged/ged_util.c =================================================================== --- brlcad/trunk/src/libged/ged_util.c (rev 0) +++ brlcad/trunk/src/libged/ged_util.c 2009-10-16 01:42:11 UTC (rev 36201) @@ -0,0 +1,75 @@ +/* G E D _ U T I L . C + * BRL-CAD + * + * Copyright (c) 2000-2009 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + */ +/** @addtogroup libged */ +/** @{ */ +/** @file ged_util.c + * + * Utility routines for common operations in libged. + * + */ +/** @} */ + +#include "common.h" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <math.h> +#include "bio.h" + +#include "bu.h" +#include "vmath.h" +#include "bn.h" +#include "rtgeom.h" +#include "raytrace.h" +#include "plot3.h" + +#include "./ged_private.h" + +int +_ged_results_append_str(char *result_string, struct ged *gedp) +{ + bu_vls_printf(&gedp->ged_result_str, "%s", result_string); + return GED_OK; +} + +int +_ged_results_append_vls(struct bu_vls *result_vls, struct ged *gedp) +{ + bu_vls_printf(&gedp->ged_result_str, "%s", bu_vls_addr(&result_vls)); + return GED_OK; +} + +int +_ged_results_clear(struct ged *gedp) +{ + bu_vls_trunc(&gedp->ged_result_str, 0); + return GED_OK; +} + +/* + * Local Variables: + * mode: C + * tab-width: 8 + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Property changes on: brlcad/trunk/src/libged/ged_util.c ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-16 02:39:36
|
Revision: 36202 http://brlcad.svn.sourceforge.net/brlcad/?rev=36202&view=rev Author: starseeker Date: 2009-10-16 02:39:29 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Switch order of paramters - struct ged comes first. Modified Paths: -------------- brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/ged_util.c Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-10-16 01:42:11 UTC (rev 36201) +++ brlcad/trunk/src/libged/ged_private.h 2009-10-16 02:39:29 UTC (rev 36202) @@ -508,12 +508,12 @@ /* defined in ged_util.c */ BU_EXTERN (int _ged_results_append_str, - (char *result_string, - struct ged *gedp)); + (struct ged *gedp, + char *result_string)); BU_EXTERN (int _ged_results_append_vls, - (struct bu_vls *result_vls, - struct ged *gedp)); + (struct ged *gedp, + struct bu_vls *result_vls)); BU_EXTERN (int _ged_results_clear, (struct ged *gedp)); Modified: brlcad/trunk/src/libged/ged_util.c =================================================================== --- brlcad/trunk/src/libged/ged_util.c 2009-10-16 01:42:11 UTC (rev 36201) +++ brlcad/trunk/src/libged/ged_util.c 2009-10-16 02:39:29 UTC (rev 36202) @@ -44,14 +44,14 @@ #include "./ged_private.h" int -_ged_results_append_str(char *result_string, struct ged *gedp) +_ged_results_append_str(struct ged *gedp, char *result_string) { bu_vls_printf(&gedp->ged_result_str, "%s", result_string); return GED_OK; } int -_ged_results_append_vls(struct bu_vls *result_vls, struct ged *gedp) +_ged_results_append_vls(struct ged *gedp, struct bu_vls *result_vls) { bu_vls_printf(&gedp->ged_result_str, "%s", bu_vls_addr(&result_vls)); return GED_OK; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-10-20 20:22:33
|
Revision: 36233 http://brlcad.svn.sourceforge.net/brlcad/?rev=36233&view=rev Author: brlcad Date: 2009-10-20 20:22:25 +0000 (Tue, 20 Oct 2009) Log Message: ----------- cleanup and reorder. _ged_vls_long_dpp and _ged_vls_line_dpp are not used outside of ls.c so don't need to declare them, rename without prefix to distinguish them from api. Modified Paths: -------------- brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/ls.c Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2009-10-20 19:58:48 UTC (rev 36232) +++ brlcad/trunk/src/libged/ged_private.h 2009-10-20 20:22:25 UTC (rev 36233) @@ -266,22 +266,6 @@ struct directory **list_of_names, int num_in_list, int no_decorate)); -BU_EXTERN(void _ged_vls_long_dpp, - (struct bu_vls *vls, - struct directory **list_of_names, - int num_in_list, - int aflag, /* print all objects */ - int cflag, /* print combinations */ - int rflag, /* print regions */ - int sflag)); /* print solids */ -BU_EXTERN(void _ged_vls_line_dpp, - (struct bu_vls *vls, - struct directory **list_of_names, - int num_in_list, - int aflag, /* print all objects */ - int cflag, /* print combinations */ - int rflag, /* print regions */ - int sflag)); /* print solids */ BU_EXTERN(struct directory ** _ged_getspace, (struct db_i *dbip, register int num_entries)); Modified: brlcad/trunk/src/libged/ls.c =================================================================== --- brlcad/trunk/src/libged/ls.c 2009-10-20 19:58:48 UTC (rev 36232) +++ brlcad/trunk/src/libged/ls.c 2009-10-20 20:22:25 UTC (rev 36233) @@ -38,204 +38,76 @@ #define RT_COLUMNS ((RT_TERMINAL_WIDTH + V4_MAXNAME - 1) / V4_MAXNAME) -/* - * List objects in this database +/** + * G E D _ G E T S P A C E + * + * This routine walks through the directory entry list and mallocs + * enough space for pointers to hold: + * + * a) all of the entries if called with an argument of 0, or + * b) the number of entries specified by the argument if > 0. + * + * This routine was lifted from mged/dir.c. */ -int -ged_ls(struct ged *gedp, int argc, const char *argv[]) +struct directory ** +_ged_getspace(struct db_i *dbip, + register int num_entries) { - struct bu_vls vls; - register struct directory *dp; - register int i; - int c; - int aflag = 0; /* print all objects without formatting */ - int cflag = 0; /* print combinations */ - int rflag = 0; /* print regions */ - int sflag = 0; /* print solids */ - int lflag = 0; /* use long format */ - int attr_flag = 0; /* arguments are attribute name/value pairs */ - int or_flag = 0; /* flag indicating that any one attribute match is sufficient - * default is all attributes must match. - */ - struct directory **dirp; - struct directory **dirp0 = (struct directory **)NULL; - const char *cmdname = argv[0]; - static const char *usage = "[-A name/value pairs] OR [-acrslop] object(s)"; + register struct directory **dir_basep; - GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); - GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR); - - /* initialize result */ - bu_vls_trunc(&gedp->ged_result_str, 0); - - if (MAXARGS < argc) { - bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage); - return GED_ERROR; + if (num_entries < 0) { + bu_log("_ged_getspace: was passed %d, used 0\n", + num_entries); + num_entries = 0; } - bu_vls_init(&vls); + if (num_entries == 0) num_entries = db_get_directory_size(dbip); - bu_optind = 1; /* re-init bu_getopt() */ - while ((c = bu_getopt(argc, (char * const *)argv, "acrslopA")) != EOF) { - switch (c) { - case 'A': - attr_flag = 1; - break; - case 'o': - or_flag = 1; - break; - case 'a': - aflag = 1; - break; - case 'c': - cflag = 1; - break; - case 'r': - rflag = 1; - break; - case 's': - case 'p': - sflag = 1; - break; - case 'l': - lflag = 1; - break; - default: - bu_vls_printf(&gedp->ged_result_str, "Unrecognized option - %c", c); - return GED_ERROR; - } - } - /* skip options processed plus command name, should just leave object names */ - argc -= bu_optind; - argv += bu_optind; + /* Allocate and cast num_entries worth of pointers */ + dir_basep = (struct directory **) bu_malloc((num_entries+1) * sizeof(struct directory *), + "_ged_getspace *dir[]"); + return(dir_basep); +} - /* create list of selected objects from database */ - if ( attr_flag ) { - /* select objects based on attributes */ - struct bu_ptbl *tbl; - struct bu_attribute_value_set avs; - int dir_flags; - int op; - if ( (argc < 2) || (argc%2 != 0) ) { - /* should be even number of name/value pairs */ - bu_log("ls -A option expects even number of 'name value' pairs\n"); - bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage); - return TCL_ERROR; - } - if (or_flag) { - op = 2; - } else { - op = 1; - } - - dir_flags = 0; - if (aflag) dir_flags = -1; - if (cflag) dir_flags = DIR_COMB; - if (sflag) dir_flags = DIR_SOLID; - if (rflag) dir_flags = DIR_REGION; - if (!dir_flags) dir_flags = -1 ^ DIR_HIDDEN; - - bu_avs_init( &avs, argc, "wdb_ls_cmd avs" ); - for (i = 0; i < argc; i += 2) { - if ( or_flag ) { - bu_avs_add_nonunique(&avs, (char *)argv[i], (char *)argv[i+1]); - } else { - bu_avs_add(&avs, (char *)argv[i], (char *)argv[i+1]); - } - } - - tbl = db_lookup_by_attr(gedp->ged_wdbp->dbip, dir_flags, &avs, op); - bu_avs_free(&avs); - - dirp = _ged_getspace(gedp->ged_wdbp->dbip, BU_PTBL_LEN(tbl)); - dirp0 = dirp; - for ( i=0; i<BU_PTBL_LEN( tbl ); i++ ) { - *dirp++ = (struct directory *)BU_PTBL_GET(tbl, i); - } - - bu_ptbl_free(tbl); - bu_free((char *)tbl, "wdb_ls_cmd ptbl"); - } else if (argc > 0) { - /* Just list specified names */ - dirp = _ged_getspace(gedp->ged_wdbp->dbip, argc); - dirp0 = dirp; - /* - * Verify the names, and add pointers to them to the array. - */ - for (i = 0; i < argc; i++) { - if ((dp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) == DIR_NULL) - continue; - *dirp++ = dp; - } - } else { - /* Full table of contents */ - dirp = _ged_getspace(gedp->ged_wdbp->dbip, 0); /* Enough for all */ - dirp0 = dirp; - /* - * Walk the directory list adding pointers (to the directory - * entries) to the array. - */ - for (i = 0; i < RT_DBNHASH; i++) - for (dp = gedp->ged_wdbp->dbip->dbi_Head[i]; dp != DIR_NULL; dp = dp->d_forw) { - if (!aflag && (dp->d_flags & DIR_HIDDEN)) - continue; - *dirp++ = dp; - } - } - - if (lflag) - _ged_vls_long_dpp(&gedp->ged_result_str, dirp0, (int)(dirp - dirp0), - aflag, cflag, rflag, sflag); - else if (aflag || cflag || rflag || sflag) - _ged_vls_line_dpp(&gedp->ged_result_str, dirp0, (int)(dirp - dirp0), - aflag, cflag, rflag, sflag); - else - _ged_vls_col_pr4v(&gedp->ged_result_str, dirp0, (int)(dirp - dirp0), 0); - - bu_free((genptr_t)dirp0, "_ged_getspace dp[]"); - - return GED_OK; -} - /** - * G E D _ C M P D I R N A M E + * _ G E D _ C M P D I R N A M E * - * Given two pointers to pointers to directory entries, do a string compare - * on the respective names and return that value. - * This routine was lifted from mged/columns.c. + * Given two pointers to pointers to directory entries, do a string + * compare on the respective names and return that value. This + * routine was lifted from mged/columns.c. */ -int -ged_cmpdirname(const genptr_t a, - const genptr_t b) +static int +cmpdirname(const genptr_t a, + const genptr_t b) { register struct directory **dp1, **dp2; dp1 = (struct directory **)a; dp2 = (struct directory **)b; - return( strcmp( (*dp1)->d_namep, (*dp2)->d_namep)); + return(strcmp((*dp1)->d_namep, (*dp2)->d_namep)); } /** - * G E D _ V L S _ C O L _ P R 4 V + * _ G E D _ V L S _ C O L _ P R 4 V * - * Given a pointer to a list of pointers to names and the number of names - * in that list, sort and print that list in column order over four columns. - * This routine was lifted from mged/columns.c. + * Given a pointer to a list of pointers to names and the number of + * names in that list, sort and print that list in column order over + * four columns. This routine was lifted from mged/columns.c. */ void -_ged_vls_col_pr4v(struct bu_vls *vls, - struct directory **list_of_names, - int num_in_list, - int no_decorate) +_ged_vls_col_pr4v(struct bu_vls *vls, + struct directory **list_of_names, + int num_in_list, + int no_decorate) { #if 0 int lines, i, j, namelen, this_one; qsort((genptr_t)list_of_names, (unsigned)num_in_list, (unsigned)sizeof(struct directory *), - (int (*)(const void *, const void *))ged_cmpdirname); + (int (*)(const void *, const void *))cmpdirname); /* * For the number of (full and partial) lines that will be needed, @@ -251,11 +123,11 @@ if (namelen > 16) namelen = 16; /* - * Region and ident checks here.... Since the code - * has been modified to push and sort on pointers, - * the printing of the region and ident flags must - * be delayed until now. There is no way to make the - * decision on where to place them before now. + * Region and ident checks here.... Since the code has + * been modified to push and sort on pointers, the + * printing of the region and ident flags must be delayed + * until now. There is no way to make the decision on + * where to place them before now. */ if (list_of_names[this_one]->d_flags & DIR_COMB) { bu_vls_putc(vls, '/'); @@ -266,17 +138,17 @@ namelen++; } /* - * Size check (partial lines), and line termination. - * Note that this will catch the end of the lines - * that are full too. + * Size check (partial lines), and line termination. Note + * that this will catch the end of the lines that are full + * too. */ if (this_one + lines >= num_in_list) { bu_vls_putc(vls, '\n'); break; } else { /* - * Pad to next boundary as there will be - * another entry to the right of this one. + * Pad to next boundary as there will be another entry + * to the right of this one. */ while (namelen++ < 20) bu_vls_putc(vls, ' '); @@ -285,19 +157,19 @@ } #else int lines, i, j, k, namelen, this_one; - int maxnamelen; /* longest name in list */ - int cwidth; /* column width */ - int numcol; /* number of columns */ + int maxnamelen; /* longest name in list */ + int cwidth; /* column width */ + int numcol; /* number of columns */ qsort((genptr_t)list_of_names, (unsigned)num_in_list, (unsigned)sizeof(struct directory *), - (int (*)(const void *, const void *))ged_cmpdirname); + (int (*)(const void *, const void *))cmpdirname); /* * Traverse the list of names, find the longest name and set the - * the column width and number of columns accordingly. - * If the longest name is greater than 80 characters, the number of columns - * will be one. + * the column width and number of columns accordingly. If the + * longest name is greater than 80 characters, the number of + * columns will be one. */ maxnamelen = 0; for (k=0; k < num_in_list; k++) { @@ -323,39 +195,39 @@ for (j=0; j < numcol; j++) { this_one = j * lines + i; bu_vls_printf(vls, "%s", list_of_names[this_one]->d_namep); - namelen = strlen( list_of_names[this_one]->d_namep); + namelen = strlen(list_of_names[this_one]->d_namep); /* - * Region and ident checks here.... Since the code - * has been modified to push and sort on pointers, - * the printing of the region and ident flags must - * be delayed until now. There is no way to make the - * decision on where to place them before now. + * Region and ident checks here.... Since the code has + * been modified to push and sort on pointers, the + * printing of the region and ident flags must be delayed + * until now. There is no way to make the decision on + * where to place them before now. */ - if ( !no_decorate && list_of_names[this_one]->d_flags & DIR_COMB) { + if (!no_decorate && list_of_names[this_one]->d_flags & DIR_COMB) { bu_vls_putc(vls, '/'); namelen++; } - if ( !no_decorate && list_of_names[this_one]->d_flags & DIR_REGION) { + if (!no_decorate && list_of_names[this_one]->d_flags & DIR_REGION) { bu_vls_putc(vls, 'R'); namelen++; } /* - * Size check (partial lines), and line termination. - * Note that this will catch the end of the lines - * that are full too. + * Size check (partial lines), and line termination. Note + * that this will catch the end of the lines that are full + * too. */ if (this_one + lines >= num_in_list) { bu_vls_putc(vls, '\n'); break; } else { /* - * Pad to next boundary as there will be - * another entry to the right of this one. + * Pad to next boundary as there will be another entry + * to the right of this one. */ - while ( namelen++ < cwidth) + while (namelen++ < cwidth) bu_vls_putc(vls, ' '); } } @@ -363,14 +235,14 @@ #endif } -void -_ged_vls_long_dpp(struct bu_vls *vls, - struct directory **list_of_names, - int num_in_list, - int aflag, /* print all objects */ - int cflag, /* print combinations */ - int rflag, /* print regions */ - int sflag) /* print solids */ +static void +vls_long_dpp(struct bu_vls *vls, + struct directory **list_of_names, + int num_in_list, + int aflag, /* print all objects */ + int cflag, /* print combinations */ + int rflag, /* print regions */ + int sflag) /* print solids */ { int i; int isComb=0, isRegion=0; @@ -382,7 +254,7 @@ qsort((genptr_t)list_of_names, (unsigned)num_in_list, (unsigned)sizeof(struct directory *), - (int (*)(const void *, const void *))ged_cmpdirname); + (int (*)(const void *, const void *))cmpdirname); for (i=0; i < num_in_list; i++) { int len; @@ -396,7 +268,7 @@ len = 6; else if (dp->d_flags & DIR_COMB) len = 4; - else if ( dp->d_flags & DIR_SOLID ) + else if (dp->d_flags & DIR_SOLID) len = strlen(rt_functab[dp->d_minor_type].ft_label); else { switch (list_of_names[i]->d_major_type) { @@ -404,13 +276,13 @@ len = 6; break; case DB5_MAJORTYPE_BINARY_MIME: - len = strlen( "binary (mime)" ); + len = strlen("binary (mime)"); break; case DB5_MAJORTYPE_BINARY_UNIF: - len = strlen( binu_types[list_of_names[i]->d_minor_type] ); + len = strlen(binu_types[list_of_names[i]->d_minor_type]); break; case DB5_MAJORTYPE_BINARY_EXPM: - len = strlen( "binary(expm)" ); + len = strlen("binary(expm)"); break; } } @@ -433,7 +305,7 @@ type = "region"; } else isRegion = 0; - } else if ( list_of_names[i]->d_flags & DIR_SOLID ) { + } else if (list_of_names[i]->d_flags & DIR_SOLID) { isComb = isRegion = 0; isSolid = 1; type = rt_functab[list_of_names[i]->d_minor_type].ft_label; @@ -468,10 +340,10 @@ (cflag && isComb) || (rflag && isRegion) || (sflag && isSolid)) { - bu_vls_printf(vls, "%s", dp->d_namep ); - bu_vls_spaces(vls, max_nam_len - strlen( dp->d_namep ) ); - bu_vls_printf(vls, " %s", type ); - bu_vls_spaces(vls, max_type_len - strlen( type ) ); + bu_vls_printf(vls, "%s", dp->d_namep); + bu_vls_spaces(vls, max_nam_len - strlen(dp->d_namep)); + bu_vls_printf(vls, " %s", type); + bu_vls_spaces(vls, max_type_len - strlen(type)); bu_vls_printf(vls, " %2d %2d %ld\n", dp->d_major_type, dp->d_minor_type, (long)(dp->d_len)); } @@ -479,28 +351,28 @@ } /** - * G E D _ V L S _ L I N E _ D P P - *@brief - * Given a pointer to a list of pointers to names and the number of names - * in that list, sort and print that list on the same line. - * This routine was lifted from mged/columns.c. + * G E D _ V L S _ L I N E _ D P P + * + * Given a pointer to a list of pointers to names and the number of names + * in that list, sort and print that list on the same line. + * This routine was lifted from mged/columns.c. */ -void -_ged_vls_line_dpp(struct bu_vls *vls, - struct directory **list_of_names, - int num_in_list, - int aflag, /* print all objects */ - int cflag, /* print combinations */ - int rflag, /* print regions */ - int sflag) /* print solids */ +static void +vls_line_dpp(struct bu_vls *vls, + struct directory **list_of_names, + int num_in_list, + int aflag, /* print all objects */ + int cflag, /* print combinations */ + int rflag, /* print regions */ + int sflag) /* print solids */ { int i; int isComb, isRegion; int isSolid; - qsort( (genptr_t)list_of_names, - (unsigned)num_in_list, (unsigned)sizeof(struct directory *), - (int (*)(const void *, const void *))ged_cmpdirname); + qsort((genptr_t)list_of_names, + (unsigned)num_in_list, (unsigned)sizeof(struct directory *), + (int (*)(const void *, const void *))cmpdirname); /* * i - tracks the list item @@ -530,35 +402,168 @@ } } + /** - * G E D _ G E T S P A C E - * - * This routine walks through the directory entry list and mallocs enough - * space for pointers to hold: - * a) all of the entries if called with an argument of 0, or - * b) the number of entries specified by the argument if > 0. - * This routine was lifted from mged/dir.c. + * List objects in this database */ -struct directory ** -_ged_getspace(struct db_i *dbip, - register int num_entries) +int +ged_ls(struct ged *gedp, int argc, const char *argv[]) { - register struct directory **dir_basep; + struct bu_vls vls; + register struct directory *dp; + register int i; + int c; + int aflag = 0; /* print all objects without formatting */ + int cflag = 0; /* print combinations */ + int rflag = 0; /* print regions */ + int sflag = 0; /* print solids */ + int lflag = 0; /* use long format */ + int attr_flag = 0; /* arguments are attribute name/value pairs */ + int or_flag = 0; /* flag indicating that any one attribute match is sufficient + * default is all attributes must match. + */ + struct directory **dirp; + struct directory **dirp0 = (struct directory **)NULL; + const char *cmdname = argv[0]; + static const char *usage = "[-A name/value pairs] OR [-acrslop] object(s)"; - if (num_entries < 0) { - bu_log("wdb_getspace: was passed %d, used 0\n", - num_entries); - num_entries = 0; + GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); + GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR); + + /* initialize result */ + bu_vls_trunc(&gedp->ged_result_str, 0); + + if (MAXARGS < argc) { + bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage); + return GED_ERROR; } - if (num_entries == 0) num_entries = db_get_directory_size(dbip); + bu_vls_init(&vls); - /* Allocate and cast num_entries worth of pointers */ - dir_basep = (struct directory **) bu_malloc((num_entries+1) * sizeof(struct directory *), - "wdb_getspace *dir[]" ); - return(dir_basep); + bu_optind = 1; /* re-init bu_getopt() */ + while ((c = bu_getopt(argc, (char * const *)argv, "acrslopA")) != EOF) { + switch (c) { + case 'A': + attr_flag = 1; + break; + case 'o': + or_flag = 1; + break; + case 'a': + aflag = 1; + break; + case 'c': + cflag = 1; + break; + case 'r': + rflag = 1; + break; + case 's': + case 'p': + sflag = 1; + break; + case 'l': + lflag = 1; + break; + default: + bu_vls_printf(&gedp->ged_result_str, "Unrecognized option - %c", c); + return GED_ERROR; + } + } + /* skip options processed plus command name */ + argc -= bu_optind; + argv += bu_optind; + + /* create list of selected objects from database */ + if (attr_flag) { + /* select objects based on attributes */ + struct bu_ptbl *tbl; + struct bu_attribute_value_set avs; + int dir_flags; + int op; + if ((argc < 2) || (argc%2 != 0)) { + /* should be even number of name/value pairs */ + bu_log("ls -A option expects even number of 'name value' pairs\n"); + bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage); + return TCL_ERROR; + } + + if (or_flag) { + op = 2; + } else { + op = 1; + } + + dir_flags = 0; + if (aflag) dir_flags = -1; + if (cflag) dir_flags = DIR_COMB; + if (sflag) dir_flags = DIR_SOLID; + if (rflag) dir_flags = DIR_REGION; + if (!dir_flags) dir_flags = -1 ^ DIR_HIDDEN; + + bu_avs_init(&avs, argc, "wdb_ls_cmd avs"); + for (i = 0; i < argc; i += 2) { + if (or_flag) { + bu_avs_add_nonunique(&avs, (char *)argv[i], (char *)argv[i+1]); + } else { + bu_avs_add(&avs, (char *)argv[i], (char *)argv[i+1]); + } + } + + tbl = db_lookup_by_attr(gedp->ged_wdbp->dbip, dir_flags, &avs, op); + bu_avs_free(&avs); + + dirp = _ged_getspace(gedp->ged_wdbp->dbip, BU_PTBL_LEN(tbl)); + dirp0 = dirp; + for (i=0; i<BU_PTBL_LEN(tbl); i++) { + *dirp++ = (struct directory *)BU_PTBL_GET(tbl, i); + } + + bu_ptbl_free(tbl); + bu_free((char *)tbl, "wdb_ls_cmd ptbl"); + } else if (argc > 0) { + /* Just list specified names */ + dirp = _ged_getspace(gedp->ged_wdbp->dbip, argc); + dirp0 = dirp; + /* + * Verify the names, and add pointers to them to the array. + */ + for (i = 0; i < argc; i++) { + if ((dp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) == DIR_NULL) + continue; + *dirp++ = dp; + } + } else { + /* Full table of contents */ + dirp = _ged_getspace(gedp->ged_wdbp->dbip, 0); /* Enough for all */ + dirp0 = dirp; + /* + * Walk the directory list adding pointers (to the directory + * entries) to the array. + */ + for (i = 0; i < RT_DBNHASH; i++) + for (dp = gedp->ged_wdbp->dbip->dbi_Head[i]; dp != DIR_NULL; dp = dp->d_forw) { + if (!aflag && (dp->d_flags & DIR_HIDDEN)) + continue; + *dirp++ = dp; + } + } + + if (lflag) + vls_long_dpp(&gedp->ged_result_str, dirp0, (int)(dirp - dirp0), + aflag, cflag, rflag, sflag); + else if (aflag || cflag || rflag || sflag) + vls_line_dpp(&gedp->ged_result_str, dirp0, (int)(dirp - dirp0), + aflag, cflag, rflag, sflag); + else + _ged_vls_col_pr4v(&gedp->ged_result_str, dirp0, (int)(dirp - dirp0), 0); + + bu_free((genptr_t)dirp0, "_ged_getspace dp[]"); + + return GED_OK; } + /* * Local Variables: * tab-width: 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-10-28 15:37:55
|
Revision: 36259 http://brlcad.svn.sourceforge.net/brlcad/?rev=36259&view=rev Author: brlcad Date: 2009-10-28 15:37:43 +0000 (Wed, 28 Oct 2009) Log Message: ----------- stub in an annotate func Modified Paths: -------------- brlcad/trunk/src/libged/Makefile.am Added Paths: ----------- brlcad/trunk/src/libged/annotate.c Modified: brlcad/trunk/src/libged/Makefile.am =================================================================== --- brlcad/trunk/src/libged/Makefile.am 2009-10-28 15:37:15 UTC (rev 36258) +++ brlcad/trunk/src/libged/Makefile.am 2009-10-28 15:37:43 UTC (rev 36259) @@ -277,7 +277,8 @@ ${GED_LIBS} EXTRA_DIST = \ - CMakeLists.txt + CMakeLists.txt \ + annotate.c DEPENDS = src/librt src/libwdb Added: brlcad/trunk/src/libged/annotate.c =================================================================== --- brlcad/trunk/src/libged/annotate.c (rev 0) +++ brlcad/trunk/src/libged/annotate.c 2009-10-28 15:37:43 UTC (rev 36259) @@ -0,0 +1,91 @@ +/* A N N O T A T E . C + * BRL-CAD + * + * Copyright (c) 2008-2009 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + */ +/** @file annotate.c + * + * The annotate command. + * + * Examples: + * annotate all.g -n my.note -p 0 0 0 -m "This is a tank." + * annotate -p 10 0 0 -m "This geometry is unclassified." + * annotate sph.r -t leader -p 10 10 10 + * + * Design options to consider: + * + * Types: text, leader, angular, radial, aligned, ordinate, linear + * Modes: normal, horizontal, vertical, above, below, inline + * Align: auto, model, view + * + * scale, orientation + * fontname, fontsize + * arrowlength, arrowwidth, arrowtype + * + * linearformat: "%.2f" + * linearunits: mm, m, in, ft, etc + * + * angularformat: "%.2f" + * angularunits: degrees, radians + * + */ + +#include "common.h" + +#include <stdlib.h> + + +void +ged_annotate_help(struct bu_vls *result, const char *cmd) +{ + static const char *usage = "name [create|delete|adjust] name "; + + bu_vls_printf(result, "Usage: %s %s", cmd, usage); +} + + +int +ged_annotate(struct ged *gedp, int argc, const char *argv[]) +{ + const char *argv0 = argv[0]; + + GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); + + /* initialize result */ + bu_vls_trunc(&gedp->ged_result_str, 0); + + /* must be wanting help */ + if (argc == 1) { + annotate_help(&gedp->ged_result_str, argv0); + return GED_HELP; + } + + /* do something */ + + return GED_OK; +} + + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Property changes on: brlcad/trunk/src/libged/annotate.c ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2009-11-06 19:58:30
|
Revision: 36434 http://brlcad.svn.sourceforge.net/brlcad/?rev=36434&view=rev Author: bob1961 Date: 2009-11-06 19:58:17 +0000 (Fri, 06 Nov 2009) Log Message: ----------- Fixed a bug that potentially tries to use a bu_list as a solid (i.e. when the list is empty). Modified Paths: -------------- brlcad/trunk/src/libged/dg_obj.c brlcad/trunk/src/libged/draw.c Modified: brlcad/trunk/src/libged/dg_obj.c =================================================================== --- brlcad/trunk/src/libged/dg_obj.c 2009-11-06 19:55:26 UTC (rev 36433) +++ brlcad/trunk/src/libged/dg_obj.c 2009-11-06 19:58:17 UTC (rev 36434) @@ -3299,8 +3299,12 @@ sp->s_color[1] = sp->s_basecolor[1] = (rgb>> 8) & 0xFF; sp->s_color[2] = sp->s_basecolor[2] = (rgb ) & 0xFF; sp->s_regionid = 0; - sp->s_dlist = BU_LIST_LAST(solid, &dgop->dgo_headSolid)->s_dlist + 1; + if (BU_LIST_NON_EMPTY(&dgop->dgo_headSolid)) { + sp->s_dlist = BU_LIST_LAST(solid, &dgop->dgo_headSolid)->s_dlist + 1; + } else + sp->s_dlist = 1; + sp->s_uflag = 0; sp->s_dflag = 0; sp->s_cflag = 0; @@ -3396,7 +3400,10 @@ GET_SOLID(sp, &_FreeSolid.l); /* NOTICE: The structure is dirty & not initialized for you! */ - sp->s_dlist = BU_LIST_LAST(solid, &dgcdp->dgop->dgo_headSolid)->s_dlist + 1; + if (BU_LIST_NON_EMPTY(&dgcdp->dgop->dgo_headSolid)) { + sp->s_dlist = BU_LIST_LAST(solid, &dgcdp->dgop->dgo_headSolid)->s_dlist + 1; + } else + sp->s_dlist = 1; } else { /* Just updating an existing solid. * 'tsp' and 'pathpos' will not be used Modified: brlcad/trunk/src/libged/draw.c =================================================================== --- brlcad/trunk/src/libged/draw.c 2009-11-06 19:55:26 UTC (rev 36433) +++ brlcad/trunk/src/libged/draw.c 2009-11-06 19:58:17 UTC (rev 36434) @@ -125,7 +125,10 @@ GET_SOLID(sp, &_FreeSolid.l); /* NOTICE: The structure is dirty & not initialized for you! */ - sp->s_dlist = BU_LIST_LAST(solid, &dgcdp->gdlp->gdl_headSolid)->s_dlist + 1; + if (BU_LIST_NON_EMPTY(&dgcdp->gdlp->gdl_headSolid)) { + sp->s_dlist = BU_LIST_LAST(solid, &dgcdp->gdlp->gdl_headSolid)->s_dlist + 1; + } else + sp->s_dlist = 1; } else { /* Just updating an existing solid. * 'tsp' and 'pathpos' will not be used @@ -1006,8 +1009,12 @@ sp->s_color[1] = sp->s_basecolor[1] = (rgb>> 8) & 0xFF; sp->s_color[2] = sp->s_basecolor[2] = (rgb ) & 0xFF; sp->s_regionid = 0; - sp->s_dlist = BU_LIST_LAST(solid, &gdlp->gdl_headSolid)->s_dlist + 1; + if (BU_LIST_NON_EMPTY(&gdlp->gdl_headSolid)) { + sp->s_dlist = BU_LIST_LAST(solid, &gdlp->gdl_headSolid)->s_dlist + 1; + } else + sp->s_dlist = 1; + sp->s_uflag = 0; sp->s_dflag = 0; sp->s_cflag = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-12-28 14:28:21
|
Revision: 37036 http://brlcad.svn.sourceforge.net/brlcad/?rev=37036&view=rev Author: brlcad Date: 2009-12-28 14:28:09 +0000 (Mon, 28 Dec 2009) Log Message: ----------- unbreak build, fix a slew of calls to the ifree() and adjust() functabs where the resource pointer parameter was removed. all amazingly and uselessly used the rt_uniresource. Modified Paths: -------------- brlcad/trunk/src/libged/adjust.c brlcad/trunk/src/libged/eac.c brlcad/trunk/src/libged/edcodes.c brlcad/trunk/src/libged/put.c brlcad/trunk/src/libged/red.c brlcad/trunk/src/libged/tables.c brlcad/trunk/src/libged/wcodes.c brlcad/trunk/src/libged/wdb_obj.c brlcad/trunk/src/libged/which_shader.c Modified: brlcad/trunk/src/libged/adjust.c =================================================================== --- brlcad/trunk/src/libged/adjust.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/adjust.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -77,7 +77,7 @@ return GED_ERROR; } - status = intern.idb_meth->ft_adjust(&gedp->ged_result_str, &intern, argc-2, (char **)argv+2, &rt_uniresource); + status = intern.idb_meth->ft_adjust(&gedp->ged_result_str, &intern, argc-2, (char **)argv+2); if (status == GED_OK && wdb_put_internal(gedp->ged_wdbp, name, &intern, 1.0) < 0) { bu_vls_printf(&gedp->ged_result_str, "wdb_export(%s) failure", name); rt_db_free_internal(&intern, &rt_uniresource); Modified: brlcad/trunk/src/libged/eac.c =================================================================== --- brlcad/trunk/src/libged/eac.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/eac.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -90,10 +90,10 @@ if ( comb->region_id != 0 || comb->aircode != item ) { - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); continue; } - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); bu_vls_strcat( &v, " " ); bu_vls_strcat( &v, dp->d_namep ); Modified: brlcad/trunk/src/libged/edcodes.c =================================================================== --- brlcad/trunk/src/libged/edcodes.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/edcodes.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -272,7 +272,7 @@ } if (id != ID_COMBINATION) { - intern.idb_meth->ft_ifree(&intern, &rt_uniresource); + intern.idb_meth->ft_ifree(&intern); return GED_OK; } @@ -281,7 +281,7 @@ if (comb->region_flag) { bu_vls_printf(&gedp->ged_result_str, " %s", dp->d_namep); - intern.idb_meth->ft_ifree(&intern, &rt_uniresource); + intern.idb_meth->ft_ifree(&intern); return GED_OK; } @@ -289,7 +289,7 @@ db_tree_funcleaf(gedp->ged_wdbp->dbip, comb, comb->tree, traverse_node, (genptr_t)0, (genptr_t)&pathpos, (genptr_t)gedp); - intern.idb_meth->ft_ifree(&intern, &rt_uniresource); + intern.idb_meth->ft_ifree(&intern); return GED_OK; } Modified: brlcad/trunk/src/libged/put.c =================================================================== --- brlcad/trunk/src/libged/put.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/put.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -99,7 +99,7 @@ rt_generic_make(ftp, &intern); } - if (!ftp->ft_adjust || ftp->ft_adjust(&gedp->ged_result_str, &intern, argc-3, (char **)argv+3, &rt_uniresource) == GED_ERROR) { + if (!ftp->ft_adjust || ftp->ft_adjust(&gedp->ged_result_str, &intern, argc-3, (char **)argv+3) == GED_ERROR) { rt_db_free_internal(&intern, &rt_uniresource); return GED_ERROR; } Modified: brlcad/trunk/src/libged/red.c =================================================================== --- brlcad/trunk/src/libged/red.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/red.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -133,7 +133,7 @@ /* Do some quick checking on the edited file */ bu_vls_printf(&gedp->ged_result_str, "%s: Error in edited region, no changes made\n", *argv); if (comb) - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); (void)unlink(_ged_tmpfil); return GED_ERROR; } @@ -142,7 +142,7 @@ if (_ged_save_comb(gedp, dp)) { /* Save combination to a temp name */ bu_vls_printf(&gedp->ged_result_str, "%s: No changes made\n", *argv); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); (void)unlink(_ged_tmpfil); return GED_OK; } @@ -153,7 +153,7 @@ if (comb) { _ged_restore_comb(gedp, dp); bu_vls_printf(&gedp->ged_result_str, "%s: \toriginal restored\n", *argv); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); } (void)unlink(_ged_tmpfil); @@ -489,14 +489,14 @@ if (dp != DIR_NULL) { if (db_delete(gedp->ged_wdbp->dbip, dp) || db_dirdelete(gedp->ged_wdbp->dbip, dp)) { bu_vls_printf(&gedp->ged_result_str, "_ged_make_tree: Unable to delete directory entry for %s\n", old_name); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return GED_ERROR; } } if ((dp=db_diradd(gedp->ged_wdbp->dbip, new_name, -1L, 0, flags, (genptr_t)&intern.idb_type)) == DIR_NULL) { bu_vls_printf(&gedp->ged_result_str, "_ged_make_tree: Cannot add %s to directory, no changes made\n", new_name); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return(1); } } else if ( dp == DIR_NULL ) { @@ -509,7 +509,7 @@ if ((dp=db_diradd(gedp->ged_wdbp->dbip, new_name, -1L, 0, flags, (genptr_t)&intern.idb_type)) == DIR_NULL) { bu_vls_printf(&gedp->ged_result_str, "_ged_make_tree: Cannot add %s to directory, no changes made\n", new_name); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return GED_ERROR; } } else { Modified: brlcad/trunk/src/libged/tables.c =================================================================== --- brlcad/trunk/src/libged/tables.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/tables.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -308,14 +308,14 @@ db_non_union_push( comb->tree, &rt_uniresource ); if ( db_ck_v4gift_tree( comb->tree ) < 0 ) { bu_vls_printf(&gedp->ged_result_str, "Cannot flatten tree for editing\n"); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return; } } if (!comb->tree) { /* empty combination */ - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return; } @@ -450,7 +450,7 @@ out: bu_free( (char *)tree_list, "new_tables: tree_list" ); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return; } Modified: brlcad/trunk/src/libged/wcodes.c =================================================================== --- brlcad/trunk/src/libged/wcodes.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/wcodes.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -141,7 +141,7 @@ } if (id != ID_COMBINATION) { - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return GED_OK; } @@ -157,7 +157,7 @@ for (i=0; i < pathpos; i++) fprintf(fp, "/%s", path[i]->d_namep); fprintf(fp, "/%s\n", dp->d_namep); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return GED_OK; } @@ -167,7 +167,7 @@ (genptr_t)fp, (genptr_t)&pathpos, (genptr_t)gedp); } - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); return GED_OK; } Modified: brlcad/trunk/src/libged/wdb_obj.c =================================================================== --- brlcad/trunk/src/libged/wdb_obj.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/wdb_obj.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -1137,7 +1137,7 @@ bu_vls_init(&log); - if (!ftp->ft_adjust || ftp->ft_adjust(&log, &intern, argc-3, argv+3, &rt_uniresource) == GED_ERROR) { + if (!ftp->ft_adjust || ftp->ft_adjust(&log, &intern, argc-3, argv+3) == GED_ERROR) { Tcl_AppendResult(interp, bu_vls_addr(&log), (char *)NULL); bu_vls_free(&log); rt_db_free_internal(&intern, &rt_uniresource); @@ -1233,7 +1233,7 @@ if (!intern.idb_meth->ft_adjust) return TCL_ERROR; - status = intern.idb_meth->ft_adjust(&log, &intern, argc-2, argv+2, &rt_uniresource); + status = intern.idb_meth->ft_adjust(&log, &intern, argc-2, argv+2); if (status == GED_OK && wdb_put_internal(wdbp, name, &intern, 1.0) < 0) { Tcl_AppendResult(interp, bu_vls_addr(&log), (char *)NULL); Modified: brlcad/trunk/src/libged/which_shader.c =================================================================== --- brlcad/trunk/src/libged/which_shader.c 2009-12-28 09:48:58 UTC (rev 37035) +++ brlcad/trunk/src/libged/which_shader.c 2009-12-28 14:28:09 UTC (rev 37036) @@ -94,7 +94,7 @@ bu_vls_printf(&gedp->ged_result_str, " %s", dp->d_namep); else bu_vls_printf(&gedp->ged_result_str, " %s\n", dp->d_namep); - intern.idb_meth->ft_ifree( &intern, &rt_uniresource ); + intern.idb_meth->ft_ifree(&intern); } FOR_ALL_DIRECTORY_END; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-01-09 04:55:00
|
Revision: 37183 http://brlcad.svn.sourceforge.net/brlcad/?rev=37183&view=rev Author: brlcad Date: 2010-01-09 04:54:54 +0000 (Sat, 09 Jan 2010) Log Message: ----------- quell the log() shadow warnings, rename to logstr. Modified Paths: -------------- brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/rtcheck.c brlcad/trunk/src/libged/wdb_obj.c Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2010-01-09 02:45:34 UTC (rev 37182) +++ brlcad/trunk/src/libged/ged_private.h 2010-01-09 04:54:54 UTC (rev 37183) @@ -315,7 +315,7 @@ /* defined in rtcheck.c */ BU_EXTERN (void _ged_wait_status, - (struct bu_vls *log, + (struct bu_vls *logstr, int status)); /* defined in rotate_eto.c */ Modified: brlcad/trunk/src/libged/rtcheck.c =================================================================== --- brlcad/trunk/src/libged/rtcheck.c 2010-01-09 02:45:34 UTC (rev 37182) +++ brlcad/trunk/src/libged/rtcheck.c 2010-01-09 04:54:54 UTC (rev 37183) @@ -548,7 +548,7 @@ #endif void -_ged_wait_status(struct bu_vls *log, +_ged_wait_status(struct bu_vls *logstr, int status) { int sig = status & 0x7f; @@ -556,19 +556,19 @@ int ret = status >> 8; if (status == 0) { - bu_vls_printf(log, "Normal exit\n"); + bu_vls_printf(logstr, "Normal exit\n"); return; } - bu_vls_printf(log, "Abnormal exit x%x", status); + bu_vls_printf(logstr, "Abnormal exit x%x", status); if (core) - bu_vls_printf(log, ", core dumped"); + bu_vls_printf(logstr, ", core dumped"); if (sig) - bu_vls_printf(log, ", terminating signal = %d", sig); + bu_vls_printf(logstr, ", terminating signal = %d", sig); else - bu_vls_printf(log, ", return (exit) code = %d", ret); + bu_vls_printf(logstr, ", return (exit) code = %d", ret); } Modified: brlcad/trunk/src/libged/wdb_obj.c =================================================================== --- brlcad/trunk/src/libged/wdb_obj.c 2010-01-09 02:45:34 UTC (rev 37182) +++ brlcad/trunk/src/libged/wdb_obj.c 2010-01-09 04:54:54 UTC (rev 37183) @@ -842,16 +842,16 @@ return TCL_ERROR; { - struct bu_vls log; + struct bu_vls logstr; - bu_vls_init(&log); + bu_vls_init(&logstr); if (!intern.idb_meth->ft_get) return TCL_ERROR; - status = intern.idb_meth->ft_get(&log, &intern, argv[2]); - Tcl_AppendResult(interp, bu_vls_addr(&log), (char *)NULL); - bu_vls_free(&log); + status = intern.idb_meth->ft_get(&logstr, &intern, argv[2]); + Tcl_AppendResult(interp, bu_vls_addr(&logstr), (char *)NULL); + bu_vls_free(&logstr); } rt_db_free_internal(&intern); @@ -1127,19 +1127,19 @@ } { - struct bu_vls log; + struct bu_vls logstr; - bu_vls_init(&log); + bu_vls_init(&logstr); - if (!ftp->ft_adjust || ftp->ft_adjust(&log, &intern, argc-3, argv+3) == GED_ERROR) { - Tcl_AppendResult(interp, bu_vls_addr(&log), (char *)NULL); - bu_vls_free(&log); + if (!ftp->ft_adjust || ftp->ft_adjust(&logstr, &intern, argc-3, argv+3) == GED_ERROR) { + Tcl_AppendResult(interp, bu_vls_addr(&logstr), (char *)NULL); + bu_vls_free(&logstr); rt_db_free_internal(&intern); return TCL_ERROR; } - Tcl_AppendResult(interp, bu_vls_addr(&log), (char *)NULL); - bu_vls_free(&log); + Tcl_AppendResult(interp, bu_vls_addr(&logstr), (char *)NULL); + bu_vls_free(&logstr); } if (wdb_put_internal(wdbp, name, &intern, 1.0) < 0) { @@ -1220,26 +1220,26 @@ RT_CK_FUNCTAB(intern.idb_meth); { - struct bu_vls log; + struct bu_vls logstr; - bu_vls_init(&log); + bu_vls_init(&logstr); if (!intern.idb_meth->ft_adjust) return TCL_ERROR; - status = intern.idb_meth->ft_adjust(&log, &intern, argc-2, argv+2); + status = intern.idb_meth->ft_adjust(&logstr, &intern, argc-2, argv+2); if (status == GED_OK && wdb_put_internal(wdbp, name, &intern, 1.0) < 0) { - Tcl_AppendResult(interp, bu_vls_addr(&log), (char *)NULL); - bu_vls_free(&log); + Tcl_AppendResult(interp, bu_vls_addr(&logstr), (char *)NULL); + bu_vls_free(&logstr); Tcl_AppendResult(interp, "wdb_export(", name, ") failure", (char *)NULL); rt_db_free_internal(&intern); return TCL_ERROR; } - Tcl_AppendResult(interp, bu_vls_addr(&log), (char *)NULL); - bu_vls_free(&log); + Tcl_AppendResult(interp, bu_vls_addr(&logstr), (char *)NULL); + bu_vls_free(&logstr); } /* notify observers */ @@ -1304,16 +1304,16 @@ { int ret; - struct bu_vls log; + struct bu_vls logstr; - bu_vls_init(&log); + bu_vls_init(&logstr); if (!ftp->ft_form) return TCL_ERROR; - ret = ftp->ft_form(&log, ftp); - Tcl_AppendResult(interp, bu_vls_addr(&log), (char *)NULL); - bu_vls_free(&log); + ret = ftp->ft_form(&logstr, ftp); + Tcl_AppendResult(interp, bu_vls_addr(&logstr), (char *)NULL); + bu_vls_free(&logstr); return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-01-09 05:07:55
|
Revision: 37184 http://brlcad.svn.sourceforge.net/brlcad/?rev=37184&view=rev Author: brlcad Date: 2010-01-09 05:07:48 +0000 (Sat, 09 Jan 2010) Log Message: ----------- quell a slew of compilation warnings including type mismatches, exact floating point comparisons, and param checks. Modified Paths: -------------- brlcad/trunk/src/libged/3ptarb.c brlcad/trunk/src/libged/adc.c brlcad/trunk/src/libged/analyze.c brlcad/trunk/src/libged/attr.c brlcad/trunk/src/libged/bev.c brlcad/trunk/src/libged/bigE.c Modified: brlcad/trunk/src/libged/3ptarb.c =================================================================== --- brlcad/trunk/src/libged/3ptarb.c 2010-01-09 04:54:54 UTC (rev 37183) +++ brlcad/trunk/src/libged/3ptarb.c 2010-01-09 05:07:48 UTC (rev 37184) @@ -103,7 +103,7 @@ } VCROSS(norm, vec1, vec2); length = MAGNITUDE( norm ); - if (length == 0.0) { + if (NEAR_ZERO(length, SMALL_FASTF)) { bu_vls_printf(&gedp->ged_result_str, "%s: points are colinear\n", argv[0]); return GED_ERROR; } @@ -116,7 +116,7 @@ switch (argv[11][0]) { case 'x': - if (norm[0] == 0.0) { + if (NEAR_ZERO(norm[0], SMALL_FASTF)) { bu_vls_printf(&gedp->ged_result_str, "%s: X not unique in this face\n", argv[0]); return GED_ERROR; } @@ -136,7 +136,7 @@ break; case 'y': - if (norm[1] == 0.0) { + if (NEAR_ZERO(norm[1], SMALL_FASTF)) { bu_vls_printf(&gedp->ged_result_str, "%s: Y not unique in this face\n", argv[0]); return GED_ERROR; } @@ -156,7 +156,7 @@ break; case 'z': - if (norm[2] == 0.0) { + if (NEAR_ZERO(norm[2], SMALL_FASTF)) { bu_vls_printf(&gedp->ged_result_str, "%s: Z not unique in this face\n", argv[0]); return GED_ERROR; } @@ -185,7 +185,8 @@ return GED_MORE; } - if ((thick = (atof( argv[14] ))) == 0.0) { + thick = atof(argv[14]); + if (NEAR_ZERO(thick, SMALL_FASTF)) { bu_vls_printf(&gedp->ged_result_str, "%s: thickness = 0.0\n", argv[0]); return GED_ERROR; } Modified: brlcad/trunk/src/libged/adc.c =================================================================== --- brlcad/trunk/src/libged/adc.c 2010-01-09 04:54:54 UTC (rev 37183) +++ brlcad/trunk/src/libged/adc.c 2010-01-09 05:07:48 UTC (rev 37184) @@ -649,7 +649,7 @@ dx = view_pt[X] * GED_MAX - gvp->gv_adc.gas_dv_x; dy = view_pt[Y] * GED_MAX - gvp->gv_adc.gas_dv_y; - if (dx != 0.0 || dy != 0.0) { + if (!NEAR_ZERO(dx, SMALL_FASTF) || !NEAR_ZERO(dy, SMALL_FASTF)) { gvp->gv_adc.gas_a1 = RAD2DEG*atan2(dy, dx); gvp->gv_adc.gas_dv_a1 = (1.0 - (gvp->gv_adc.gas_a1 / 45.0)) * GED_MAX; } @@ -667,7 +667,7 @@ dx = view_pt[X] * GED_MAX - gvp->gv_adc.gas_dv_x; dy = view_pt[Y] * GED_MAX - gvp->gv_adc.gas_dv_y; - if (dx != 0.0 || dy != 0.0) { + if (!NEAR_ZERO(dx, SMALL_FASTF) || !NEAR_ZERO(dy, SMALL_FASTF)) { gvp->gv_adc.gas_a2 = RAD2DEG*atan2(dy, dx); gvp->gv_adc.gas_dv_a2 = (1.0 - (gvp->gv_adc.gas_a2 / 45.0)) * GED_MAX; } Modified: brlcad/trunk/src/libged/analyze.c =================================================================== --- brlcad/trunk/src/libged/analyze.c 2010-01-09 04:54:54 UTC (rev 37183) +++ brlcad/trunk/src/libged/analyze.c 2010-01-09 05:07:48 UTC (rev 37184) @@ -784,6 +784,8 @@ static void ged_ars_anal(struct ged *gedp, const struct rt_db_internal *ip) { + if (ip) RT_CK_DB_INTERNAL(ip); + bu_vls_printf(&gedp->ged_result_str, "ARS analyze not implemented\n"); } @@ -801,6 +803,8 @@ static void ged_part_anal(struct ged *gedp, const struct rt_db_internal *ip) { + if (ip) RT_CK_DB_INTERNAL(ip); + bu_vls_printf(&gedp->ged_result_str, "PARTICLE analyze not implemented\n"); } Modified: brlcad/trunk/src/libged/attr.c =================================================================== --- brlcad/trunk/src/libged/attr.c 2010-01-09 04:54:54 UTC (rev 37183) +++ brlcad/trunk/src/libged/attr.c 2010-01-09 05:07:48 UTC (rev 37184) @@ -30,7 +30,7 @@ int ged_attr(struct ged *gedp, int argc, const char *argv[]) { - int i; + size_t i; struct directory *dp; struct bu_attribute_value_set avs; struct bu_attribute_value_pair *avpp; @@ -83,7 +83,7 @@ const char *val; int do_separators=argc-4; /* if more than one attribute */ - for (i=3; i<argc; i++) { + for (i=3; i<(size_t)argc; i++) { val = bu_avs_get(&avs, argv[i]); if ( !val ) { bu_vls_printf(&gedp->ged_result_str, @@ -114,7 +114,7 @@ } i = 3; - while (i < argc) { + while (i < (size_t)argc) { if(strcmp( argv[i], "region") == 0 && strcmp(argv[i+1], "R") == 0) { dp->d_flags |= DIR_REGION; } @@ -132,7 +132,7 @@ return GED_OK; } else if (strcmp(argv[1], "rm") == 0) { i = 3; - while (i < argc) { + while (i < (size_t)argc) { if(strcmp( argv[i], "region") == 0) { dp->d_flags = dp->d_flags & ~(DIR_REGION); } @@ -156,7 +156,7 @@ return GED_ERROR; } i = 3; - while (i < argc) { + while (i < (size_t)argc) { const char *old_val; if(strcmp( argv[i], "region") == 0 && strcmp(argv[i+1], "R") == 0) { dp->d_flags |= DIR_REGION; @@ -255,14 +255,14 @@ int len; /* show just the specified attributes */ - for ( i=0; i<argc; i++ ) { + for ( i=0; i<(size_t)argc; i++ ) { len = strlen( argv[i] ); if ( len > max_attr_name_len ) { max_attr_name_len = len; } } tabs1 = 2 + max_attr_name_len/8; - for (i=3; i<argc; i++) { + for (i=3; i<(size_t)argc; i++) { int tabs2; int k; const char *c; Modified: brlcad/trunk/src/libged/bev.c =================================================================== --- brlcad/trunk/src/libged/bev.c 2010-01-09 04:54:54 UTC (rev 37183) +++ brlcad/trunk/src/libged/bev.c 2010-01-09 05:07:48 UTC (rev 37184) @@ -293,7 +293,7 @@ * This routine must be prepared to run in parallel. */ static union tree * -ged_facetize_region_end(struct db_tree_state *tsp, struct db_full_path *pathp, union tree *curtree, genptr_t client_data) +ged_facetize_region_end(struct db_tree_state *tsp __attribute__((unused)), struct db_full_path *pathp, union tree *curtree, genptr_t client_data) { struct bu_list vhead; struct ged *gedp = (struct ged *)client_data; Modified: brlcad/trunk/src/libged/bigE.c =================================================================== --- brlcad/trunk/src/libged/bigE.c 2010-01-09 04:54:54 UTC (rev 37183) +++ brlcad/trunk/src/libged/bigE.c 2010-01-09 05:07:48 UTC (rev 37184) @@ -103,19 +103,14 @@ #define E_TREE_MAGIC 0x45545245 #define CK_ETREE(_p) BU_CKMAG(_p, E_TREE_MAGIC, "struct E_tree") -void -Edrawtree(int dp) -{ - return; -} HIDDEN union E_tree * add_solid(const struct directory *dp, matp_t mat, struct _ged_client_data *dgcdp) { - union E_tree *eptr; - struct nmgregion *r; + union E_tree *eptr = NULL; + struct nmgregion *r = NULL; struct rt_db_internal intern; int id; int solid_is_plate_mode_bot=0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2010-01-11 19:47:41
|
Revision: 37220 http://brlcad.svn.sourceforge.net/brlcad/?rev=37220&view=rev Author: bob1961 Date: 2010-01-11 19:47:34 +0000 (Mon, 11 Jan 2010) Log Message: ----------- Added an option for drawing hidden lines. Modified Paths: -------------- brlcad/trunk/src/libged/draw.c brlcad/trunk/src/libged/ged_private.h Modified: brlcad/trunk/src/libged/draw.c =================================================================== --- brlcad/trunk/src/libged/draw.c 2010-01-11 19:44:19 UTC (rev 37219) +++ brlcad/trunk/src/libged/draw.c 2010-01-11 19:47:34 UTC (rev 37220) @@ -181,6 +181,7 @@ sp->s_regionid = tsp->ts_regionid; sp->s_transparency = dgcdp->transparency; sp->s_dmode = dgcdp->dmode; + sp->s_hiddenLine = dgcdp->hiddenLine; /* Add to linked list of solid structs */ bu_semaphore_acquire(RT_SEM_MODEL); @@ -598,7 +599,7 @@ /* Parse options. */ bu_optind = 0; /* re-init bu_getopt() */ - while ((c = bu_getopt(argc, (char * const *)argv, "dfm:nqstuvwx:C:STP:A:oR")) != EOF) { + while ((c = bu_getopt(argc, (char * const *)argv, "dfhm:nqstuvwx:C:STP:A:oR")) != EOF) { switch (c) { case 'u': dgcdp->draw_edge_uses = 1; @@ -659,6 +660,10 @@ dgcdp->wireframe_color[2] = b; } break; + case 'h': + dgcdp->hiddenLine = 1; + dgcdp->shaded_mode_override = _GED_SHADED_MODE_ALL; + break; case 'm': /* clamp it to [-infinity, 2] */ dgcdp->shaded_mode_override = atoi(bu_optarg); Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2010-01-11 19:44:19 UTC (rev 37219) +++ brlcad/trunk/src/libged/ged_private.h 2010-01-11 19:47:34 UTC (rev 37220) @@ -82,6 +82,7 @@ int shaded_mode_override; fastf_t transparency; int dmode; + int hiddenLine; /* bigE related members */ struct application *ap; struct bu_ptbl leaf_list; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-01-26 20:43:05
|
Revision: 37421 http://brlcad.svn.sourceforge.net/brlcad/?rev=37421&view=rev Author: brlcad Date: 2010-01-26 20:42:58 +0000 (Tue, 26 Jan 2010) Log Message: ----------- remove most all references to MGED, eliminate some dead code, cleanup comments Modified Paths: -------------- brlcad/trunk/src/libged/dg_obj.c brlcad/trunk/src/libged/editit.c brlcad/trunk/src/libged/glob.c brlcad/trunk/src/libged/grid.c brlcad/trunk/src/libged/ls.c brlcad/trunk/src/libged/nirt.c brlcad/trunk/src/libged/preview.c brlcad/trunk/src/libged/red.c brlcad/trunk/src/libged/rtcheck.c brlcad/trunk/src/libged/tables.c brlcad/trunk/src/libged/view_obj.c brlcad/trunk/src/libged/vutil.c brlcad/trunk/src/libged/wdb_nirt.c brlcad/trunk/src/libged/wdb_obj.c Modified: brlcad/trunk/src/libged/dg_obj.c =================================================================== --- brlcad/trunk/src/libged/dg_obj.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/dg_obj.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -22,8 +22,7 @@ /** @file dg_obj.c * * A drawable geometry object contains methods and attributes for - * preparing geometry that is ready (i.e. vlists) for display. Much of - * this code was extracted from MGED and modified to work herein. + * preparing geometry that is ready (i.e. vlists) for display. * */ @@ -1778,9 +1777,9 @@ int o_pipe[2]; /* object writes view parameters */ int e_pipe[2]; /* object reads textual results */ #else - HANDLE i_pipe[2], pipe_iDup; /* MGED reads results for building vectors */ - HANDLE o_pipe[2], pipe_oDup; /* MGED writes view parameters */ - HANDLE e_pipe[2], pipe_eDup; /* MGED reads textual results */ + HANDLE i_pipe[2], pipe_iDup; /* READS results for building vectors */ + HANDLE o_pipe[2], pipe_oDup; /* WRITES view parameters */ + HANDLE e_pipe[2], pipe_eDup; /* READS textual results */ STARTUPINFO si; PROCESS_INFORMATION pi; SECURITY_ATTRIBUTES sa; @@ -3826,7 +3825,7 @@ if (vp < end) *vp++ = dp->d_namep; else { - Tcl_AppendResult(interp, "mged: ran out of comand vector space at ", + Tcl_AppendResult(interp, "INTERNAL ERROR: ran out of command vector space at ", dp->d_namep, "\n", (char *)NULL); break; } Modified: brlcad/trunk/src/libged/editit.c =================================================================== --- brlcad/trunk/src/libged/editit.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/editit.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -127,7 +127,7 @@ } /* print a message to let the user know they need to quit their - * editor before mged will come back to the land of the living. + * editor before the application will come back to life. */ { int length; Modified: brlcad/trunk/src/libged/glob.c =================================================================== --- brlcad/trunk/src/libged/glob.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/glob.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -141,9 +141,9 @@ return GED_OK; } + /** - * debackslash, backslash_specials, mged_compat: routines for original - * mged emulation mode + * unescapes various special characters */ static void ged_debackslash(struct bu_vls *dest, struct bu_vls *src) @@ -160,6 +160,10 @@ } } + +/** + * escapes various special characters + */ static void ged_backslash_specials(struct bu_vls *dest, struct bu_vls *src) { Modified: brlcad/trunk/src/libged/grid.c =================================================================== --- brlcad/trunk/src/libged/grid.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/grid.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -19,7 +19,7 @@ */ /** @file grid.c * - * Routines to implement MGED's snap to grid capability. + * Routines that provide the basics for a snap to grid capability. * */ Modified: brlcad/trunk/src/libged/ls.c =================================================================== --- brlcad/trunk/src/libged/ls.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/ls.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -47,7 +47,6 @@ * a) all of the entries if called with an argument of 0, or * b) the number of entries specified by the argument if > 0. * - * This routine was lifted from mged/dir.c. */ struct directory ** _ged_getspace(struct db_i *dbip, @@ -74,8 +73,7 @@ * _ G E D _ C M P D I R N A M E * * Given two pointers to pointers to directory entries, do a string - * compare on the respective names and return that value. This - * routine was lifted from mged/columns.c. + * compare on the respective names and return that value. */ static int cmpdirname(const genptr_t a, @@ -94,7 +92,7 @@ * * Given a pointer to a list of pointers to names and the number of * names in that list, sort and print that list in column order over - * four columns. This routine was lifted from mged/columns.c. + * four columns. */ void _ged_vls_col_pr4v(struct bu_vls *vls, @@ -347,7 +345,6 @@ * * Given a pointer to a list of pointers to names and the number of names * in that list, sort and print that list on the same line. - * This routine was lifted from mged/columns.c. */ static void vls_line_dpp(struct bu_vls *vls, Modified: brlcad/trunk/src/libged/nirt.c =================================================================== --- brlcad/trunk/src/libged/nirt.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/nirt.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -23,8 +23,8 @@ * * Routines to interface to nirt. * - * This code was imported from MGED's/rtif.c and modified to work as - * part of the drawable geometry object. + * This code was imported from the RTUIF and modified to work as part + * of the drawable geometry object. * */ /** @} */ Modified: brlcad/trunk/src/libged/preview.c =================================================================== --- brlcad/trunk/src/libged/preview.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/preview.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -329,8 +329,8 @@ bu_vls_printf(&gedp->ged_result_str, "eyepoint at (0, 0, 1) viewspace\n"); /* - * Initialize the view to the current one in MGED - * in case a view specification is never given. + * Initialize the view to the current one provided by the ged + * structure in case a view specification is never given. */ MAT_COPY(_ged_viewrot, gedp->ged_gvp->gv_rotation); VSET(temp, 0.0, 0.0, 1.0); Modified: brlcad/trunk/src/libged/red.c =================================================================== --- brlcad/trunk/src/libged/red.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/red.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -227,7 +227,7 @@ int rgb_valid; if ( (fp=fopen( _ged_tmpfil, "r" )) == NULL ) { - perror( "MGED" ); + perror("fopen"); bu_vls_printf(&gedp->ged_result_str, "Cannot open temporary file for reading\n"); return -1; } @@ -860,7 +860,7 @@ /* open the file */ if ((fp=fopen(_ged_tmpfil, "w")) == NULL) { - perror("MGED"); + perror("fopen"); bu_vls_printf(&gedp->ged_result_str, "ged_write_comb: Cannot open temporary file for writing\n"); return GED_ERROR; } Modified: brlcad/trunk/src/libged/rtcheck.c =================================================================== --- brlcad/trunk/src/libged/rtcheck.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/rtcheck.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -99,9 +99,9 @@ int o_pipe[2]; /* object writes view parameters */ int e_pipe[2]; /* object reads textual results */ #else - HANDLE i_pipe[2], pipe_iDup; /* MGED reads results for building vectors */ - HANDLE o_pipe[2], pipe_oDup; /* MGED writes view parameters */ - HANDLE e_pipe[2], pipe_eDup; /* MGED reads textual results */ + HANDLE i_pipe[2], pipe_iDup; /* READS results for building vectors */ + HANDLE o_pipe[2], pipe_oDup; /* WRITES view parameters */ + HANDLE e_pipe[2], pipe_eDup; /* READS textual results */ STARTUPINFO si; PROCESS_INFORMATION pi; SECURITY_ATTRIBUTES sa; Modified: brlcad/trunk/src/libged/tables.c =================================================================== --- brlcad/trunk/src/libged/tables.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/tables.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -143,6 +143,7 @@ if ( flag == SOL_TABLE || flag == REG_TABLE ) { /* temp file for discrimination of solids */ + /* !!! this needs to be a bu_temp_file() */ if ( (idfd = creat("/tmp/mged_discr", 0600)) < 0 ) { perror( "/tmp/mged_discr" ); status = GED_ERROR; Modified: brlcad/trunk/src/libged/view_obj.c =================================================================== --- brlcad/trunk/src/libged/view_obj.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/view_obj.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -22,8 +22,7 @@ /** @file view_obj.c * * A view object contains the attributes and methods for controlling - * viewing transformations. Much of this code was extracted from MGED - * and modified to work herein. + * viewing transformations. * */ /** @} */ @@ -2892,13 +2891,15 @@ bn_mat_mul2(tmat, vop->vo_rotation); } -/* - * P E R S P _ M A T + +/** + * P E R S P _ M A T * - * This code came from mged/dozoom.c. - * Compute a perspective matrix for a right-handed coordinate system. - * Reference: SGI Graphics Reference Appendix C - * (Note: SGI is left-handed, but the fix is done in the Display Manger). + * Compute a perspective matrix for a right-handed coordinate system. + * Reference: SGI Graphics Reference Appendix f + * + * (Note: SGI is left-handed, but the fix is done in the Display + * Manager). */ static void vo_persp_mat(mat_t m, @@ -2927,17 +2928,17 @@ bn_mat_mul(m, m2, tran); } -/* - * This code came from mged/dozoom.c. - * Create a perspective matrix that transforms the +/1 viewing cube, - * with the acutal eye position (not at Z=+1) specified in viewing coords, - * into a related space where the eye has been sheared onto the Z axis - * and repositioned at Z=(0, 0, 1), with the same perspective field of view - * as before. + +/** + * Create a perspective matrix that transforms the +/1 viewing cube, + * with the acutal eye position (not at Z=+1) specified in viewing + * coords, into a related space where the eye has been sheared onto + * the Z axis and repositioned at Z=(0, 0, 1), with the same + * perspective field of view as before. * - * The Zbuffer clips off stuff with negative Z values. + * The Zbuffer clips off stuff with negative Z values. * - * pmat = persp * xlate * shear + * pmat = persp * xlate * shear */ static void vo_mike_persp_mat(mat_t pmat, Modified: brlcad/trunk/src/libged/vutil.c =================================================================== --- brlcad/trunk/src/libged/vutil.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/vutil.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -219,13 +219,15 @@ return GED_OK; } -/* - * P E R S P _ M A T + +/** + * P E R S P _ M A T * - * This code originally came from mged/dozoom.c. - * Compute a perspective matrix for a right-handed coordinate system. - * Reference: SGI Graphics Reference Appendix C - * (Note: SGI is left-handed, but the fix is done in the Display Manger). + * Compute a perspective matrix for a right-handed coordinate system. + * Reference: SGI Graphics Reference Appendix C + * + * (Note: SGI is left-handed, but the fix is done in the Display + * Manager). */ void ged_persp_mat(mat_t m, @@ -254,17 +256,17 @@ bn_mat_mul(m, m2, tran); } -/* - * This code originally came from mged/dozoom.c. - * Create a perspective matrix that transforms the +/1 viewing cube, - * with the acutal eye position (not at Z=+1) specified in viewing coords, - * into a related space where the eye has been sheared onto the Z axis - * and repositioned at Z=(0, 0, 1), with the same perspective field of view - * as before. + +/** + * Create a perspective matrix that transforms the +/1 viewing cube, + * with the acutal eye position (not at Z=+1) specified in viewing + * coords, into a related space where the eye has been sheared onto + * the Z axis and repositioned at Z=(0, 0, 1), with the same + * perspective field of view as before. * - * The Zbuffer clips off stuff with negative Z values. + * The Zbuffer clips off stuff with negative Z values. * - * pmat = persp * xlate * shear + * pmat = persp * xlate * shear */ void ged_mike_persp_mat(mat_t pmat, Modified: brlcad/trunk/src/libged/wdb_nirt.c =================================================================== --- brlcad/trunk/src/libged/wdb_nirt.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/wdb_nirt.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -23,8 +23,8 @@ * * Routines to interface to nirt. * - * This code was imported from MGED's/rtif.c and modified to work as - * part of the drawable geometry object. + * This code was imported from the RTUIF and modified to work as part + * of the drawable geometry object. * */ /** @} */ @@ -133,32 +133,9 @@ -vop->vo_center[MDY], -vop->vo_center[MDZ]); } -#if 0 - if (mged_variables->mv_perspective_mode) { - point_t pt, eye; - - /* get eye point */ - VSET(pt, 0.0, 0.0, 1.0); - MAT4X3PNT(eye, vop->vo_view2model, pt); - VSCALE(eye, eye, base2local); - - /* point passed in is actually the aim point */ - VSCALE(cml, center_model, base2local); - VSUB2(dir, cml, eye); - VUNITIZE(dir); - - /* copy eye point to cml (cml is used for the "xyz" command to nirt */ - VMOVE(cml, eye); - } else { - VSCALE(cml, center_model, base2local); - VMOVEN(dir, vop->vo_rotation + 8, 3); - VSCALE(dir, dir, -1.0); - } -#else VSCALE(cml, center_model, dgop->dgo_wdbp->dbip->dbi_base2local); VMOVEN(dir, vop->vo_rotation + 8, 3); VSCALE(dir, dir, -1.0); -#endif bu_vls_init(&p_vls); bu_vls_printf(&p_vls, "xyz %lf %lf %lf;", Modified: brlcad/trunk/src/libged/wdb_obj.c =================================================================== --- brlcad/trunk/src/libged/wdb_obj.c 2010-01-26 20:38:17 UTC (rev 37420) +++ brlcad/trunk/src/libged/wdb_obj.c 2010-01-26 20:42:58 UTC (rev 37421) @@ -7237,56 +7237,6 @@ if (dp->d_major_type == DB5_MAJORTYPE_BRLCAD) { int no_hide=0; - /* warn the user that this might be a bad idea */ - if (isatty(fileno(stdin)) && isatty(fileno(stdout))) { -#if 0 - char line[80]; - -/*XXX Ditto on the message below. Besides, it screws with the cadwidgets. */ - /* classic interactive MGED */ - while (1) { - bu_log("Hiding BRL-CAD geometry (%s) is generaly a bad idea.\n", dp->d_namep); - bu_log("This may cause unexpected problems with other commands.\n"); - bu_log("Are you sure you want to do this?? (y/n)\n"); - (void)bu_fgets(line, sizeof(line), stdin); - if (line[0] == 'y' || line[0] == 'Y') break; - if (line[0] == 'n' || line[0] == 'N') { - no_hide = 1; - break; - } - } -#endif - } else if (Tcl_GetVar2Ex(interp, "tk_version", NULL, TCL_GLOBAL_ONLY)) { -#if 0 - struct bu_vls vls; - -/* - * We should give the user some credit here - * and not annoy them with a message dialog. - */ - /* Tk is active, we can pop-up a window */ - bu_vls_init(&vls); - bu_vls_printf(&vls, "Hiding BRL-CAD geometry (%s) is generaly a bad idea.\n", dp->d_namep); - bu_vls_strcat(&vls, "This may cause unexpected problems with other commands.\n"); - bu_vls_strcat(&vls, "Are you sure you want to do this?"); - (void)Tcl_ResetResult(interp); - if (Tcl_VarEval(interp, "tk_messageBox -type yesno ", - "-title Warning -icon question -message {", - bu_vls_addr(&vls), "}", - (char *)NULL) != TCL_OK) { - bu_log("Unable to post question!!!\n"); - } else { - const char *result; - - result = Tcl_GetStringResult(interp); - if (!strcmp(result, "no")) { - no_hide = 1; - } - (void)Tcl_ResetResult(interp); - } - bu_vls_free(&vls); -#endif - } if (no_hide) continue; } @@ -8862,11 +8812,10 @@ /****************** utility routines ********************/ /** - * W D B _ C M P D I R N A M E + * W D B _ C M P D I R N A M E * * Given two pointers to pointers to directory entries, do a string compare * on the respective names and return that value. - * This routine was lifted from mged/columns.c. */ int wdb_cmpdirname(const genptr_t a, @@ -8928,11 +8877,11 @@ } /** - * W D B _ V L S _ C O L _ P R 4 V + * W D B _ V L S _ C O L _ P R 4 V * - * Given a pointer to a list of pointers to names and the number of names - * in that list, sort and print that list in column order over four columns. - * This routine was lifted from mged/columns.c. + * Given a pointer to a list of pointers to names and the number of + * names in that list, sort and print that list in column order over + * four columns. */ void wdb_vls_col_pr4v(struct bu_vls *vls, @@ -9185,11 +9134,10 @@ } /** - * W D B _ V L S _ L I N E _ D P P + * W D B _ V L S _ L I N E _ D P P *@brief - * Given a pointer to a list of pointers to names and the number of names - * in that list, sort and print that list on the same line. - * This routine was lifted from mged/columns.c. + * Given a pointer to a list of pointers to names and the number of + * names in that list, sort and print that list on the same line. */ void wdb_vls_line_dpp(struct bu_vls *vls, @@ -9236,14 +9184,15 @@ } } + /** - * W D B _ G E T S P A C E + * W D B _ G E T S P A C E * - * This routine walks through the directory entry list and mallocs enough - * space for pointers to hold: - * a) all of the entries if called with an argument of 0, or - * b) the number of entries specified by the argument if > 0. - * This routine was lifted from mged/dir.c. + * This routine walks through the directory entry list and mallocs + * enough space for pointers to hold: + * + * a) all of the entries if called with an argument of 0, or + * b) the number of entries specified by the argument if > 0. */ struct directory ** wdb_getspace(struct db_i *dbip, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2010-02-03 22:27:17
|
Revision: 37535 http://brlcad.svn.sourceforge.net/brlcad/?rev=37535&view=rev Author: bob1961 Date: 2010-02-03 22:27:04 +0000 (Wed, 03 Feb 2010) Log Message: ----------- Quell a few warnings when compiling 64-bit Windows. Modified Paths: -------------- brlcad/trunk/src/libged/attr.c brlcad/trunk/src/libged/bigE.c brlcad/trunk/src/libged/bot_dump.c brlcad/trunk/src/libged/bot_face_sort.c brlcad/trunk/src/libged/brep.c brlcad/trunk/src/libged/cc.c brlcad/trunk/src/libged/color.c brlcad/trunk/src/libged/comb_std.c brlcad/trunk/src/libged/copy.c brlcad/trunk/src/libged/copyeval.c brlcad/trunk/src/libged/debugbu.c brlcad/trunk/src/libged/debugdir.c brlcad/trunk/src/libged/debuglib.c brlcad/trunk/src/libged/debugmem.c brlcad/trunk/src/libged/debugnmg.c brlcad/trunk/src/libged/decompose.c 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/ged.c brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/get_obj_bounds.c brlcad/trunk/src/libged/gqa.c brlcad/trunk/src/libged/kill.c brlcad/trunk/src/libged/killtree.c brlcad/trunk/src/libged/ls.c brlcad/trunk/src/libged/make.c brlcad/trunk/src/libged/make_pnts.c brlcad/trunk/src/libged/move_all.c brlcad/trunk/src/libged/nirt.c brlcad/trunk/src/libged/prefix.c brlcad/trunk/src/libged/put_comb.c brlcad/trunk/src/libged/red.c brlcad/trunk/src/libged/rotate_eto.c brlcad/trunk/src/libged/rotate_hyp.c brlcad/trunk/src/libged/rotate_tgc.c brlcad/trunk/src/libged/rt.c brlcad/trunk/src/libged/saveview.c brlcad/trunk/src/libged/scale_ehy.c brlcad/trunk/src/libged/scale_epa.c brlcad/trunk/src/libged/scale_eto.c brlcad/trunk/src/libged/scale_rhc.c brlcad/trunk/src/libged/scale_rpc.c brlcad/trunk/src/libged/search.c brlcad/trunk/src/libged/sphgroup.c brlcad/trunk/src/libged/track.c brlcad/trunk/src/libged/typein.c brlcad/trunk/src/libged/wdb_comb_std.c brlcad/trunk/src/libged/wdb_nirt.c brlcad/trunk/src/libged/wdb_obj.c brlcad/trunk/src/libged/wdb_track.c brlcad/trunk/src/libged/xpush.c brlcad/trunk/src/libged/zap.c Modified: brlcad/trunk/src/libged/attr.c =================================================================== --- brlcad/trunk/src/libged/attr.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/attr.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -219,7 +219,7 @@ for ( i=0; i < avs.count; i++, avpp++ ) { int len; - len = strlen( avpp->name ); + len = (int)strlen( avpp->name ); if ( len > max_attr_name_len ) { max_attr_name_len = len; } @@ -233,7 +233,7 @@ int len; bu_vls_printf( &gedp->ged_result_str, "\t%s", avpp->name ); - len = strlen( avpp->name ); + len = (int)strlen( avpp->name ); tabs2 = tabs1 - 1 - len/8; for ( k=0; k<tabs2; k++ ) { bu_vls_putc( &gedp->ged_result_str, '\t' ); @@ -256,7 +256,7 @@ /* show just the specified attributes */ for ( i=0; i<(size_t)argc; i++ ) { - len = strlen( argv[i] ); + len = (int)strlen( argv[i] ); if ( len > max_attr_name_len ) { max_attr_name_len = len; } @@ -277,7 +277,7 @@ return GED_ERROR; } bu_vls_printf(&gedp->ged_result_str, "\t%s", argv[i]); - len = strlen(val); + len = (int)strlen(val); tabs2 = tabs1 - 1 - len/8; for (k=0; k<tabs2; k++) { bu_vls_putc(&gedp->ged_result_str, '\t'); Modified: brlcad/trunk/src/libged/bigE.c =================================================================== --- brlcad/trunk/src/libged/bigE.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/bigE.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -2210,7 +2210,7 @@ bu_ptbl_reset(&dgcdp->leaf_list); ts.ts_mater = rp->reg_mater; db_string_to_path(&path, gedp->ged_wdbp->dbip, rp->reg_name); - ged_drawH_part2(0, &vhead, &path, &ts, SOLID_NULL, dgcdp); + _ged_drawH_part2(0, &vhead, &path, &ts, SOLID_NULL, dgcdp); db_free_full_path(&path); } /* do not do an rt_free_rti() (closes the database!!!!) */ Modified: brlcad/trunk/src/libged/bot_dump.c =================================================================== --- brlcad/trunk/src/libged/bot_dump.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/bot_dump.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -709,7 +709,6 @@ genptr_t client_data) { int ret; - char *pstr; union tree *curtree; mat_t mat; struct directory *dp; @@ -815,7 +814,6 @@ int ged_bot_dump(struct ged *gedp, int argc, const char *argv[]) { - char idbuf[132]; /* First ID record info */ struct rt_db_internal intern; struct rt_bot_internal *bot; struct directory *dp; Modified: brlcad/trunk/src/libged/bot_face_sort.c =================================================================== --- brlcad/trunk/src/libged/bot_face_sort.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/bot_face_sort.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -72,7 +72,6 @@ struct directory *dp; struct rt_db_internal intern; struct rt_bot_internal *bot; - int id; if ((dp=db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) == DIR_NULL) { continue; Modified: brlcad/trunk/src/libged/brep.c =================================================================== --- brlcad/trunk/src/libged/brep.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/brep.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -44,7 +44,6 @@ { struct bn_vlblock*vbp; char *solid_name; - char *command; static const char *usage = "brep brepname.s [command]"; struct directory *ndp; struct rt_db_internal intern; Modified: brlcad/trunk/src/libged/cc.c =================================================================== --- brlcad/trunk/src/libged/cc.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/cc.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -50,7 +50,6 @@ struct rt_db_internal internal; struct rt_constraint_internal *con_ip; struct directory *dp; - int save_bu_optind; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); GED_CHECK_READ_ONLY(gedp, GED_ERROR); Modified: brlcad/trunk/src/libged/color.c =================================================================== --- brlcad/trunk/src/libged/color.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/color.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -49,14 +49,14 @@ char line[128]; static char hdr[] = "LOW\tHIGH\tRed\tGreen\tBlue\n"; char tmpfil[MAXPATHLEN]; - const char *editstring; + char *editstring; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); GED_CHECK_READ_ONLY(gedp, GED_ERROR); GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR); /* First, grab the editstring off of the argv list */ - editstring = argv[0]; + editstring = (char *)argv[0]; argc--; argv++; @@ -78,7 +78,7 @@ } (void)fclose(fp); - if (!_ged_editit(editstring, tmpfil)) { + if (!_ged_editit(editstring, (const char *)tmpfil)) { bu_vls_printf(&gedp->ged_result_str, "%s: editor returned bad status. Aborted\n", argv[0]); return GED_ERROR; } @@ -165,10 +165,6 @@ int ged_edcolor(struct ged *gedp, int argc, const char *argv[]) { - struct mater *newp; - struct mater *mp; - struct mater *next_mater; - 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/comb_std.c =================================================================== --- brlcad/trunk/src/libged/comb_std.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/comb_std.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -209,7 +209,7 @@ return (0); } } else - name_len = strlen( name ); + name_len = (int)strlen( name ); node->tr_l.tl_name = (char *)bu_malloc(name_len+1, "node name"); bu_strlcpy(node->tr_l.tl_name, name, name_len+1); Modified: brlcad/trunk/src/libged/copy.c =================================================================== --- brlcad/trunk/src/libged/copy.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/copy.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -38,7 +38,6 @@ { struct directory *from_dp; struct bu_external external; - int flags; static const char *usage = "from to"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); @@ -86,7 +85,6 @@ { struct directory *from_dp; struct bu_external external; - int exists; GED_CHECK_DATABASE_OPEN(from_gedp, GED_ERROR); GED_CHECK_DATABASE_OPEN(to_gedp, GED_ERROR); Modified: brlcad/trunk/src/libged/copyeval.c =================================================================== --- brlcad/trunk/src/libged/copyeval.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/copyeval.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -40,7 +40,6 @@ struct rt_db_internal internal, new_int; struct rt_db_internal *ip; mat_t start_mat; - int id; int i; int endpos; char *tok; Modified: brlcad/trunk/src/libged/debugbu.c =================================================================== --- brlcad/trunk/src/libged/debugbu.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/debugbu.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,7 +36,6 @@ int ged_debugbu(struct ged *gedp, int argc, const char *argv[]) { - fastf_t size; static const char *usage = "[hex_code]"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); Modified: brlcad/trunk/src/libged/debugdir.c =================================================================== --- brlcad/trunk/src/libged/debugdir.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/debugdir.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,8 +36,6 @@ int ged_debugdir(struct ged *gedp, int argc, const char *argv[]) { - fastf_t size; - GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR); Modified: brlcad/trunk/src/libged/debuglib.c =================================================================== --- brlcad/trunk/src/libged/debuglib.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/debuglib.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,7 +36,6 @@ int ged_debuglib(struct ged *gedp, int argc, const char *argv[]) { - fastf_t size; static const char *usage = "[hex_code]"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); Modified: brlcad/trunk/src/libged/debugmem.c =================================================================== --- brlcad/trunk/src/libged/debugmem.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/debugmem.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,8 +36,6 @@ int ged_debugmem(struct ged *gedp, int argc, const char *argv[]) { - fastf_t size; - GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR); Modified: brlcad/trunk/src/libged/debugnmg.c =================================================================== --- brlcad/trunk/src/libged/debugnmg.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/debugnmg.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,7 +36,6 @@ int ged_debugnmg(struct ged *gedp, int argc, const char *argv[]) { - fastf_t size; static const char *usage = "[hex_code]"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); Modified: brlcad/trunk/src/libged/decompose.c =================================================================== --- brlcad/trunk/src/libged/decompose.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/decompose.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -133,7 +133,7 @@ struct directory *new_dp; struct nmgregion *decomp_r; char shell_no[32]; - int end_prefix; + size_t end_prefix; next_s = BU_LIST_NEXT( shell, &decomp_s->l ); @@ -156,7 +156,7 @@ end_prefix = strlen( prefix ); if ( end_prefix + strlen( shell_no ) > NAMESIZE ) end_prefix = NAMESIZE - strlen( shell_no ); - bu_vls_trunc( &solid_name, end_prefix ); + bu_vls_trunc( &solid_name, (int)end_prefix ); bu_vls_strncat( &solid_name, shell_no, NAMESIZE-bu_vls_strlen(&solid_name) ); } else { bu_vls_strcat( &solid_name, shell_no ); Modified: brlcad/trunk/src/libged/draw.c =================================================================== --- brlcad/trunk/src/libged/draw.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/draw.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -116,7 +116,7 @@ * This routine must be prepared to run in parallel. */ void -ged_drawH_part2(int dashflag, struct bu_list *vhead, const struct db_full_path *pathp, struct db_tree_state *tsp, struct solid *existing_sp, struct _ged_client_data *dgcdp) +_ged_drawH_part2(int dashflag, struct bu_list *vhead, const struct db_full_path *pathp, struct db_tree_state *tsp, struct solid *existing_sp, struct _ged_client_data *dgcdp) { struct solid *sp; @@ -240,7 +240,7 @@ } /* - * XXX HACK CTJ - ged_drawH_part2 sets the default color of a + * XXX HACK CTJ - _ged_drawH_part2 sets the default color of a * solid by looking in tps->ts_mater.ma_color, for pseudo * solids, this needs to be something different and drawH * has no idea or need to know what type of solid this is. @@ -253,12 +253,12 @@ tsp->ts_mater.ma_color[0] = 0; tsp->ts_mater.ma_color[1] = 128; tsp->ts_mater.ma_color[2] = 128; - ged_drawH_part2(dashflag, &vhead, pathp, tsp, SOLID_NULL, dgcdp); + _ged_drawH_part2(dashflag, &vhead, pathp, tsp, SOLID_NULL, dgcdp); tsp->ts_mater.ma_color[0] = r; tsp->ts_mater.ma_color[1] = g; tsp->ts_mater.ma_color[2] = b; } else { - ged_drawH_part2(dashflag, &vhead, pathp, tsp, SOLID_NULL, dgcdp); + _ged_drawH_part2(dashflag, &vhead, pathp, tsp, SOLID_NULL, dgcdp); } /* Indicate success by returning something other than TREE_NULL */ @@ -379,7 +379,7 @@ /* Successful fastpath drawing of this solid */ db_add_node_to_full_path(&pp, dp); - ged_drawH_part2(0, &vhead, &pp, tsp, SOLID_NULL, dgcdp); + _ged_drawH_part2(0, &vhead, &pp, tsp, SOLID_NULL, dgcdp); db_free_full_path(&pp); } @@ -495,7 +495,7 @@ } nmg_r_to_vlist(&vhead, r, style); - ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); + _ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); if (dgcdp->draw_edge_uses) { nmg_vlblock_r(dgcdp->draw_edge_uses_vbp, r, 1); @@ -878,7 +878,7 @@ BU_LIST_INIT(&vhead); (void)rt_bot_plot_poly(&vhead, ip, tsp->ts_ttol, tsp->ts_tol); - ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); + _ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); } else if (ip->idb_major_type == DB5_MAJORTYPE_BRLCAD && ip->idb_minor_type == DB5_MINORTYPE_BRLCAD_POLY) { struct bu_list vhead; @@ -886,7 +886,7 @@ BU_LIST_INIT(&vhead); (void)rt_pg_plot_poly(&vhead, ip, tsp->ts_ttol, tsp->ts_tol); - ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); + _ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); } else { /* save shaded mode states */ int save_dgo_shaded_mode = dgcdp->gedp->ged_gdp->gd_shaded_mode; @@ -916,14 +916,14 @@ BU_LIST_INIT(&vhead); (void)rt_bot_plot_poly(&vhead, ip, tsp->ts_ttol, tsp->ts_tol); - ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); + _ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); } else if (ip->idb_minor_type == DB5_MINORTYPE_BRLCAD_POLY) { struct bu_list vhead; BU_LIST_INIT(&vhead); (void)rt_pg_plot_poly(&vhead, ip, tsp->ts_ttol, tsp->ts_tol); - ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); + _ged_drawH_part2(0, &vhead, pathp, tsp, SOLID_NULL, dgcdp); } else _ged_drawtrees(dgcdp->gedp, ac, av, 3, client_data); } else { @@ -1280,7 +1280,6 @@ ged_addToDisplay(struct ged *gedp, const char *name) { - int i; struct directory *dp = NULL; struct ged_display_list *gdlp = NULL; char *cp = NULL; @@ -1304,9 +1303,6 @@ /* Make sure name is not already in the list */ gdlp = BU_LIST_NEXT(ged_display_list, &gedp->ged_gdp->gd_headDisplay); while (BU_LIST_NOT_HEAD(gdlp, &gedp->ged_gdp->gd_headDisplay)) { - struct solid *sp; - struct solid *nsp; - if (!strcmp(name, bu_vls_addr(&gdlp->gdl_path))) goto end; Modified: brlcad/trunk/src/libged/editit.c =================================================================== --- brlcad/trunk/src/libged/editit.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/editit.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -37,7 +37,7 @@ #include "ged.h" int -_ged_editit(char *editstring, char *filename) +_ged_editit(char *editstring, const char *filename) { int pid = 0; int xpid = 0; Modified: brlcad/trunk/src/libged/edmater.c =================================================================== --- brlcad/trunk/src/libged/edmater.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/edmater.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -29,7 +29,7 @@ # include <unistd.h> #endif -#include "ged.h" +#include "./ged_private.h" int ged_edmater(struct ged *gedp, int argc, const char *argv[]) Modified: brlcad/trunk/src/libged/erase.c =================================================================== --- brlcad/trunk/src/libged/erase.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/erase.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -74,7 +74,6 @@ for ( i=0; i<argc; i++ ) { char *ptr_A=NULL; char *ptr_o=NULL; - char *c; if ( *argv[i] != '-' ) break; if ( (ptr_A=strchr(argv[i], 'A' )) ) flag_A_attr = 1; Modified: brlcad/trunk/src/libged/ged.c =================================================================== --- brlcad/trunk/src/libged/ged.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/ged.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -220,7 +220,11 @@ VSET(gvp->gv_view_scale.gos_text_color, 255, 255, 255); /* FIXME: this causes the shaders.sh regression to fail */ +#if 0 + _ged_mat_aet(gvp); +#else /* _ged_mat_aet(gvp); */ +#endif ged_view_update(gvp); } Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/ged_private.h 2010-02-03 22:27:04 UTC (rev 37535) @@ -165,11 +165,18 @@ const char *argv[], int kind, struct _ged_client_data *_dgcdp)); +BU_EXTERN (void _ged_drawH_part2, + (int dashflag, + struct bu_list *vhead, + const struct db_full_path *pathp, + struct db_tree_state *tsp, + struct solid *existing_sp, + struct _ged_client_data *dgcdp)); /* defined in editit.c */ BU_EXTERN (int _ged_editit, - (char *editstring, - char *file)); + (const char *editstring, + const char *file)); /* defined in erase.c */ BU_EXTERN (void _ged_eraseobjpath, @@ -190,11 +197,11 @@ BU_EXTERN (void _ged_eraseAllNamesFromDisplay, (struct ged *gedp, const char *name, - int skip_first)); + const int skip_first)); BU_EXTERN (void _ged_eraseAllPathsFromDisplay, (struct ged *gedp, const char *path, - int skip_first)); + const int skip_first)); BU_EXTERN (void _ged_eraseAllSubpathsFromSolidList, (struct ged *gedp, struct ged_display_list *gdlp, @@ -308,7 +315,7 @@ BU_EXTERN (void _ged_rt_set_eye_model, (struct ged *gedp, vect_t eye_model)); -BU_EXTERN (int ged_run_rt, +BU_EXTERN (int _ged_run_rt, (struct ged *gdp)); BU_EXTERN (void _ged_rt_write, (struct ged *gedp, Modified: brlcad/trunk/src/libged/get_obj_bounds.c =================================================================== --- brlcad/trunk/src/libged/get_obj_bounds.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/get_obj_bounds.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -129,7 +129,7 @@ VMINMAX(rpp_min, rpp_max, reg_min); VMINMAX(rpp_min, rpp_max, reg_max); } else { - int name_len; + size_t name_len; not_found: /* input name may be a group, need to check all regions under Modified: brlcad/trunk/src/libged/gqa.c =================================================================== --- brlcad/trunk/src/libged/gqa.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/gqa.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -1602,7 +1602,7 @@ reg_tbl[i].r_volume = bu_calloc(num_views, sizeof(double), "len"); reg_tbl[i].r_weight = bu_calloc(num_views, sizeof(double), "len"); - m = strlen(regp->reg_name); + m = (int)strlen(regp->reg_name); if (m > max_region_name_len) max_region_name_len = m; reg_tbl[i].optr = &obj_tbl[ find_cmd_line_obj(obj_tbl, ®p->reg_name[1]) ]; Modified: brlcad/trunk/src/libged/kill.c =================================================================== --- brlcad/trunk/src/libged/kill.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/kill.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -97,8 +97,6 @@ for (i = 1; i < argc; i++) { if ((dp = db_lookup(gedp->ged_wdbp->dbip, argv[i], verbose)) != DIR_NULL) { - struct directory *dpp[2]; - if ( !force && dp->d_major_type == DB5_MAJORTYPE_ATTRIBUTE_ONLY && dp->d_minor_type == 0 ) { bu_vls_printf(&gedp->ged_result_str, "You attempted to delete the _GLOBAL object.\n"); bu_vls_printf(&gedp->ged_result_str, "\tIf you delete the \"_GLOBAL\" object you will be losing some important information\n" ); Modified: brlcad/trunk/src/libged/killtree.c =================================================================== --- brlcad/trunk/src/libged/killtree.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/killtree.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -149,7 +149,6 @@ struct directory *dp, genptr_t ptr) { - struct directory *dpp[2]; struct ged_killtree_data *gktdp = (struct ged_killtree_data *)ptr; if (dbip == DBI_NULL) Modified: brlcad/trunk/src/libged/ls.c =================================================================== --- brlcad/trunk/src/libged/ls.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/ls.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -171,7 +171,7 @@ */ maxnamelen = 0; for (k=0; k < num_in_list; k++) { - namelen = strlen(list_of_names[k]->d_namep); + namelen = (int)strlen(list_of_names[k]->d_namep); if (namelen > maxnamelen) maxnamelen = namelen; } @@ -193,7 +193,7 @@ for (j=0; j < numcol; j++) { this_one = j * lines + i; bu_vls_printf(vls, "%s", list_of_names[this_one]->d_namep); - namelen = strlen(list_of_names[this_one]->d_namep); + namelen = (int)strlen(list_of_names[this_one]->d_namep); /* * Region and ident checks here.... Since the code has @@ -246,8 +246,8 @@ int isComb=0, isRegion=0; int isSolid=0; const char *type=NULL; - int max_nam_len = 0; - int max_type_len = 0; + size_t max_nam_len = 0; + size_t max_type_len = 0; struct directory *dp; qsort((genptr_t)list_of_names, @@ -255,7 +255,7 @@ (int (*)(const void *, const void *))cmpdirname); for (i=0; i < num_in_list; i++) { - int len; + size_t len; dp = list_of_names[i]; len = strlen(dp->d_namep); @@ -331,9 +331,9 @@ (rflag && isRegion) || (sflag && isSolid)) { bu_vls_printf(vls, "%s", dp->d_namep); - bu_vls_spaces(vls, max_nam_len - strlen(dp->d_namep)); + bu_vls_spaces(vls, (int)(max_nam_len - strlen(dp->d_namep))); bu_vls_printf(vls, " %s", type); - bu_vls_spaces(vls, max_type_len - strlen(type)); + bu_vls_spaces(vls, (int)(max_type_len - strlen(type))); bu_vls_printf(vls, " %2d %2d %ld\n", dp->d_major_type, dp->d_minor_type, (long)(dp->d_len)); } Modified: brlcad/trunk/src/libged/make.c =================================================================== --- brlcad/trunk/src/libged/make.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/make.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -55,7 +55,6 @@ struct rt_tor_internal *tor_ip; struct rt_grip_internal *grp_ip; struct rt_half_internal *half_ip; - struct rt_hyp_internal *hyp_ip; struct rt_rpc_internal *rpc_ip; struct rt_rhc_internal *rhc_ip; struct rt_epa_internal *epa_ip; Modified: brlcad/trunk/src/libged/make_pnts.c =================================================================== --- brlcad/trunk/src/libged/make_pnts.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/make_pnts.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -112,8 +112,8 @@ { struct bu_vls str; char *temp_string = (char *)NULL; - int index = 0; - int format_string_length = 0; + size_t index = 0; + size_t format_string_length = 0; int ret = GED_OK; bu_vls_init(&str); Modified: brlcad/trunk/src/libged/move_all.c =================================================================== --- brlcad/trunk/src/libged/move_all.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/move_all.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -35,36 +35,6 @@ #include "./ged_private.h" HIDDEN int -ged_move_all_file(struct ged *gedp, int nflag, const char *file) -{ - FILE *fp; - char line[512]; - - if ((fp=fopen(file, "r")) == NULL) { - bu_vls_printf(&gedp->ged_result_str, "cannot open %s\n", file); - return GED_ERROR; - } - - while (bu_fgets(line, sizeof(line), fp) != NULL) { - char *cp; - char *new_av[3]; - - /* Skip comments */ - if ((cp = strchr(line, '#')) != NULL) - *cp = '\0'; - - if (bu_argv_from_string(new_av, 2, line) != 2) - continue; - - ged_move_all_func(gedp, nflag, (const char *)new_av[0], (const char *)new_av[1]); - } - - fclose(fp); - - return GED_OK; -} - -HIDDEN int ged_move_all_func(struct ged *gedp, int nflag, const char *old, const char *new) { int i; @@ -255,6 +225,36 @@ return GED_OK; } +HIDDEN int +ged_move_all_file(struct ged *gedp, int nflag, const char *file) +{ + FILE *fp; + char line[512]; + + if ((fp=fopen(file, "r")) == NULL) { + bu_vls_printf(&gedp->ged_result_str, "cannot open %s\n", file); + return GED_ERROR; + } + + while (bu_fgets(line, sizeof(line), fp) != NULL) { + char *cp; + char *new_av[3]; + + /* Skip comments */ + if ((cp = strchr(line, '#')) != NULL) + *cp = '\0'; + + if (bu_argv_from_string(new_av, 2, line) != 2) + continue; + + ged_move_all_func(gedp, nflag, (const char *)new_av[0], (const char *)new_av[1]); + } + + fclose(fp); + + return GED_OK; +} + int ged_move_all(struct ged *gedp, int argc, const char *argv[]) { Modified: brlcad/trunk/src/libged/nirt.c =================================================================== --- brlcad/trunk/src/libged/nirt.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/nirt.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -92,7 +92,7 @@ SECURITY_ATTRIBUTES sa; char name[1024] = {0}; char line1[2048] = {0}; - int rem = 2048; + size_t rem = 2048; #endif int use_input_orig = 0; vect_t center_model; Modified: brlcad/trunk/src/libged/prefix.c =================================================================== --- brlcad/trunk/src/libged/prefix.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/prefix.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -151,7 +151,7 @@ { char *prefix, *obj; char tempstring_v4[NAMESIZE+1]; - int len = NAMESIZE+1; + size_t len = NAMESIZE+1; RT_CK_DBI( dbip ); RT_CK_TREE( comb_leaf ); Modified: brlcad/trunk/src/libged/put_comb.c =================================================================== --- brlcad/trunk/src/libged/put_comb.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/put_comb.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -268,7 +268,7 @@ name = ptr; /* Eliminate trailing white space from name */ - i = strlen(ptr); + i = (int)strlen(ptr); while (isspace(name[--i])) name[i] = '\0'; Modified: brlcad/trunk/src/libged/red.c =================================================================== --- brlcad/trunk/src/libged/red.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/red.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -187,7 +187,7 @@ { char *ptr1; char *ptr2; - int j; + size_t j; /* find the keyword */ ptr1 = strstr( &line[i], word ); @@ -272,7 +272,7 @@ if ( (ptr=ged_find_keyword(i, line, "NAME" ) ) ) { if ( gedp->ged_wdbp->dbip->dbi_version < 5 ) { - int len; + size_t len; len = strlen( ptr ); if ( len > NAMESIZE ) { @@ -394,7 +394,7 @@ name_v4[j] = '\0'; name = name_v4; } else { - int len; + size_t len; len = strlen( ptr ); name_v5 = (char *)bu_malloc( len+1, "name_v5" ); @@ -749,7 +749,7 @@ if (gedp->ged_wdbp->dbip->dbi_version < 5) i = NAMESIZE; else - i = strlen(name); + i = (int)strlen(name); while (isspace(name[--i])) name[i] = '\0'; Modified: brlcad/trunk/src/libged/rotate_eto.c =================================================================== --- brlcad/trunk/src/libged/rotate_eto.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/rotate_eto.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -38,8 +38,6 @@ int _ged_rotate_eto(struct ged *gedp, struct rt_eto_internal *eto, const char *attribute, matp_t rmat) { - fastf_t newrad; - RT_ETO_CK_MAGIC(eto); if (attribute[1] != '\0') { Modified: brlcad/trunk/src/libged/rotate_hyp.c =================================================================== --- brlcad/trunk/src/libged/rotate_hyp.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/rotate_hyp.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -38,8 +38,6 @@ int _ged_rotate_hyp(struct ged *gedp, struct rt_hyp_internal *hyp, const char *attribute, matp_t rmat) { - fastf_t newrad; - RT_HYP_CK_MAGIC(hyp); if (attribute[1] != '\0') { Modified: brlcad/trunk/src/libged/rotate_tgc.c =================================================================== --- brlcad/trunk/src/libged/rotate_tgc.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/rotate_tgc.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -38,8 +38,6 @@ int _ged_rotate_tgc(struct ged *gedp, struct rt_tgc_internal *tgc, const char *attribute, matp_t rmat) { - fastf_t newrad; - RT_TGC_CK_MAGIC(tgc); switch (attribute[0]) { Modified: brlcad/trunk/src/libged/rt.c =================================================================== --- brlcad/trunk/src/libged/rt.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/rt.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -398,11 +398,12 @@ if (read_failed) { int retcode = 0; - int rpid; int aborted; /* was it aborted? */ #ifndef _WIN32 + int rpid; + Tcl_DeleteFileHandler(run_rtp->fd); close(run_rtp->fd); Modified: brlcad/trunk/src/libged/saveview.c =================================================================== --- brlcad/trunk/src/libged/saveview.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/saveview.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -43,7 +43,6 @@ { struct ged_display_list *gdlp; struct ged_display_list *next_gdlp; - struct solid *sp; int i; FILE *fp; char *base; Modified: brlcad/trunk/src/libged/scale_ehy.c =================================================================== --- brlcad/trunk/src/libged/scale_ehy.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/scale_ehy.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,7 +36,6 @@ int _ged_scale_ehy(struct ged *gedp, struct rt_ehy_internal *ehy, const char *attribute, fastf_t sf, int rflag) { - fastf_t ma, mb; fastf_t newrad; RT_EHY_CK_MAGIC(ehy); Modified: brlcad/trunk/src/libged/scale_epa.c =================================================================== --- brlcad/trunk/src/libged/scale_epa.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/scale_epa.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,7 +36,6 @@ int _ged_scale_epa(struct ged *gedp, struct rt_epa_internal *epa, const char *attribute, fastf_t sf, int rflag) { - fastf_t ma, mb; fastf_t newrad; RT_EPA_CK_MAGIC(epa); Modified: brlcad/trunk/src/libged/scale_eto.c =================================================================== --- brlcad/trunk/src/libged/scale_eto.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/scale_eto.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -38,8 +38,6 @@ int _ged_scale_eto(struct ged *gedp, struct rt_eto_internal *eto, const char *attribute, fastf_t sf, int rflag) { - fastf_t newrad; - RT_ETO_CK_MAGIC(eto); switch (attribute[0]) { Modified: brlcad/trunk/src/libged/scale_rhc.c =================================================================== --- brlcad/trunk/src/libged/scale_rhc.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/scale_rhc.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,8 +36,6 @@ int _ged_scale_rhc(struct ged *gedp, struct rt_rhc_internal *rhc, const char *attribute, fastf_t sf, int rflag) { - fastf_t ma, mb; - RT_RHC_CK_MAGIC(rhc); switch (attribute[0]) { Modified: brlcad/trunk/src/libged/scale_rpc.c =================================================================== --- brlcad/trunk/src/libged/scale_rpc.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/scale_rpc.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -36,8 +36,6 @@ int _ged_scale_rpc(struct ged *gedp, struct rt_rpc_internal *rpc, const char *attribute, fastf_t sf, int rflag) { - fastf_t ma, mb; - RT_RPC_CK_MAGIC(rpc); switch (attribute[0]) { Modified: brlcad/trunk/src/libged/search.c =================================================================== --- brlcad/trunk/src/libged/search.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/search.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -440,6 +440,9 @@ bu_vls_printf(&gedp->ged_result_str, "db_functree_subtree: unrecognized operator %d\n", tp->tr_op ); bu_bomb( "db_functree_subtree: unrecognized operator\n" ); } + + /* Silence compiler warnings */ + return 0; } /* @@ -728,7 +731,6 @@ int checkval = 0; int strcomparison = 0; int i; - long attr_val; bu_vls_init(&attribname); bu_vls_init(&value); Modified: brlcad/trunk/src/libged/sphgroup.c =================================================================== --- brlcad/trunk/src/libged/sphgroup.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/sphgroup.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -40,9 +40,8 @@ struct directory *dp, *sphdp; point_t obj_min, obj_max; point_t rpp_min, rpp_max; - point_t testpts[8]; point_t centerpt; - int i, j; + int i; int inside_flag = 0; struct rt_db_internal sph_intern; struct rt_ell_internal *bsph; Modified: brlcad/trunk/src/libged/track.c =================================================================== --- brlcad/trunk/src/libged/track.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/track.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -197,7 +197,7 @@ /* base name */ arg = 1; grpname = bu_strdup(argv[arg]); - grpname_len = strlen(grpname); + grpname_len = (int)strlen(grpname); len = grpname_len + 1 + extraChars; solname = bu_malloc(len, "solid name"); regname = bu_malloc(len, "region name"); Modified: brlcad/trunk/src/libged/typein.c =================================================================== --- brlcad/trunk/src/libged/typein.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/typein.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -2389,7 +2389,7 @@ /* P N T S _ I N */ static int pnts_in(struct ged *gedp, int argc, const char **argv, struct rt_db_internal *intern, char **prompt) { - int i, j; + int i; unsigned long numPoints; struct rt_pnts_internal *pnts; void *headPoint; @@ -2751,7 +2751,6 @@ struct rt_db_internal internal; char **menu; int nvals, (*fn_in)(); - void (*cur_sigint)(); GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); GED_CHECK_READ_ONLY(gedp, GED_ERROR); Modified: brlcad/trunk/src/libged/wdb_comb_std.c =================================================================== --- brlcad/trunk/src/libged/wdb_comb_std.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/wdb_comb_std.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -215,7 +215,7 @@ return (0); } } else - name_len = strlen( name ); + name_len = (int)strlen( name ); node->tr_l.tl_name = (char *)bu_malloc(name_len+1, "node name"); bu_strlcpy(node->tr_l.tl_name, name, name_len+1); Modified: brlcad/trunk/src/libged/wdb_nirt.c =================================================================== --- brlcad/trunk/src/libged/wdb_nirt.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/wdb_nirt.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -80,16 +80,16 @@ char **vp; FILE *fp_in; FILE *fp_out, *fp_err; +#ifndef _WIN32 int pid, rpid; int retcode; -#ifndef _WIN32 int pipe_in[2]; int pipe_out[2]; int pipe_err[2]; #else - HANDLE pipe_in[2], hSaveStdin, pipe_inDup; - HANDLE pipe_out[2], hSaveStdout, pipe_outDup; - HANDLE pipe_err[2], hSaveStderr, pipe_errDup; + HANDLE pipe_in[2], pipe_inDup; + HANDLE pipe_out[2], pipe_outDup; + HANDLE pipe_err[2], pipe_errDup; STARTUPINFO si; PROCESS_INFORMATION pi; SECURITY_ATTRIBUTES sa; @@ -368,7 +368,7 @@ si.wShowWindow = SW_HIDE; snprintf(line1, rem, "%s ", dgop->dgo_rt_cmd[0]); - rem -= strlen(line1) - 1; + rem -= (int)strlen(line1) - 1; for (i=1; i<dgop->dgo_rt_cmd_len; i++) { /* skip commands */ @@ -382,7 +382,7 @@ return TCL_ERROR; } bu_strlcat(line1, name, sizeof(line1)); - rem -= strlen(name); + rem -= (int)strlen(name); } } Modified: brlcad/trunk/src/libged/wdb_obj.c =================================================================== --- brlcad/trunk/src/libged/wdb_obj.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/wdb_obj.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -6105,7 +6105,7 @@ snprintf(format_v5, 25, "%%s_%%0%dd", digits); snprintf(format_v4, 25, "_%%0%dd", digits); - name_length = strlen(dp->d_namep); + name_length = (int)strlen(dp->d_namep); if (name_length + digits + 1 > NAMESIZE - 1) suffix_start = NAMESIZE - digits - 2; else @@ -7631,7 +7631,7 @@ for (i=0; i < avs.count; i++, avpp++) { int len; - len = strlen(avpp->name); + len = (int)strlen(avpp->name); if (len > max_attr_name_len) { max_attr_name_len = len; } @@ -7645,7 +7645,7 @@ int len; bu_vls_printf(&vls, "\t%s", avpp->name); - len = strlen(avpp->name); + len = (int)strlen(avpp->name); tabs2 = tabs1 - 1 - len/8; for (k=0; k<tabs2; k++) { bu_vls_putc(&vls, '\t'); @@ -7668,7 +7668,7 @@ /* show just the specified attributes */ for (i=0; i<argc; i++) { - len = strlen(argv[i]); + len = (int)strlen(argv[i]); if (len > max_attr_name_len) { max_attr_name_len = len; } @@ -7690,7 +7690,7 @@ return TCL_ERROR; } bu_vls_printf(&vls, "\t%s", argv[i]); - len = strlen(val); + len = (int)strlen(val); tabs2 = tabs1 - 1 - len/8; for (k=0; k<tabs2; k++) { bu_vls_putc(&vls, '\t'); @@ -8956,7 +8956,7 @@ */ maxnamelen = 0; for (k=0; k < num_in_list; k++) { - namelen = strlen(list_of_names[k]->d_namep); + namelen = (int)strlen(list_of_names[k]->d_namep); if (namelen > maxnamelen) maxnamelen = namelen; } @@ -8978,7 +8978,7 @@ for (j=0; j < numcol; j++) { this_one = j * lines + i; bu_vls_printf(vls, "%s", list_of_names[this_one]->d_namep); - namelen = strlen(list_of_names[this_one]->d_namep); + namelen = (int)strlen(list_of_names[this_one]->d_namep); /* * Region and ident checks here.... Since the code @@ -9047,7 +9047,7 @@ int len; dp = list_of_names[i]; - len = strlen(dp->d_namep); + len = (int)strlen(dp->d_namep); if (len > max_nam_len) max_nam_len = len; @@ -9056,17 +9056,17 @@ else if (dp->d_flags & DIR_COMB) len = 4; else if (dp->d_flags & DIR_SOLID) - len = strlen(rt_functab[dp->d_minor_type].ft_label); + len = (int)strlen(rt_functab[dp->d_minor_type].ft_label); else { switch (list_of_names[i]->d_major_type) { case DB5_MAJORTYPE_ATTRIBUTE_ONLY: len = 6; break; case DB5_MAJORTYPE_BINARY_MIME: - len = strlen("binary(mime)"); + len = (int)strlen("binary(mime)"); break; case DB5_MAJORTYPE_BINARY_UNIF: - len = strlen(binu_types[list_of_names[i]->d_minor_type]); + len = (int)strlen(binu_types[list_of_names[i]->d_minor_type]); break; } } @@ -9120,9 +9120,9 @@ (rflag && isRegion) || (sflag && isSolid)) { bu_vls_printf(vls, "%s", dp->d_namep); - bu_vls_spaces(vls, max_nam_len - strlen(dp->d_namep)); + bu_vls_spaces(vls, (int)(max_nam_len - strlen(dp->d_namep))); bu_vls_printf(vls, " %s", type); - bu_vls_spaces(vls, max_type_len - strlen(type)); + bu_vls_spaces(vls, (int)(max_type_len - strlen(type))); bu_vls_printf(vls, " %2d %2d %ld\n", dp->d_major_type, dp->d_minor_type, (long)(dp->d_len)); } @@ -10320,7 +10320,6 @@ struct ged ged; Tcl_DString ds; int ret; - char flags[128]; /*XXX Eventually the clientData will be a "struct ged". * In the meantime ... Modified: brlcad/trunk/src/libged/wdb_track.c =================================================================== --- brlcad/trunk/src/libged/wdb_track.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/wdb_track.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -213,7 +213,7 @@ /* base name */ arg = 1; grpname = bu_strdup(argv[arg]); - grpname_len = strlen(grpname); + grpname_len = (int)strlen(grpname); len = grpname_len + 1 + extraChars; solname = bu_malloc(len, "solid name"); regname = bu_malloc(len, "region name"); Modified: brlcad/trunk/src/libged/xpush.c =================================================================== --- brlcad/trunk/src/libged/xpush.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/xpush.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -141,7 +141,7 @@ snprintf(format_v5, 50, "%%s_%%0%dd", digits); snprintf(format_v4, 50, "_%%0%dd", digits); - name_length = strlen(dp->d_namep); + name_length = (int)strlen(dp->d_namep); if (name_length + digits + 1 > NAMESIZE - 1) suffix_start = NAMESIZE - digits - 2; else Modified: brlcad/trunk/src/libged/zap.c =================================================================== --- brlcad/trunk/src/libged/zap.c 2010-02-03 21:00:18 UTC (rev 37534) +++ brlcad/trunk/src/libged/zap.c 2010-02-03 22:27:04 UTC (rev 37535) @@ -45,7 +45,6 @@ ged_zap(struct ged *gedp, int argc, const char *argv[]) { struct solid *sp; - struct solid *nsp; struct ged_display_list *gdlp; struct directory *dp; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-02-23 07:04:45
|
Revision: 37716 http://brlcad.svn.sourceforge.net/brlcad/?rev=37716&view=rev Author: brlcad Date: 2010-02-23 07:04:39 +0000 (Tue, 23 Feb 2010) Log Message: ----------- move the struct into the only file that actually uses it. Modified Paths: -------------- brlcad/trunk/src/libged/ged_private.h brlcad/trunk/src/libged/rt.c Modified: brlcad/trunk/src/libged/ged_private.h =================================================================== --- brlcad/trunk/src/libged/ged_private.h 2010-02-23 06:31:31 UTC (rev 37715) +++ brlcad/trunk/src/libged/ged_private.h 2010-02-23 07:04:39 UTC (rev 37716) @@ -94,11 +94,6 @@ int num_halfs; }; -struct _ged_rt_client_data { - struct ged_run_rt *rrtp; - struct ged *gedp; -}; - struct _ged_trace_data { struct ged *gtd_gedp; struct directory *gtd_path[_GED_MAX_LEVELS]; Modified: brlcad/trunk/src/libged/rt.c =================================================================== --- brlcad/trunk/src/libged/rt.c 2010-02-23 06:31:31 UTC (rev 37715) +++ brlcad/trunk/src/libged/rt.c 2010-02-23 07:04:39 UTC (rev 37716) @@ -44,6 +44,12 @@ #include "./ged_private.h" +struct _ged_rt_client_data { + struct ged_run_rt *rrtp; + struct ged *gedp; +}; + + int ged_rt(struct ged *gedp, int argc, const char *argv[]) { @@ -358,8 +364,7 @@ void -_ged_rt_output_handler(ClientData clientData, - int mask) +_ged_rt_output_handler(ClientData clientData, int mask __attribute__((unused))) { struct _ged_rt_client_data *drcdp = (struct _ged_rt_client_data *)clientData; struct ged_run_rt *run_rtp; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |