Thread: [brlcad-commits] SF.net SVN: brlcad:[32834] brlcad/trunk/src/mged/utility1.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2008-10-05 04:15:39
|
Revision: 32834 http://brlcad.svn.sourceforge.net/brlcad/?rev=32834&view=rev Author: brlcad Date: 2008-10-05 04:15:33 +0000 (Sun, 05 Oct 2008) Log Message: ----------- stray identity Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2008-10-05 04:06:14 UTC (rev 32833) +++ brlcad/trunk/src/mged/utility1.c 2008-10-05 04:15:33 UTC (rev 32834) @@ -1082,7 +1082,7 @@ bu_ptbl_reset( &cur_path ); if ( (dp = db_lookup( dbip, argv[i], LOOKUP_NOISY)) != DIR_NULL ) - new_tables( dp, &cur_path, identity, flag); + new_tables( dp, &cur_path, bn_mat_identity, flag); else Tcl_AppendResult(interp, " skip this object\n", (char *)NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:22:19
|
Revision: 32835 http://brlcad.svn.sourceforge.net/brlcad/?rev=32835&view=rev Author: brlcad Date: 2008-10-05 04:21:49 +0000 (Sun, 05 Oct 2008) Log Message: ----------- quell constness warnings Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2008-10-05 04:15:33 UTC (rev 32834) +++ brlcad/trunk/src/mged/utility1.c 2008-10-05 04:21:49 UTC (rev 32835) @@ -759,7 +759,7 @@ } static int -sol_number(matp_t matrix, char *name, int *old) +sol_number(const matp_t matrix, char *name, int *old) { int i; struct identt idbuf1, idbuf2; @@ -795,7 +795,7 @@ } static void -new_tables(struct directory *dp, struct bu_ptbl *cur_path, fastf_t *old_mat, int flag) +new_tables(struct directory *dp, struct bu_ptbl *cur_path, const matp_t old_mat, int flag) { struct rt_db_internal intern; struct rt_comb_internal *comb; @@ -1082,7 +1082,7 @@ bu_ptbl_reset( &cur_path ); if ( (dp = db_lookup( dbip, argv[i], LOOKUP_NOISY)) != DIR_NULL ) - new_tables( dp, &cur_path, bn_mat_identity, flag); + new_tables( dp, &cur_path, (const matp_t)bn_mat_identity, flag); else Tcl_AppendResult(interp, " skip this object\n", (char *)NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-12-28 16:06:29
|
Revision: 37044 http://brlcad.svn.sourceforge.net/brlcad/?rev=37044&view=rev Author: indianlarry Date: 2009-12-28 16:06:16 +0000 (Mon, 28 Dec 2009) Log Message: ----------- unused resource fixes for ifree Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2009-12-28 16:03:28 UTC (rev 37043) +++ brlcad/trunk/src/mged/utility1.c 2009-12-28 16:06:16 UTC (rev 37044) @@ -459,7 +459,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 TCL_OK; } @@ -469,7 +469,7 @@ (genptr_t)fp, (genptr_t)&pathpos, (genptr_t)NULL ); } - intern.idb_meth->ft_ifree(&intern, &rt_uniresource); + intern.idb_meth->ft_ifree(&intern); return TCL_OK; } @@ -567,7 +567,7 @@ else Tcl_AppendResult(interp, " ", dp->d_namep, "\n", (char *)NULL); - intern.idb_meth->ft_ifree(&intern, &rt_uniresource); + intern.idb_meth->ft_ifree(&intern); } FOR_ALL_DIRECTORY_END; } @@ -640,14 +640,14 @@ db_non_union_push( comb->tree, &rt_uniresource ); if ( db_ck_v4gift_tree( comb->tree ) < 0 ) { Tcl_AppendResult(interp, "Cannot flatten tree for editing\n", (char *)NULL ); - 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; } @@ -783,7 +783,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; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2010-01-29 16:22:40
|
Revision: 37474 http://brlcad.svn.sourceforge.net/brlcad/?rev=37474&view=rev Author: bob1961 Date: 2010-01-29 16:22:25 +0000 (Fri, 29 Jan 2010) Log Message: ----------- Moved a few variable declarations to the beginning the their respective blocks. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-01-29 16:05:58 UTC (rev 37473) +++ brlcad/trunk/src/mged/utility1.c 2010-01-29 16:22:25 UTC (rev 37474) @@ -126,8 +126,8 @@ { char **av; char **avtmp; - int i; + struct bu_vls editstring; CHECK_DBI_NULL; @@ -141,7 +141,6 @@ return TCL_ERROR; } - struct bu_vls editstring; bu_vls_init(&editstring); get_editor_string(&editstring); @@ -171,7 +170,7 @@ { char **av; char **avtmp; - + struct bu_vls editstring; int i; CHECK_DBI_NULL; @@ -186,7 +185,6 @@ return TCL_ERROR; } - struct bu_vls editstring; bu_vls_init(&editstring); get_editor_string(&editstring); @@ -215,7 +213,7 @@ { char **av; char **avtmp; - + struct bu_vls editstring; int i; CHECK_DBI_NULL; @@ -230,7 +228,6 @@ return TCL_ERROR; } - struct bu_vls editstring; bu_vls_init(&editstring); get_editor_string(&editstring); @@ -259,7 +256,7 @@ { char **av; char **avtmp; - + struct bu_vls editstring; int i; CHECK_DBI_NULL; @@ -274,7 +271,6 @@ return TCL_ERROR; } - struct bu_vls editstring; bu_vls_init(&editstring); get_editor_string(&editstring); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2010-03-10 23:25:49
|
Revision: 37997 http://brlcad.svn.sourceforge.net/brlcad/?rev=37997&view=rev Author: starseeker Date: 2010-03-10 23:25:42 +0000 (Wed, 10 Mar 2010) Log Message: ----------- Might want to allocate enough memory for the new argv rays for the editor commands... Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-03-10 22:54:40 UTC (rev 37996) +++ brlcad/trunk/src/mged/utility1.c 2010-03-10 23:25:42 UTC (rev 37997) @@ -145,7 +145,7 @@ bu_vls_init(&editstring); get_editor_string(&editstring); - av = (char **)bu_malloc(sizeof(char *)*(argc + 1), "f_edcolor: av"); + av = (char **)bu_malloc(sizeof(char *)*(argc + 2), "f_edcolor: av"); av[0] = bu_vls_addr(&editstring); for (i = 1; i < argc + 1; ++i) av[i] = argv[i-1]; @@ -188,7 +188,7 @@ bu_vls_init(&editstring); get_editor_string(&editstring); - av = (char **)bu_malloc(sizeof(char *)*(argc + 1), "f_edcodes: av"); + av = (char **)bu_malloc(sizeof(char *)*(argc + 2), "f_edcodes: av"); av[0] = bu_vls_addr(&editstring); for (i = 1; i < argc + 1; ++i) av[i] = argv[i-1]; @@ -231,7 +231,7 @@ bu_vls_init(&editstring); get_editor_string(&editstring); - av = (char **)bu_malloc(sizeof(char *)*(argc + 1), "f_edmater: av"); + av = (char **)bu_malloc(sizeof(char *)*(argc + 2), "f_edmater: av"); av[0] = bu_vls_addr(&editstring); for (i = 1; i < argc + 1; ++i) av[i] = (char *)argv[i-1]; @@ -274,7 +274,7 @@ bu_vls_init(&editstring); get_editor_string(&editstring); - av = (char **)bu_malloc(sizeof(char *)*(argc + 1), "f_red: av"); + av = (char **)bu_malloc(sizeof(char *)*(argc + 2), "f_red: av"); av[0] = bu_vls_addr(&editstring); for (i = 1; i < argc + 1; ++i) av[i] = argv[i-1]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2010-04-05 15:56:38
|
Revision: 38320 http://brlcad.svn.sourceforge.net/brlcad/?rev=38320&view=rev Author: starseeker Date: 2010-04-05 15:56:32 +0000 (Mon, 05 Apr 2010) Log Message: ----------- Take a stab ad avoiding some warnings. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-04-05 15:35:53 UTC (rev 38319) +++ brlcad/trunk/src/mged/utility1.c 2010-04-05 15:56:32 UTC (rev 38320) @@ -127,7 +127,7 @@ int editit(const char *command, const char *tmpfile) { int argc = 5; - const char **av; + char **av; struct bu_vls editstring; CHECK_DBI_NULL; @@ -136,11 +136,11 @@ get_editor_string(&editstring); av = (char **)bu_malloc(sizeof(char *)*(argc + 1), "editit: av"); - av[0] = command; + av[0] = (char *)command; av[1] = "-e"; av[2] = bu_vls_addr(&editstring); av[3] = "-f"; - av[4] = tmpfile; + av[4] = (char *)tmpfile; av[5] = NULL; ged_editit(gedp, argc, (const char **)av); @@ -243,11 +243,14 @@ f_edmater(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) { char **av; + char **argv_orig; struct bu_vls editstring; int i; CHECK_DBI_NULL; + argv_orig = (char **)argv; + if (argc < 2) { struct bu_vls vls; @@ -262,12 +265,12 @@ get_editor_string(&editstring); av = (char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av"); - av[0] = argv[0]; + av[0] = argv_orig[0]; av[1] = "-E"; - av[2] = bu_vls_addr(&editstring); + av[2] = (char *)bu_vls_addr(&editstring); argc += 2; for (i = 3; i < argc; ++i) { - av[i] = argv[i-2]; + av[i] = argv_orig[i-2]; } av[argc] = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-04-06 11:42:50
|
Revision: 38340 http://brlcad.svn.sourceforge.net/brlcad/?rev=38340&view=rev Author: brlcad Date: 2010-04-06 11:42:44 +0000 (Tue, 06 Apr 2010) Log Message: ----------- move towards constness, not away from it. moreover, avoid malloc/free when the sizes are constant (and small). Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-04-06 03:30:29 UTC (rev 38339) +++ brlcad/trunk/src/mged/utility1.c 2010-04-06 11:42:44 UTC (rev 38340) @@ -125,9 +125,9 @@ * */ int -editit(const char *command, const char *tmpfile) { +editit(const char *command, const char *tempfile) { int argc = 5; - char **av; + const char *av[6] = {NULL, NULL, NULL, NULL, NULL, NULL}; struct bu_vls editstring; CHECK_DBI_NULL; @@ -135,18 +135,16 @@ bu_vls_init(&editstring); get_editor_string(&editstring); - av = (char **)bu_malloc(sizeof(char *)*(argc + 1), "editit: av"); - av[0] = (char *)command; + av[0] = command; av[1] = "-e"; av[2] = bu_vls_addr(&editstring); av[3] = "-f"; - av[4] = (char *)tmpfile; + av[4] = tempfile; av[5] = NULL; ged_editit(gedp, argc, (const char **)av); bu_vls_free(&editstring); - bu_free((genptr_t)av, "editit: av"); return TCL_OK; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-04-06 11:49:54
|
Revision: 38341 http://brlcad.svn.sourceforge.net/brlcad/?rev=38341&view=rev Author: brlcad Date: 2010-04-06 11:49:47 +0000 (Tue, 06 Apr 2010) Log Message: ----------- shouldn't cast away the constness. try propagating it forward. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-04-06 11:42:44 UTC (rev 38340) +++ brlcad/trunk/src/mged/utility1.c 2010-04-06 11:49:47 UTC (rev 38341) @@ -240,15 +240,12 @@ int f_edmater(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) { - char **av; - char **argv_orig; + const char **av; struct bu_vls editstring; int i; CHECK_DBI_NULL; - argv_orig = (char **)argv; - if (argc < 2) { struct bu_vls vls; @@ -262,13 +259,13 @@ bu_vls_init(&editstring); get_editor_string(&editstring); - av = (char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av"); - av[0] = argv_orig[0]; + av = (const char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av"); + av[0] = argv[0]; av[1] = "-E"; - av[2] = (char *)bu_vls_addr(&editstring); + av[2] = (const char *)bu_vls_addr(&editstring); argc += 2; for (i = 3; i < argc; ++i) { - av[i] = argv_orig[i-2]; + av[i] = argv[i-2]; } av[argc] = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-04-09 21:49:03
|
Revision: 38437 http://brlcad.svn.sourceforge.net/brlcad/?rev=38437&view=rev Author: brlcad Date: 2010-04-09 21:48:56 +0000 (Fri, 09 Apr 2010) Log Message: ----------- const qualifier mismatch. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-04-09 21:38:26 UTC (rev 38436) +++ brlcad/trunk/src/mged/utility1.c 2010-04-09 21:48:56 UTC (rev 38437) @@ -240,7 +240,7 @@ int f_edmater(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) { - const char **av; + char **av; struct bu_vls editstring; int i; @@ -259,10 +259,10 @@ bu_vls_init(&editstring); get_editor_string(&editstring); - av = (const char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av"); + av = (char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av"); av[0] = argv[0]; av[1] = "-E"; - av[2] = (const char *)bu_vls_addr(&editstring); + av[2] = bu_vls_addr(&editstring); argc += 2; for (i = 3; i < argc; ++i) { av[i] = argv[i-2]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-04-09 21:54:03
|
Revision: 38438 http://brlcad.svn.sourceforge.net/brlcad/?rev=38438&view=rev Author: brlcad Date: 2010-04-09 21:53:56 +0000 (Fri, 09 Apr 2010) Log Message: ----------- more cleanup, reorder to avoid forward decls. remove slew of non-existent forward decl funcs. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-04-09 21:48:56 UTC (rev 38437) +++ brlcad/trunk/src/mged/utility1.c 2010-04-09 21:53:56 UTC (rev 38438) @@ -17,16 +17,6 @@ * License along with this file; see the file named COPYING for more * information. */ -/** @file utility1.c - * - * Functions - - * f_tables() control routine for building ascii tables - * tables() builds ascii summary tables - * f_edcodes() control routine for editing region ident codes - * edcodes() allows for easy editing of region ident codes - * f_which_id() lists all regions with given ident number - * - */ #include "common.h" @@ -55,9 +45,12 @@ #include "./cmd.h" -int readcodes(), writecodes(); -int loadcodes(), printcodes(FILE *fp, struct directory *dp, int pathpos); -void tables(), edcodes(), changes(), prfield(); +#define ABORTED -99 +#define OLDSOLID 0 +#define NEWSOLID 1 +#define SOL_TABLE 1 +#define REG_TABLE 2 +#define ID_TABLE 3 #define LINELEN 256 #define MAX_LEVELS 12 @@ -71,18 +64,6 @@ }; struct identt identt, idbuf; -#define ABORTED -99 -#define OLDSOLID 0 -#define NEWSOLID 1 -#define SOL_TABLE 1 -#define REG_TABLE 2 -#define ID_TABLE 3 - -/* - * - * F _ T A B L E S : control routine to build ascii tables - */ - char operate; int regflag, numreg, lastmemb, numsol, old_or_new, oper_ok; int idfd, rd_idfd; @@ -93,7 +74,8 @@ static char tmpfil[MAXPATHLEN] = {0}; -static int + +HIDDEN int id_compare(const void *p1, const void *p2) { int id1, id2; @@ -105,7 +87,7 @@ } -static int +HIDDEN int reg_compare(const void *p1, const void *p2) { char *reg1, *reg2; @@ -116,6 +98,7 @@ return(strcmp(reg1, reg2)); } + /* * * E D I T I T @@ -186,9 +169,6 @@ /* - * - * F _ E D C O D E S () - * * control routine for editing region ident codes */ int @@ -323,6 +303,82 @@ } +HIDDEN void +Do_printnode(struct db_i *dbip, struct rt_comb_internal *comb, union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t user_ptr3) +{ + FILE *fp; + int *pathpos; + struct directory *nextdp; + + RT_CK_DBI(dbip); + RT_CK_TREE(comb_leaf); + + if ((nextdp=db_lookup(dbip, comb_leaf->tr_l.tl_name, LOOKUP_NOISY)) == DIR_NULL) + return; + + fp = (FILE *)user_ptr1; + pathpos = (int *)user_ptr2; + + /* recurse on combinations */ + if (nextdp->d_flags & DIR_COMB) + (void)printcodes(fp, nextdp, (*pathpos)+1); +} + + +HIDDEN int +printcodes(FILE *fp, struct directory *dp, int pathpos) +{ + int i; + struct rt_db_internal intern; + struct rt_comb_internal *comb; + int id; + + CHECK_DBI_NULL; + + if (pathpos >= MAX_LEVELS) { + regflag = ABORTED; + return TCL_ERROR; + } + + if (!(dp->d_flags & DIR_COMB)) + return(0); + + if ((id=rt_db_get_internal(&intern, dp, dbip, (matp_t)NULL, &rt_uniresource)) < 0) { + Tcl_AppendResult(interp, "printcodes: Cannot get records for ", + dp->d_namep, "\n", (char *)NULL); + return TCL_ERROR; + } + + if (id != ID_COMBINATION) + return TCL_OK; + + comb = (struct rt_comb_internal *)intern.idb_ptr; + RT_CK_COMB(comb); + + if (comb->region_flag) { + fprintf(fp, "%-6d %-3d %-3d %-4d ", + comb->region_id, + comb->aircode, + comb->GIFTmater, + comb->los); + 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); + return TCL_OK; + } + + if (comb->tree) { + path[pathpos] = dp; + db_tree_funcleaf(dbip, comb, comb->tree, Do_printnode, + (genptr_t)fp, (genptr_t)&pathpos, (genptr_t)NULL); + } + + intern.idb_meth->ft_ifree(&intern); + return TCL_OK; +} + + /* write codes to a file */ int f_wcodes(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) @@ -466,87 +522,10 @@ } -static void -Do_printnode(struct db_i *dbip, struct rt_comb_internal *comb, union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t user_ptr3) -{ - FILE *fp; - int *pathpos; - struct directory *nextdp; - - RT_CK_DBI(dbip); - RT_CK_TREE(comb_leaf); - - if ((nextdp=db_lookup(dbip, comb_leaf->tr_l.tl_name, LOOKUP_NOISY)) == DIR_NULL) - return; - - fp = (FILE *)user_ptr1; - pathpos = (int *)user_ptr2; - - /* recurse on combinations */ - if (nextdp->d_flags & DIR_COMB) - (void)printcodes(fp, nextdp, (*pathpos)+1); -} - - +/* + * compares solids returns 1 if they match or 0 otherwise + */ int -printcodes(FILE *fp, struct directory *dp, int pathpos) -{ - int i; - struct rt_db_internal intern; - struct rt_comb_internal *comb; - int id; - - CHECK_DBI_NULL; - - if (pathpos >= MAX_LEVELS) { - regflag = ABORTED; - return TCL_ERROR; - } - - if (!(dp->d_flags & DIR_COMB)) - return(0); - - if ((id=rt_db_get_internal(&intern, dp, dbip, (matp_t)NULL, &rt_uniresource)) < 0) { - Tcl_AppendResult(interp, "printcodes: Cannot get records for ", - dp->d_namep, "\n", (char *)NULL); - return TCL_ERROR; - } - - if (id != ID_COMBINATION) - return TCL_OK; - - comb = (struct rt_comb_internal *)intern.idb_ptr; - RT_CK_COMB(comb); - - if (comb->region_flag) { - fprintf(fp, "%-6d %-3d %-3d %-4d ", - comb->region_id, - comb->aircode, - comb->GIFTmater, - comb->los); - 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); - return TCL_OK; - } - - if (comb->tree) { - path[pathpos] = dp; - db_tree_funcleaf(dbip, comb, comb->tree, Do_printnode, - (genptr_t)fp, (genptr_t)&pathpos, (genptr_t)NULL); - } - - intern.idb_meth->ft_ifree(&intern); - return TCL_OK; -} - - -/* C H E C K - compares solids returns 1 if they match - 0 otherwise -*/ - -int check(char *a, char *b) { @@ -648,7 +627,7 @@ } -static int +HIDDEN int sol_number(const matp_t matrix, char *name, int *old) { int i; @@ -685,7 +664,7 @@ } -static void +HIDDEN void new_tables(struct directory *dp, struct bu_ptbl *cur_path, const matp_t old_mat, int flag) { struct rt_db_internal intern; @@ -862,6 +841,9 @@ } +/* + * control routine for building ascii tables + */ int f_tables(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-04-09 22:05:22
|
Revision: 38439 http://brlcad.svn.sourceforge.net/brlcad/?rev=38439&view=rev Author: brlcad Date: 2010-04-09 22:05:16 +0000 (Fri, 09 Apr 2010) Log Message: ----------- quell all remaining verbose compilation warnings (gcc401) Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-04-09 21:53:56 UTC (rev 38438) +++ brlcad/trunk/src/mged/utility1.c 2010-04-09 22:05:16 UTC (rev 38439) @@ -65,16 +65,15 @@ struct identt identt, idbuf; char operate; -int regflag, numreg, lastmemb, numsol, old_or_new, oper_ok; +int regflag, lastmemb, old_or_new, oper_ok; +long numsol; +long numreg; int idfd, rd_idfd; -int flag; /* which type of table to make */ FILE *tabptr; char ctemp[7]; -static char tmpfil[MAXPATHLEN] = {0}; - HIDDEN int id_compare(const void *p1, const void *p2) { @@ -139,7 +138,7 @@ * control routine for editing color */ int -f_edcolor(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) +f_edcolor(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interpreter), int argc, char **argv) { char **av; int i; @@ -172,7 +171,7 @@ * control routine for editing region ident codes */ int -f_edcodes(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) +f_edcodes(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char **argv) { char **av; struct bu_vls editstring; @@ -185,7 +184,7 @@ bu_vls_init(&vls); bu_vls_printf(&vls, "help edcodes"); - Tcl_Eval(interp, bu_vls_addr(&vls)); + Tcl_Eval(interpreter, bu_vls_addr(&vls)); bu_vls_free(&vls); return TCL_ERROR; } @@ -218,9 +217,9 @@ * control routine for editing mater information */ int -f_edmater(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) +f_edmater(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, const char **argv) { - char **av; + const char **av; struct bu_vls editstring; int i; @@ -231,7 +230,7 @@ bu_vls_init(&vls); bu_vls_printf(&vls, "help edmater"); - Tcl_Eval(interp, bu_vls_addr(&vls)); + Tcl_Eval(interpreter, bu_vls_addr(&vls)); bu_vls_free(&vls); return TCL_ERROR; } @@ -239,7 +238,7 @@ bu_vls_init(&editstring); get_editor_string(&editstring); - av = (char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av"); + av = (const char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av"); av[0] = argv[0]; av[1] = "-E"; av[2] = bu_vls_addr(&editstring); @@ -264,7 +263,7 @@ * Get editing string and call ged_red */ int -f_red(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) +f_red(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char **argv) { char **av; struct bu_vls editstring; @@ -277,7 +276,7 @@ bu_vls_init(&vls); bu_vls_printf(&vls, "help red"); - Tcl_Eval(interp, bu_vls_addr(&vls)); + Tcl_Eval(interpreter, bu_vls_addr(&vls)); bu_vls_free(&vls); return TCL_ERROR; } @@ -303,28 +302,10 @@ } -HIDDEN void -Do_printnode(struct db_i *dbip, struct rt_comb_internal *comb, union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t user_ptr3) -{ - FILE *fp; - int *pathpos; - struct directory *nextdp; +/* cyclic, for db_tree_funcleaf in printcodes() */ +HIDDEN void Do_printnode(struct db_i *dbip2, struct rt_comb_internal *comb, union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t user_ptr3); - RT_CK_DBI(dbip); - RT_CK_TREE(comb_leaf); - if ((nextdp=db_lookup(dbip, comb_leaf->tr_l.tl_name, LOOKUP_NOISY)) == DIR_NULL) - return; - - fp = (FILE *)user_ptr1; - pathpos = (int *)user_ptr2; - - /* recurse on combinations */ - if (nextdp->d_flags & DIR_COMB) - (void)printcodes(fp, nextdp, (*pathpos)+1); -} - - HIDDEN int printcodes(FILE *fp, struct directory *dp, int pathpos) { @@ -356,7 +337,7 @@ RT_CK_COMB(comb); if (comb->region_flag) { - fprintf(fp, "%-6d %-3d %-3d %-4d ", + fprintf(fp, "%-6ld %-3ld %-3ld %-4ld ", comb->region_id, comb->aircode, comb->GIFTmater, @@ -379,9 +360,31 @@ } +HIDDEN void +Do_printnode(struct db_i *dbip2, struct rt_comb_internal *UNUSED(comb), union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t UNUSED(user_ptr3)) +{ + FILE *fp; + int *pathpos; + struct directory *nextdp; + + RT_CK_DBI(dbip2); + RT_CK_TREE(comb_leaf); + + if ((nextdp=db_lookup(dbip2, comb_leaf->tr_l.tl_name, LOOKUP_NOISY)) == DIR_NULL) + return; + + fp = (FILE *)user_ptr1; + pathpos = (int *)user_ptr2; + + /* recurse on combinations */ + if (nextdp->d_flags & DIR_COMB) + (void)printcodes(fp, nextdp, (*pathpos)+1); +} + + /* write codes to a file */ int -f_wcodes(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) +f_wcodes(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char **argv) { int i; int status; @@ -395,13 +398,13 @@ bu_vls_init(&vls); bu_vls_printf(&vls, "help wcodes"); - Tcl_Eval(interp, bu_vls_addr(&vls)); + Tcl_Eval(interpreter, bu_vls_addr(&vls)); bu_vls_free(&vls); return TCL_ERROR; } if ((fp = fopen(argv[1], "w")) == NULL) { - Tcl_AppendResult(interp, "f_wcodes: Failed to open file - ", argv[1], (char *)NULL); + Tcl_AppendResult(interpreter, "f_wcodes: Failed to open file - ", argv[1], (char *)NULL); return TCL_ERROR; } @@ -424,7 +427,7 @@ /* read codes from a file and load them into the database */ int -f_rcodes(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) +f_rcodes(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char **argv) { int item, air, mat, los; char name[256]; @@ -443,13 +446,13 @@ bu_vls_init(&vls); bu_vls_printf(&vls, "help rcodes"); - Tcl_Eval(interp, bu_vls_addr(&vls)); + Tcl_Eval(interpreter, bu_vls_addr(&vls)); bu_vls_free(&vls); return TCL_ERROR; } if ((fp = fopen(argv[1], "r")) == NULL) { - Tcl_AppendResult(interp, "f_rcodes: Failed to read file - ", argv[1], (char *)NULL); + Tcl_AppendResult(interpreter, "f_rcodes: Failed to read file - ", argv[1], (char *)NULL); return TCL_ERROR; } @@ -469,18 +472,18 @@ continue; if ((dp = db_lookup(dbip, cp, LOOKUP_NOISY)) == DIR_NULL) { - Tcl_AppendResult(interp, "f_rcodes: Warning - ", cp, " not found in database.\n", + Tcl_AppendResult(interpreter, "f_rcodes: Warning - ", cp, " not found in database.\n", (char *)NULL); continue; } if (!(dp->d_flags & DIR_REGION)) { - Tcl_AppendResult(interp, "f_rcodes: Warning ", cp, " not a region\n", (char *)NULL); + Tcl_AppendResult(interpreter, "f_rcodes: Warning ", cp, " not a region\n", (char *)NULL); continue; } if (rt_db_get_internal(&intern, dp, dbip, (matp_t)NULL, &rt_uniresource) != ID_COMBINATION) { - Tcl_AppendResult(interp, "f_rcodes: Warning ", cp, " not a region\n", (char *)NULL); + Tcl_AppendResult(interpreter, "f_rcodes: Warning ", cp, " not a region\n", (char *)NULL); continue; } @@ -508,7 +511,7 @@ if (changed) { /* write out all changes */ if (rt_db_put_internal(dp, dbip, &intern, &rt_uniresource)) { - Tcl_AppendResult(interp, "Database write error, aborting.\n", + Tcl_AppendResult(interpreter, "Database write error, aborting.\n", (char *)NULL); TCL_ERROR_RECOVERY_SUGGESTION; rt_db_free_internal(&intern); @@ -555,7 +558,7 @@ * Finds all combinations using the given shaders */ int -f_which_shader(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) +f_which_shader(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char **argv) { int j; struct directory *dp; @@ -587,7 +590,7 @@ bu_vls_init(&vls); bu_vls_printf(&vls, "help which_shader"); - Tcl_Eval(interp, bu_vls_addr(&vls)); + Tcl_Eval(interpreter, bu_vls_addr(&vls)); bu_vls_free(&vls); (void)signal(SIGINT, SIG_IGN); return TCL_ERROR; @@ -596,7 +599,7 @@ for (j=1; j<myArgc; j++) { if (!sflag) - Tcl_AppendResult(interp, "Combination[s] with shader ", myArgv[j], + Tcl_AppendResult(interpreter, "Combination[s] with shader ", myArgv[j], ":\n", (char *)NULL); /* Examine all COMB nodes */ @@ -614,9 +617,9 @@ continue; if (sflag) - Tcl_AppendElement(interp, dp->d_namep); + Tcl_AppendElement(interpreter, dp->d_namep); else - Tcl_AppendResult(interp, " ", dp->d_namep, + Tcl_AppendResult(interpreter, " ", dp->d_namep, "\n", (char *)NULL); intern.idb_meth->ft_ifree(&intern); } FOR_ALL_DIRECTORY_END; @@ -715,7 +718,7 @@ if (dp->d_flags & DIR_REGION) { numreg++; - (void)fprintf(tabptr, " %-4d %4d %4d %4d %4d ", + (void)fprintf(tabptr, " %-4ld %4ld %4ld %4ld %4ld ", numreg, comb->region_id, comb->aircode, comb->GIFTmater, comb->los); for (k=0; k<BU_PTBL_END(cur_path); k++) { @@ -845,10 +848,12 @@ * control routine for building ascii tables */ int -f_tables(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) +f_tables(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char **argv) { static const char sortcmd[] = "sort -n +1 -2 -o /tmp/ord_id "; static const char catcmd[] = "cat /tmp/ord_id >> "; + + int flag; /* which type of table to make */ struct bu_vls tmp_vls; struct bu_vls cmd; struct bu_ptbl cur_path; @@ -864,7 +869,7 @@ bu_vls_init(&vls); bu_vls_printf(&vls, "help %s", argv[0]); - Tcl_Eval(interp, bu_vls_addr(&vls)); + Tcl_Eval(interpreter, bu_vls_addr(&vls)); bu_vls_free(&vls); return TCL_ERROR; } @@ -898,14 +903,14 @@ flag = ID_TABLE; } else { /* should never reach here */ - Tcl_AppendResult(interp, "tables: input error\n", (char *)NULL); + Tcl_AppendResult(interpreter, "tables: input error\n", (char *)NULL); status = TCL_ERROR; goto end; } /* open the file */ if ((tabptr=fopen(argv[1], "w+")) == NULL) { - Tcl_AppendResult(interp, "Can't open ", argv[1], "\n", (char *)NULL); + Tcl_AppendResult(interpreter, "Can't open ", argv[1], "\n", (char *)NULL); status = TCL_ERROR; goto end; } @@ -958,38 +963,38 @@ if ((dp = db_lookup(dbip, argv[i], LOOKUP_NOISY)) != DIR_NULL) new_tables(dp, &cur_path, (const matp_t)bn_mat_identity, flag); else - Tcl_AppendResult(interp, " skip this object\n", (char *)NULL); + Tcl_AppendResult(interpreter, " skip this object\n", (char *)NULL); } - Tcl_AppendResult(interp, "Summary written in: ", argv[1], "\n", (char *)NULL); + Tcl_AppendResult(interpreter, "Summary written in: ", argv[1], "\n", (char *)NULL); if (flag == SOL_TABLE || flag == REG_TABLE) { (void)unlink("/tmp/mged_discr\0"); - (void)fprintf(tabptr, "\n\nNumber Primitives = %d Number Regions = %d\n", + (void)fprintf(tabptr, "\n\nNumber Primitives = %ld Number Regions = %ld\n", numsol, numreg); - bu_vls_printf(&tmp_vls, "Processed %d Primitives and %d Regions\n", + bu_vls_printf(&tmp_vls, "Processed %ld Primitives and %ld Regions\n", numsol, numreg); - Tcl_AppendResult(interp, bu_vls_addr(&tmp_vls), (char *)NULL); + Tcl_AppendResult(interpreter, bu_vls_addr(&tmp_vls), (char *)NULL); (void)fclose(tabptr); } else { (void)fprintf(tabptr, "* 9999999\n* 9999999\n* 9999999\n* 9999999\n* 9999999\n"); (void)fclose(tabptr); - bu_vls_printf(&tmp_vls, "Processed %d Regions\n", numreg); - Tcl_AppendResult(interp, bu_vls_addr(&tmp_vls), (char *)NULL); + bu_vls_printf(&tmp_vls, "Processed %ld Regions\n", numreg); + Tcl_AppendResult(interpreter, bu_vls_addr(&tmp_vls), (char *)NULL); /* make ordered idents */ bu_vls_strcpy(&cmd, sortcmd); bu_vls_strcat(&cmd, argv[1]); - Tcl_AppendResult(interp, bu_vls_addr(&cmd), "\n", (char *)NULL); + Tcl_AppendResult(interpreter, bu_vls_addr(&cmd), "\n", (char *)NULL); (void)system(bu_vls_addr(&cmd)); bu_vls_trunc(&cmd, 0); bu_vls_strcpy(&cmd, catcmd); bu_vls_strcat(&cmd, argv[1]); - Tcl_AppendResult(interp, bu_vls_addr(&cmd), "\n", (char *)NULL); + Tcl_AppendResult(interpreter, bu_vls_addr(&cmd), "\n", (char *)NULL); (void)system(bu_vls_addr(&cmd)); (void)unlink("/tmp/ord_id\0"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-04-12 22:34:33
|
Revision: 38473 http://brlcad.svn.sourceforge.net/brlcad/?rev=38473&view=rev Author: brlcad Date: 2010-04-12 22:34:27 +0000 (Mon, 12 Apr 2010) Log Message: ----------- explicit constness Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2010-04-12 21:38:49 UTC (rev 38472) +++ brlcad/trunk/src/mged/utility1.c 2010-04-12 22:34:27 UTC (rev 38473) @@ -239,12 +239,12 @@ get_editor_string(&editstring); av = (const char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av"); - av[0] = argv[0]; + av[0] = (const char *)argv[0]; av[1] = "-E"; av[2] = bu_vls_addr(&editstring); argc += 2; for (i = 3; i < argc; ++i) { - av[i] = argv[i-2]; + av[i] = (const char *)argv[i-2]; } av[argc] = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-14 18:36:27
|
Revision: 44970 http://brlcad.svn.sourceforge.net/brlcad/?rev=44970&view=rev Author: brlcad Date: 2011-06-14 18:36:20 +0000 (Tue, 14 Jun 2011) Log Message: ----------- the tmp_vls isn't used outside the nested scope so pull it down to where it's used. there we know it's not initialized, so we can just call bu_vls_init(). Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2011-06-14 18:35:34 UTC (rev 44969) +++ brlcad/trunk/src/mged/utility1.c 2011-06-14 18:36:20 UTC (rev 44970) @@ -498,7 +498,6 @@ struct rt_db_internal sol_intern; struct directory *sol_dp; mat_t temp_mat; - struct bu_vls tmp_vls; int old; switch (tree_list[i].tl_op) { @@ -554,7 +553,9 @@ if (!old && (sol_dp->d_flags & RT_DIR_SOLID)) { /* if we get here, we must be looking for a solid table */ - bu_vls_init_if_uninit(&tmp_vls); + struct bu_vls tmp_vls; + bu_vls_init(&tmp_vls); + if (rt_functab[sol_intern.idb_type].ft_describe(&tmp_vls, &sol_intern, 1, base2local, &rt_uniresource, dbip) < 0) { Tcl_AppendResult(INTERP, tree_list[i].tl_tree->tr_l.tl_name, "describe error\n", (char *)NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-15 04:04:08
|
Revision: 44994 http://brlcad.svn.sourceforge.net/brlcad/?rev=44994&view=rev Author: brlcad Date: 2011-06-15 04:04:01 +0000 (Wed, 15 Jun 2011) Log Message: ----------- vls overkill, just interpret the help command directly Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2011-06-15 03:53:29 UTC (rev 44993) +++ brlcad/trunk/src/mged/utility1.c 2011-06-15 04:04:01 UTC (rev 44994) @@ -156,12 +156,7 @@ CHECK_DBI_NULL; if (argc < 2) { - struct bu_vls vls; - - bu_vls_init(&vls); - bu_vls_printf(&vls, "help edcodes"); - Tcl_Eval(interpreter, bu_vls_addr(&vls)); - bu_vls_free(&vls); + Tcl_Eval(interpreter, "help edcodes"); return TCL_ERROR; } @@ -202,12 +197,7 @@ CHECK_DBI_NULL; if (argc < 2) { - struct bu_vls vls; - - bu_vls_init(&vls); - bu_vls_printf(&vls, "help edmater"); - Tcl_Eval(interpreter, bu_vls_addr(&vls)); - bu_vls_free(&vls); + Tcl_Eval(interpreter, "help edmater"); return TCL_ERROR; } @@ -248,12 +238,7 @@ CHECK_DBI_NULL; if (argc < 2) { - struct bu_vls vls; - - bu_vls_init(&vls); - bu_vls_printf(&vls, "help red"); - Tcl_Eval(interpreter, bu_vls_addr(&vls)); - bu_vls_free(&vls); + Tcl_Eval(interpreter, "help red"); return TCL_ERROR; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-07-15 23:03:48
|
Revision: 45518 http://brlcad.svn.sourceforge.net/brlcad/?rev=45518&view=rev Author: starseeker Date: 2011-07-15 23:03:41 +0000 (Fri, 15 Jul 2011) Log Message: ----------- clang is reporting these as unused. Looks like this is part of the stuff that has moved to libged - nuke. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2011-07-15 22:13:41 UTC (rev 45517) +++ brlcad/trunk/src/mged/utility1.c 2011-07-15 23:03:41 UTC (rev 45518) @@ -371,223 +371,6 @@ }; -HIDDEN int -sol_number(const matp_t matrix, char *name, int *old) -{ - int i; - struct identt idbuf1, idbuf2; - int readval; - int ret; - - memset(&idbuf1, 0, sizeof(struct identt)); - bu_strlcpy(idbuf1.i_name, name, sizeof(idbuf1.i_name)); - MAT_COPY(idbuf1.i_mat, matrix); - - for (i=0; i<numsol; i++) { - (void)lseek(rd_idfd, i*(long)sizeof identt, 0); - readval = read(rd_idfd, &idbuf2, sizeof identt); - - if (readval < 0) { - perror("READ ERROR"); - } - - idbuf1.i_index = i + 1; - - if (check((char *)&idbuf1, (char *)&idbuf2) == 1) { - *old = 1; - return idbuf2.i_index; - } - } - numsol++; - idbuf1.i_index = numsol; - - (void)lseek(idfd, (off_t)0L, 2); - ret = write(idfd, &idbuf1, sizeof identt); - if (ret < 0) - perror("write"); - - *old = 0; - return idbuf1.i_index; -} - - -HIDDEN void -new_tables(struct directory *dp, struct bu_ptbl *cur_path, const matp_t old_mat, int flag) -{ - struct rt_db_internal intern; - struct rt_comb_internal *comb; - struct rt_tree_array *tree_list; - int node_count; - int actual_count; - int i, k; - - if (dbip == DBI_NULL) - return; - - RT_CK_DIR(dp); - BU_CK_PTBL(cur_path); - - if (!(dp->d_flags & RT_DIR_COMB)) - return; - - if (rt_db_get_internal(&intern, dp, dbip, (fastf_t *)NULL, &rt_uniresource) < 0) - READ_ERR_return; - - comb = (struct rt_comb_internal *)intern.idb_ptr; - RT_CK_COMB(comb); - - if (comb->tree && db_ck_v4gift_tree(comb->tree) < 0) { - db_non_union_push(comb->tree, &rt_uniresource); - if (db_ck_v4gift_tree(comb->tree) < 0) { - Tcl_AppendResult(INTERP, "Cannot flatten tree for editing\n", (char *)NULL); - intern.idb_meth->ft_ifree(&intern); - return; - } - } - - if (!comb->tree) { - /* empty combination */ - intern.idb_meth->ft_ifree(&intern); - return; - } - - node_count = db_tree_nleaves(comb->tree); - tree_list = (struct rt_tree_array *)bu_calloc(node_count, - sizeof(struct rt_tree_array), "tree list"); - - /* flatten tree */ - actual_count = (struct rt_tree_array *)db_flatten_tree(tree_list, - comb->tree, OP_UNION, 0, &rt_uniresource) - tree_list; - BU_ASSERT_LONG(actual_count, ==, node_count); - - if (dp->d_flags & RT_DIR_REGION) { - numreg++; - (void)fprintf(tabptr, " %-4ld %4ld %4ld %4ld %4ld ", - numreg, comb->region_id, comb->aircode, comb->GIFTmater, - comb->los); - for (k=0; k<BU_PTBL_END(cur_path); k++) { - struct directory *path_dp; - - path_dp = (struct directory *)BU_PTBL_GET(cur_path, k); - RT_CK_DIR(path_dp); - (void)fprintf(tabptr, "/%s", path_dp->d_namep); - } - (void)fprintf(tabptr, "/%s:\n", dp->d_namep); - - if (flag == ID_TABLE) - goto out; - - for (i=0; i<actual_count; i++) { - char op; - int nsoltemp=0; - struct rt_db_internal sol_intern; - struct directory *sol_dp; - mat_t temp_mat; - int old; - - switch (tree_list[i].tl_op) { - case OP_UNION: - op = 'u'; - break; - case OP_SUBTRACT: - op = '-'; - break; - case OP_INTERSECT: - op = '+'; - break; - default: - bu_log("unrecognized operation in region %s\n", dp->d_namep); - op = '?'; - break; - } - - if ((sol_dp=db_lookup(dbip, tree_list[i].tl_tree->tr_l.tl_name, LOOKUP_QUIET)) != RT_DIR_NULL) { - if (sol_dp->d_flags & RT_DIR_COMB) { - (void)fprintf(tabptr, " RG %c %s\n", - op, sol_dp->d_namep); - continue; - } else if (!(sol_dp->d_flags & RT_DIR_SOLID)) { - (void)fprintf(tabptr, " ?? %c %s\n", - op, sol_dp->d_namep); - continue; - } else { - if (tree_list[i].tl_tree->tr_l.tl_mat) { - bn_mat_mul(temp_mat, old_mat, - tree_list[i].tl_tree->tr_l.tl_mat); - } else { - MAT_COPY(temp_mat, old_mat); - } - if (rt_db_get_internal(&sol_intern, sol_dp, dbip, temp_mat, &rt_uniresource) < 0) { - bu_log("Could not import %s\n", tree_list[i].tl_tree->tr_l.tl_name); - nsoltemp = 0; - } - nsoltemp = sol_number(temp_mat, tree_list[i].tl_tree->tr_l.tl_name, &old); - (void)fprintf(tabptr, " %c [%d] ", op, nsoltemp); - } - } else { - nsoltemp = sol_number(old_mat, tree_list[i].tl_tree->tr_l.tl_name, &old); - (void)fprintf(tabptr, " %c [%d] ", op, nsoltemp); - continue; - } - - if (flag == REG_TABLE || old) { - (void) fprintf(tabptr, "%s\n", tree_list[i].tl_tree->tr_l.tl_name); - continue; - } else - (void) fprintf(tabptr, "%s: ", tree_list[i].tl_tree->tr_l.tl_name); - - if (!old && (sol_dp->d_flags & RT_DIR_SOLID)) { - /* if we get here, we must be looking for a solid table */ - struct bu_vls tmp_vls; - bu_vls_init(&tmp_vls); - - if (rt_functab[sol_intern.idb_type].ft_describe(&tmp_vls, &sol_intern, 1, base2local, &rt_uniresource, dbip) < 0) { - Tcl_AppendResult(INTERP, tree_list[i].tl_tree->tr_l.tl_name, - "describe error\n", (char *)NULL); - } - fprintf(tabptr, "%s", bu_vls_addr(&tmp_vls)); - bu_vls_free(&tmp_vls); - } - if (nsoltemp && (sol_dp->d_flags & RT_DIR_SOLID)) - rt_db_free_internal(&sol_intern); - } - } else if (dp->d_flags & RT_DIR_COMB) { - int cur_length; - - bu_ptbl_ins(cur_path, (long *)dp); - cur_length = BU_PTBL_END(cur_path); - - for (i=0; i<actual_count; i++) { - struct directory *nextdp; - mat_t new_mat; - - nextdp = db_lookup(dbip, tree_list[i].tl_tree->tr_l.tl_name, LOOKUP_NOISY); - if (nextdp == RT_DIR_NULL) { - Tcl_AppendResult(INTERP, "\tskipping this object\n", (char *)NULL); - continue; - } - - /* recurse */ - if (tree_list[i].tl_tree->tr_l.tl_mat) { - bn_mat_mul(new_mat, old_mat, tree_list[i].tl_tree->tr_l.tl_mat); - } else { - MAT_COPY(new_mat, old_mat); - } - new_tables(nextdp, cur_path, new_mat, flag); - bu_ptbl_trunc(cur_path, cur_length); - } - } else { - Tcl_AppendResult(INTERP, "Illegal flags for ", dp->d_namep, - "skipping\n", (char *)NULL); - return; - } - - out: - bu_free((char *)tree_list, "new_tables: tree_list"); - intern.idb_meth->ft_ifree(&intern); - return; -} - /* * Local Variables: * mode: C This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2012-01-13 17:07:54
|
Revision: 48741 http://brlcad.svn.sourceforge.net/brlcad/?rev=48741&view=rev Author: bob1961 Date: 2012-01-13 17:07:48 +0000 (Fri, 13 Jan 2012) Log Message: ----------- Fixed a bug. Shouldn't be adding 1 to argc in call to ged_edcodes. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2012-01-13 17:07:20 UTC (rev 48740) +++ brlcad/trunk/src/mged/utility1.c 2012-01-13 17:07:48 UTC (rev 48741) @@ -173,7 +173,7 @@ } av[argc] = NULL; - ged_edcodes(gedp, argc + 1, (const char **)av); + ged_edcodes(gedp, argc, (const char **)av); bu_vls_free(&editstring); bu_free((genptr_t)av, "f_edcodes: av"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <r_...@us...> - 2012-04-16 21:39:42
|
Revision: 50093 http://brlcad.svn.sourceforge.net/brlcad/?rev=50093&view=rev Author: r_weiss Date: 2012-04-16 21:39:36 +0000 (Mon, 16 Apr 2012) Log Message: ----------- Updated file 'src/mged/utility1.c' changing all references to function 'db_tree_funcleaf' to include a fourth generic user pointer. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2012-04-16 21:37:30 UTC (rev 50092) +++ brlcad/trunk/src/mged/utility1.c 2012-04-16 21:39:36 UTC (rev 50093) @@ -259,7 +259,7 @@ /* cyclic, for db_tree_funcleaf in printcodes() */ -HIDDEN void Do_printnode(struct db_i *dbip2, struct rt_comb_internal *comb, union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t user_ptr3); +HIDDEN void Do_printnode(struct db_i *dbip2, struct rt_comb_internal *comb, union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t user_ptr3, genptr_t UNUSED(user_ptr4)); HIDDEN int @@ -308,7 +308,7 @@ if (comb->tree) { path[pathpos] = dp; db_tree_funcleaf(dbip, comb, comb->tree, Do_printnode, - (genptr_t)fp, (genptr_t)&pathpos, (genptr_t)NULL); + (genptr_t)fp, (genptr_t)&pathpos, (genptr_t)NULL, (genptr_t)NULL); } intern.idb_meth->ft_ifree(&intern); @@ -317,7 +317,7 @@ HIDDEN void -Do_printnode(struct db_i *dbip2, struct rt_comb_internal *UNUSED(comb), union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t UNUSED(user_ptr3)) +Do_printnode(struct db_i *dbip2, struct rt_comb_internal *UNUSED(comb), union tree *comb_leaf, genptr_t user_ptr1, genptr_t user_ptr2, genptr_t UNUSED(user_ptr3), genptr_t UNUSED(user_ptr4)) { FILE *fp; int *pathpos; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <r_...@us...> - 2012-05-11 20:07:00
|
Revision: 50520 http://brlcad.svn.sourceforge.net/brlcad/?rev=50520&view=rev Author: r_weiss Date: 2012-05-11 20:06:53 +0000 (Fri, 11 May 2012) Log Message: ----------- Updated function 'f_red' in file 'utility1.c'. This change fixes a bug where error messages were not displayed from the mged 'red' command. Modified Paths: -------------- brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2012-05-11 19:33:26 UTC (rev 50519) +++ brlcad/trunk/src/mged/utility1.c 2012-05-11 20:06:53 UTC (rev 50520) @@ -229,29 +229,29 @@ { const char **av; struct bu_vls editstring = BU_VLS_INIT_ZERO; - int i; CHECK_DBI_NULL; - if (argc < 2) { + if (argc != 2) { Tcl_Eval(interpreter, "help red"); return TCL_ERROR; } get_editor_string(&editstring); - av = (const char **)bu_malloc(sizeof(char *)*(argc + 3), "f_red: av"); + av = (const char **)bu_calloc(4, sizeof(char *), "f_red: av"); + av[0] = argv[0]; av[1] = "-E"; av[2] = bu_vls_addr(&editstring); - argc += 2; - for (i = 3; i < argc; ++i) { - av[i] = argv[i-2]; + av[3] = argv[1]; + + if ( ged_red(gedp, 4, (const char **)av) == GED_ERROR ) { + Tcl_AppendResult(interpreter, "Error: ", bu_vls_addr(gedp->ged_result_str), (char *)NULL); + } else { + Tcl_AppendResult(interpreter, bu_vls_addr(gedp->ged_result_str), (char *)NULL); } - av[argc] = NULL; - ged_red(gedp, argc + 1, (const char **)av); - bu_vls_free(&editstring); bu_free((genptr_t)av, "f_red: av"); return TCL_OK; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |