[brlcad-commits] SF.net SVN: brlcad:[33102] brlcad/trunk/src/libged/wdb_obj.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[33102] brlcad/trunk/src/libged/wdb_obj.c
|
From: <br...@us...> - 2008-11-01 19:56:34
|
Revision: 33102
http://brlcad.svn.sourceforge.net/brlcad/?rev=33102&view=rev
Author: brlcad
Date: 2008-11-01 19:56:29 +0000 (Sat, 01 Nov 2008)
Log Message:
-----------
ws
Modified Paths:
--------------
brlcad/trunk/src/libged/wdb_obj.c
Modified: brlcad/trunk/src/libged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/libged/wdb_obj.c 2008-11-01 19:18:12 UTC (rev 33101)
+++ brlcad/trunk/src/libged/wdb_obj.c 2008-11-01 19:56:29 UTC (rev 33102)
@@ -88,10 +88,10 @@
return TCL_ERROR; }
/* A verbose message to attempt to soothe and advise the user */
-#define WDB_TCL_ERROR_RECOVERY_SUGGESTION\
+#define WDB_TCL_ERROR_RECOVERY_SUGGESTION\
Tcl_AppendResult(interp, "\
The in-memory table of contents may not match the status of the on-disk\n\
-database. The on-disk database should still be intact. For safety,\n\
+database. The on-disk database should still be intact. For safety, \n\
you should exit now, and resolve the I/O problem, before continuing.\n", (char *)NULL)
#define WDB_READ_ERR { \
@@ -119,15 +119,15 @@
return; }
/* A verbose message to attempt to soothe and advise the user */
-#define WDB_ERROR_RECOVERY_SUGGESTION\
+#define WDB_ERROR_RECOVERY_SUGGESTION\
bu_log(WDB_ERROR_RECOVERY_MESSAGE)
#define WDB_ERROR_RECOVERY_MESSAGE "\
The in-memory table of contents may not match the status of the on-disk\n\
-database. The on-disk database should still be intact. For safety,\n\
+database. The on-disk database should still be intact. For safety, \n\
you should exit now, and resolve the I/O problem, before continuing.\n"
-#define WDB_TCL_CHECK_READ_ONLY \
+#define WDB_TCL_CHECK_READ_ONLY \
if (interp) { \
if (wdbp->dbip->dbi_read_only) { \
Tcl_AppendResult(interp, "Sorry, this database is READ-ONLY\n", (char *)NULL); \
@@ -138,8 +138,8 @@
}
struct wdb_killtree_data {
- Tcl_Interp *interp;
- int notify;
+ Tcl_Interp *interp;
+ int notify;
};
@@ -164,26 +164,26 @@
/* Defined in wdb_cmd_std.c */
BU_EXTERN(int wdb_comb_std_tcl,
- (ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[]));
+ (ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[]));
/* Defined in dg_obj.c */
BU_EXTERN(void dgo_impending_wdb_close,
- (struct rt_wdb *wdbp,
- Tcl_Interp *interp));
+ (struct rt_wdb *wdbp,
+ Tcl_Interp *interp));
BU_EXTERN(void dgo_zapall,
(struct rt_wdb *wdbp,
Tcl_Interp *interp));
BU_EXTERN(void dgo_eraseobjall_callback,
- (struct db_i *dbip,
- Tcl_Interp *interp,
- struct directory *dp,
- int notify));
+ (struct db_i *dbip,
+ Tcl_Interp *interp,
+ struct directory *dp,
+ int notify));
BU_EXTERN(void dgo_notifyWdb,
(struct rt_wdb *wdbp,
- Tcl_Interp *interp));
+ Tcl_Interp *interp));
int wdb_init_obj(Tcl_Interp *interp, struct rt_wdb *wdbp, const char *oname);
@@ -475,9 +475,9 @@
*
*/
int
-wdb_create_cmd(Tcl_Interp *interp,
- struct rt_wdb *wdbp, /* pointer to object */
- const char *oname) /* object name */
+wdb_create_cmd(Tcl_Interp *interp,
+ struct rt_wdb *wdbp, /* pointer to object */
+ const char *oname) /* object name */
{
if (wdbp == RT_WDB_NULL) {
Tcl_AppendResult(interp, "wdb_init_cmd ", oname, " failed", NULL);
@@ -501,9 +501,9 @@
* its state. It is presumed that the wdbp has already been opened.
*/
int
-wdb_init_obj(Tcl_Interp *interp,
- struct rt_wdb *wdbp, /* pointer to object */
- const char *oname) /* object name */
+wdb_init_obj(Tcl_Interp *interp,
+ struct rt_wdb *wdbp, /* pointer to object */
+ const char *oname) /* object name */
{
if (wdbp == RT_WDB_NULL) {
Tcl_AppendResult(interp, "wdb_open ", oname, " failed (wdb_init_obj)", NULL);
@@ -546,17 +546,17 @@
*@n db close
*/
static int
-wdb_open_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- const char *argv[])
+wdb_open_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ const char *argv[])
{
struct rt_wdb *wdbp;
int ret;
if (argc == 1) {
/* get list of database objects */
- for (BU_LIST_FOR(wdbp, rt_wdb, &rt_g.rtg_headwdb.l))
+ for (BU_LIST_FOR (wdbp, rt_wdb, &rt_g.rtg_headwdb.l))
Tcl_AppendResult(interp, bu_vls_addr(&wdbp->wdb_name), " ", (char *)NULL);
return TCL_OK;
@@ -588,7 +588,7 @@
(void)Tcl_DeleteCommand(interp, argv[1]);
if (argc == 3 || strcmp(argv[2], "db") == 0) {
- struct db_i *dbip;
+ struct db_i *dbip;
int i;
if (argc == 3)
@@ -602,20 +602,20 @@
wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_DISK);
} else if (strcmp(argv[2], "file") == 0) {
- wdbp = wdb_fopen( argv[3] );
+ wdbp = wdb_fopen(argv[3]);
} else {
- struct db_i *dbip;
+ struct db_i *dbip;
if (wdb_decode_dbip(interp, argv[3], &dbip) != TCL_OK)
return TCL_ERROR;
- if (strcmp( argv[2], "disk" ) == 0)
+ if (strcmp(argv[2], "disk") == 0)
wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_DISK);
else if (strcmp(argv[2], "disk_append") == 0)
wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_DISK_APPEND_ONLY);
- else if (strcmp( argv[2], "inmem" ) == 0)
+ else if (strcmp(argv[2], "inmem") == 0)
wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_INMEM);
- else if (strcmp( argv[2], "inmem_append" ) == 0)
+ else if (strcmp(argv[2], "inmem_append") == 0)
wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_INMEM_APPEND_ONLY);
else {
Tcl_AppendResult(interp, "wdb_open ", argv[2],
@@ -657,7 +657,7 @@
/* open database */
if (((dbip = db_open(filename, "r+w")) == DBI_NULL) &&
- ((dbip = db_open(filename, "r" )) == DBI_NULL)) {
+ ((dbip = db_open(filename, "r")) == DBI_NULL)) {
/*
* Check to see if we can access the database
@@ -697,10 +697,10 @@
*
*/
int
-wdb_reopen_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_reopen_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct db_i *dbip;
struct bu_vls vls;
@@ -743,10 +743,10 @@
* procname open [filename]
*/
static int
-wdb_reopen_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_reopen_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -758,19 +758,19 @@
*
*/
int
-wdb_match_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_match_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct bu_vls matches;
+ struct bu_vls matches;
RT_CK_WDB_TCL(interp, wdbp);
/* Verify that this wdb supports lookup operations
(non-null dbip) */
if (wdbp->dbip == 0) {
- Tcl_AppendResult( interp, "this database does not support lookup operations" );
+ Tcl_AppendResult(interp, "this database does not support lookup operations");
return TCL_ERROR;
}
@@ -794,10 +794,10 @@
*/
static int
-wdb_match_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_match_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -809,13 +809,13 @@
*
*/
int
-wdb_get_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_get_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- int status;
- struct rt_db_internal intern;
+ int status;
+ struct rt_db_internal intern;
if (argc < 2 || argc > 3) {
struct bu_vls vls;
@@ -867,10 +867,10 @@
* NOTE: This is called directly by gdiff/g_diff.c
*/
int
-wdb_get_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_get_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -882,12 +882,12 @@
*
*/
int
-wdb_get_type_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_get_type_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct rt_db_internal intern;
+ struct rt_db_internal intern;
int type;
if (argc != 2) {
@@ -1048,10 +1048,10 @@
*
*/
int
-wdb_get_type_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_get_type_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1063,16 +1063,16 @@
*
*/
int
-wdb_put_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_put_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct rt_db_internal intern;
- register const struct rt_functab *ftp;
- int i;
- char *name;
- char type[16];
+ struct rt_db_internal intern;
+ register const struct rt_functab *ftp;
+ int i;
+ char *name;
+ char type[16];
if (argc < 3) {
struct bu_vls vls;
@@ -1090,7 +1090,7 @@
* stdout/file wdb objects don't, but can still be written to.
* If not, just skip the lookup test and write the object
*/
- if (wdbp->dbip && db_lookup(wdbp->dbip, argv[1], LOOKUP_QUIET) != DIR_NULL ) {
+ if (wdbp->dbip && db_lookup(wdbp->dbip, argv[1], LOOKUP_QUIET) != DIR_NULL) {
Tcl_AppendResult(interp, argv[1], " already exists",
(char *)NULL);
return TCL_ERROR;
@@ -1162,10 +1162,10 @@
*/
static int
-wdb_put_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_put_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1177,15 +1177,15 @@
*
*/
int
-wdb_adjust_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_adjust_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- register struct directory *dp;
- int status;
- char *name;
- struct rt_db_internal intern;
+ register struct directory *dp;
+ int status;
+ char *name;
+ struct rt_db_internal intern;
if (argc < 4) {
struct bu_vls vls;
@@ -1204,14 +1204,14 @@
dp = db_lookup(wdbp->dbip, name, LOOKUP_QUIET);
if (dp == DIR_NULL) {
Tcl_AppendResult(interp, name, ": not found",
- (char *)NULL );
+ (char *)NULL);
return TCL_ERROR;
}
status = rt_db_get_internal(&intern, dp, wdbp->dbip, (matp_t)NULL, &rt_uniresource);
if (status < 0) {
Tcl_AppendResult(interp, "rt_db_get_internal(", name,
- ") failure", (char *)NULL );
+ ") failure", (char *)NULL);
return TCL_ERROR;
}
RT_CK_DB_INTERNAL(&intern);
@@ -1260,10 +1260,10 @@
*/
static int
-wdb_adjust_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_adjust_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1275,12 +1275,12 @@
*
*/
int
-wdb_form_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_form_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- const struct rt_functab *ftp;
+ const struct rt_functab *ftp;
if (argc != 2) {
struct bu_vls vls;
@@ -1317,8 +1317,8 @@
static int
wdb_form_tcl(ClientData clientData,
Tcl_Interp *interp,
- int argc,
- char *argv[])
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1330,26 +1330,26 @@
*
*/
int
-wdb_tops_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_tops_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- register struct directory *dp;
- register int i;
- struct directory **dirp;
- struct directory **dirp0 = (struct directory **)NULL;
- struct bu_vls vls;
- int c;
+ register struct directory *dp;
+ register int i;
+ struct directory **dirp;
+ struct directory **dirp0 = (struct directory **)NULL;
+ struct bu_vls vls;
+ int c;
#ifdef NEW_TOPS_BEHAVIOR
- int aflag = 0;
- int hflag = 0;
- int pflag = 0;
+ int aflag = 0;
+ int hflag = 0;
+ int pflag = 0;
#else
- int gflag = 0;
- int uflag = 0;
+ int gflag = 0;
+ int uflag = 0;
#endif
- int no_decorate = 0;
+ int no_decorate = 0;
RT_CK_WDB_TCL(interp, wdbp);
RT_CK_DBI_TCL(interp, wdbp->dbip);
@@ -1410,7 +1410,7 @@
for (i = 0; i < RT_DBNHASH; i++)
for (dp = wdbp->dbip->dbi_Head[i];
dp != DIR_NULL;
- dp = dp->d_forw) {
+ dp = dp->d_forw) {
if (dp->d_nref == 0)
*dirp++ = dp;
}
@@ -1418,7 +1418,7 @@
for (i = 0; i < RT_DBNHASH; i++)
for (dp = wdbp->dbip->dbi_Head[i];
dp != DIR_NULL;
- dp = dp->d_forw) {
+ dp = dp->d_forw) {
#ifdef NEW_TOPS_BEHAVIOR
if (dp->d_nref == 0 &&
(aflag ||
@@ -1452,10 +1452,10 @@
* NON-PARALLEL because of rt_uniresource
*/
static int
-wdb_tops_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_tops_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1470,8 +1470,8 @@
static void
wdb_deleteProc_rt(ClientData clientData)
{
- struct application *ap = (struct application *)clientData;
- struct rt_i *rtip;
+ struct application *ap = (struct application *)clientData;
+ struct rt_i *rtip;
RT_AP_CHECK(ap);
rtip = ap->a_rt_i;
@@ -1480,7 +1480,7 @@
rt_free_rti(rtip);
ap->a_rt_i = (struct rt_i *)NULL;
- bu_free( (genptr_t)ap, "struct application" );
+ bu_free((genptr_t)ap, "struct application");
}
/**
@@ -1488,15 +1488,15 @@
*
*/
int
-wdb_rt_gettrees_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_rt_gettrees_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct rt_i *rtip;
- struct application *ap;
- struct resource *resp;
- char *newprocname;
+ struct rt_i *rtip;
+ struct application *ap;
+ struct resource *resp;
+ char *newprocname;
RT_CK_WDB_TCL(interp, wdbp);
RT_CK_DBI_TCL(interp, wdbp->dbip);
@@ -1518,7 +1518,7 @@
(void)Tcl_DeleteCommand(interp, newprocname);
while (argv[2][0] == '-') {
- if (strcmp( argv[2], "-i") == 0) {
+ if (strcmp(argv[2], "-i") == 0) {
rtip->rti_dont_instance = 1;
argc--;
argv++;
@@ -1554,7 +1554,7 @@
*/
BU_GETSTRUCT(resp, resource);
rt_init_resource(resp, 0, rtip);
- BU_ASSERT_PTR( BU_PTBL_GET(&rtip->rti_resources, 0), !=, NULL );
+ BU_ASSERT_PTR(BU_PTBL_GET(&rtip->rti_resources, 0), !=, NULL);
ap = (struct application *)bu_malloc(sizeof(struct application), "wdb_rt_gettrees_cmd: ap");
RT_APPLICATION_INIT(ap);
@@ -1588,10 +1588,10 @@
* .inmem rt_gettrees .rt all.g light.r
*/
static int
-wdb_rt_gettrees_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_rt_gettrees_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1603,10 +1603,10 @@
*
*/
struct showmats_data {
- Tcl_Interp *smd_interp;
- int smd_count;
- char *smd_child;
- mat_t smd_mat;
+ Tcl_Interp *smd_interp;
+ int smd_count;
+ char *smd_child;
+ mat_t smd_mat;
};
/**
@@ -1614,14 +1614,14 @@
*
*/
static void
-Do_showmats(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)
+Do_showmats(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)
{
- struct showmats_data *smdp;
+ struct showmats_data *smdp;
RT_CK_DBI(dbip);
RT_CK_TREE(comb_leaf);
@@ -1656,10 +1656,10 @@
*
*/
int
-wdb_showmats_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_showmats_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct showmats_data sm_data;
char *parent;
@@ -1681,7 +1681,7 @@
parent = strtok(argv[1], "/");
while ((sm_data.smd_child = strtok((char *)NULL, "/")) != NULL) {
- struct rt_db_internal intern;
+ struct rt_db_internal intern;
struct rt_comb_internal *comb;
if ((dp = db_lookup(wdbp->dbip, parent, LOOKUP_NOISY)) == DIR_NULL)
@@ -1736,10 +1736,10 @@
*
*/
static int
-wdb_showmats_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_showmats_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1751,10 +1751,10 @@
*
*/
int
-wdb_shells_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_shells_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct directory *old_dp, *new_dp;
struct rt_db_internal old_intern, new_intern;
@@ -1794,8 +1794,8 @@
NMG_CK_MODEL(m);
bu_vls_init(&shell_name);
- for (BU_LIST_FOR(r, nmgregion, &m->r_hd)) {
- for (BU_LIST_FOR(s, shell, &r->s_hd)) {
+ for (BU_LIST_FOR (r, nmgregion, &m->r_hd)) {
+ for (BU_LIST_FOR (s, shell, &r->s_hd)) {
s_tmp = nmg_dup_shell(s, &trans_tbl, &wdbp->wdb_tol);
bu_free((genptr_t)trans_tbl, "trans_tbl");
@@ -1809,7 +1809,7 @@
nmg_m_reindex(m, 0);
bu_vls_printf(&shell_name, "shell.%d", shell_count);
- while (db_lookup(wdbp->dbip, bu_vls_addr( &shell_name), 0) != DIR_NULL) {
+ while (db_lookup(wdbp->dbip, bu_vls_addr(&shell_name), 0) != DIR_NULL) {
bu_vls_trunc(&shell_name, 0);
shell_count++;
bu_vls_printf(&shell_name, "shell.%d", shell_count);
@@ -1851,10 +1851,10 @@
*
*/
static int
-wdb_shells_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_shells_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1866,13 +1866,13 @@
*
*/
int
-wdb_dump_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_dump_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct rt_wdb *op;
- int ret;
+ struct rt_wdb *op;
+ int ret;
RT_CK_WDB_TCL(interp, wdbp);
RT_CK_DBI_TCL(interp, wdbp->dbip);
@@ -1914,10 +1914,10 @@
* .inmem dump "/tmp/foo.g"
*/
static int
-wdb_dump_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_dump_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1928,10 +1928,10 @@
*
*/
int
-wdb_stub_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_stub_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
if (argc != 1) {
struct bu_vls vls;
@@ -1953,10 +1953,10 @@
* @returns false
*/
static int
-wdb_stub_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_stub_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1968,10 +1968,10 @@
*
*/
int
-wdb_dbip_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_dbip_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct bu_vls vls;
@@ -1998,10 +1998,10 @@
* @return database objects dbip.
*/
static int
-wdb_dbip_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_dbip_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -2013,10 +2013,10 @@
*
*/
int
-wdb_ls_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_ls_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct bu_vls vls;
register struct directory *dp;
@@ -2081,13 +2081,13 @@
argv += bu_optind;
/* create list of selected objects from database */
- if ( attr_flag ) {
+ 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) ) {
+ 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(&vls, "helplib_alias wdb_ls %s", cmdname);
@@ -2096,39 +2096,39 @@
return TCL_ERROR;
}
- if ( or_flag ) {
+ 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;
+ 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" );
+ bu_avs_init(&avs, argc, "wdb_ls_cmd avs");
for (i = 0; i < argc; i += 2) {
- if ( or_flag ) {
- bu_avs_add_nonunique( &avs, argv[i], argv[i+1] );
+ if (or_flag) {
+ bu_avs_add_nonunique(&avs, argv[i], argv[i+1]);
} else {
- bu_avs_add( &avs, argv[i], argv[i+1] );
+ bu_avs_add(&avs, argv[i], argv[i+1]);
}
}
- tbl = db_lookup_by_attr( wdbp->dbip, dir_flags, &avs, op );
- bu_avs_free( &avs );
+ tbl = db_lookup_by_attr(wdbp->dbip, dir_flags, &avs, op);
+ bu_avs_free(&avs);
- dirp = wdb_getspace(wdbp->dbip, BU_PTBL_LEN( tbl ));
+ dirp = wdb_getspace(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 );
+ 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" );
+ bu_ptbl_free(tbl);
+ bu_free((char *)tbl, "wdb_ls_cmd ptbl");
} else if (argc > 0) {
/* Just list specified names */
dirp = wdb_getspace(wdbp->dbip, argc);
@@ -2151,7 +2151,7 @@
*/
for (i = 0; i < RT_DBNHASH; i++)
for (dp = wdbp->dbip->dbi_Head[i]; dp != DIR_NULL; dp = dp->d_forw) {
- if ( !aflag && (dp->d_flags & DIR_HIDDEN) )
+ if (!aflag && (dp->d_flags & DIR_HIDDEN))
continue;
*dirp++ = dp;
}
@@ -2181,10 +2181,10 @@
* @return list objects in this database object.
*/
static int
-wdb_ls_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_ls_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -2196,18 +2196,18 @@
*
*/
int
-wdb_list_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_list_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- register struct directory *dp;
- register int arg;
- struct bu_vls str;
- int id;
- int recurse = 0;
- char *listeval = "listeval";
- struct rt_db_internal intern;
+ register struct directory *dp;
+ register int arg;
+ struct bu_vls str;
+ int id;
+ int recurse = 0;
+ char *listeval = "listeval";
+ struct rt_db_internal intern;
if (argc < 2 || MAXARGS < argc) {
struct bu_vls vls;
@@ -2246,7 +2246,7 @@
struct db_tree_state ts;
struct db_full_path path;
- db_full_path_init( &path );
+ db_full_path_init(&path);
ts = wdbp->wdb_initial_tree_state; /* struct copy */
ts.ts_dbip = wdbp->dbip;
ts.ts_resp = &rt_uniresource;
@@ -2255,17 +2255,17 @@
if (db_follow_path_for_state(&ts, &path, argv[arg], 1))
continue;
- dp = DB_FULL_PATH_CUR_DIR( &path );
+ dp = DB_FULL_PATH_CUR_DIR(&path);
if ((id = rt_db_get_internal(&intern, dp, wdbp->dbip, ts.ts_mat, &rt_uniresource)) < 0) {
Tcl_AppendResult(interp, "rt_db_get_internal(", dp->d_namep,
- ") failure", (char *)NULL );
+ ") failure", (char *)NULL);
continue;
}
- db_free_full_path( &path );
+ db_free_full_path(&path);
- bu_vls_printf( &str, "%s: ", argv[arg] );
+ bu_vls_printf(&str, "%s: ", argv[arg]);
if (rt_functab[id].ft_describe(&str, &intern, 99, wdbp->dbip->dbi_base2local, &rt_uniresource, wdbp->dbip) < 0)
Tcl_AppendResult(interp, dp->d_namep, ": describe error", (char *)NULL);
@@ -2307,10 +2307,10 @@
*
*/
int
-wdb_pathsum_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_pathsum_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
int i, pos_in;
struct ged_trace_data gtd;
@@ -2408,12 +2408,12 @@
* procname (WDB_LISTEVAL|paths) args(s)
*/
static int
-wdb_pathsum_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_pathsum_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
+ struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
return wdb_pathsum_cmd(wdbp, interp, argc-1, argv+1);
}
@@ -2424,8 +2424,8 @@
*
*/
static void
-wdb_scrape_escapes_AppendResult(Tcl_Interp *interp,
- char *str)
+wdb_scrape_escapes_AppendResult(Tcl_Interp *interp,
+ char *str)
{
char buf[2];
buf[1] = '\0';
@@ -2449,10 +2449,10 @@
*
*/
int
-wdb_expand_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_expand_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
register char *pattern;
register struct directory *dp;
@@ -2549,15 +2549,15 @@
*
*/
int
-wdb_kill_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_kill_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
register struct directory *dp;
register int i;
- int is_phony;
- int verbose = LOOKUP_NOISY;
+ int is_phony;
+ int verbose = LOOKUP_NOISY;
WDB_TCL_CHECK_READ_ONLY;
@@ -2613,10 +2613,10 @@
* procname kill arg(s)
*/
static int
-wdb_kill_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_kill_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -2628,16 +2628,16 @@
*
*/
int
-wdb_killall_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_killall_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- register int i, k;
- register struct directory *dp;
- struct rt_db_internal intern;
- struct rt_comb_internal *comb;
- int ret;
+ register int i, k;
+ register struct directory *dp;
+ struct rt_db_internal intern;
+ struct rt_comb_internal *comb;
+ int ret;
WDB_TCL_CHECK_READ_ONLY;
@@ -2645,7 +2645,7 @@
struct bu_vls vls;
bu_vls_init(&vls);
- bu_vls_printf(&vls, "helplib_alias wdb_killall %s", argv[0]);
+ bu_vls_printf(&vls, "helplib_alias wdb_killall %s", argv[0]);
Tcl_Eval(interp, bu_vls_addr(&vls));
bu_vls_free(&vls);
return TCL_ERROR;
@@ -2661,7 +2661,7 @@
if (rt_db_get_internal(&intern, dp, wdbp->dbip, (fastf_t *)NULL, &rt_uniresource) < 0) {
Tcl_AppendResult(interp, "rt_db_get_internal(", dp->d_namep,
- ") failure", (char *)NULL );
+ ") failure", (char *)NULL);
ret = TCL_ERROR;
continue;
}
@@ -2669,7 +2669,7 @@
RT_CK_COMB(comb);
for (k=1; k<argc; k++) {
- int code;
+ int code;
code = db_tree_del_dbleaf(&(comb->tree), argv[k], &rt_uniresource);
if (code == -1)
@@ -2719,10 +2719,10 @@
* procname killall arg(s)
*/
static int
-wdb_killall_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_killall_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -2734,10 +2734,10 @@
*
*/
int
-wdb_killtree_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_killtree_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
register struct directory *dp;
register int i;
@@ -2788,10 +2788,10 @@
* procname killtree arg(s)
*/
static int
-wdb_killtree_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_killtree_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -2802,9 +2802,9 @@
* K I L L T R E E
*/
static void
-wdb_killtree_callback(struct db_i *dbip,
+wdb_killtree_callback(struct db_i *dbip,
register struct directory *dp,
- genptr_t ptr) {
+ genptr_t ptr) {
struct wdb_killtree_data *ktdp = (struct wdb_killtree_data *)ptr;
Tcl_Interp *interp = ktdp->interp;
@@ -2829,10 +2829,10 @@
*
*/
int
-wdb_copy_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_copy_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
register struct directory *proto;
register struct directory *dp;
@@ -2875,7 +2875,7 @@
return TCL_ERROR;
}
- if ((dp=db_diradd(wdbp->dbip, argv[2], -1, 0, proto->d_flags, (genptr_t)&proto->d_minor_type)) == DIR_NULL ) {
+ if ((dp=db_diradd(wdbp->dbip, argv[2], -1, 0, proto->d_flags, (genptr_t)&proto->d_minor_type)) == DIR_NULL) {
if (interp) {
Tcl_AppendResult(interp, "An error has occured while adding a new object to the database.", (char *)NULL);
} else {
@@ -2903,10 +2903,10 @@
* procname cp from to
*/
static int
-wdb_copy_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_copy_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -2918,13 +2918,13 @@
*
*/
int
-wdb_move_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_move_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- register struct directory *dp;
- struct rt_db_internal intern;
+ register struct directory *dp;
+ struct rt_db_internal intern;
WDB_TCL_CHECK_READ_ONLY;
@@ -2976,10 +2976,10 @@
* procname mv from to
*/
static int
-wdb_move_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_move_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -2990,16 +2990,16 @@
*
*/
int
-wdb_move_all_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_move_all_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- register int i;
+ register int i;
register struct directory *dp;
- struct rt_db_internal intern;
+ struct rt_db_internal intern;
struct rt_comb_internal *comb;
- struct bu_ptbl stack;
+ struct bu_ptbl stack;
WDB_TCL_CHECK_READ_ONLY;
@@ -3025,7 +3025,7 @@
/* rename the record itself */
- if ((dp = db_lookup(wdbp->dbip, argv[1], LOOKUP_NOISY )) == DIR_NULL)
+ if ((dp = db_lookup(wdbp->dbip, argv[1], LOOKUP_NOISY)) == DIR_NULL)
return TCL_ERROR;
if (db_lookup(wdbp->dbip, argv[2], LOOKUP_QUIET) != DIR_NULL) {
@@ -3059,7 +3059,7 @@
extrude = (struct rt_extrude_internal *)intern.idb_ptr;
RT_EXTRUDE_CK_MAGIC(extrude);
- if (! strcmp(extrude->sketch_name, argv[1]) ) {
+ if (! strcmp(extrude->sketch_name, argv[1])) {
bu_free(extrude->sketch_name, "sketch name");
extrude->sketch_name = bu_strdup(argv[2]);
@@ -3096,11 +3096,10 @@
/* Examine all COMB nodes */
for (i = 0; i < RT_DBNHASH; i++) {
for (dp = wdbp->dbip->dbi_Head[i]; dp != DIR_NULL; dp = dp->d_forw) {
- union tree *comb_leaf;
- int done=0;
- int changed=0;
+ union tree *comb_leaf;
+ int done=0;
+ int changed=0;
-
if (!(dp->d_flags & DIR_COMB))
continue;
@@ -3130,7 +3129,7 @@
}
comb_leaf = (union tree *)BU_PTBL_GET(&stack, BU_PTBL_END(&stack)-1);
if (comb_leaf->tr_op != OP_DB_LEAF) {
- bu_ptbl_rm( &stack, (long *)comb_leaf );
+ bu_ptbl_rm(&stack, (long *)comb_leaf);
comb_leaf = comb_leaf->tr_b.tb_right;
}
}
@@ -3138,8 +3137,8 @@
if (changed) {
if (rt_db_put_internal(dp, wdbp->dbip, &intern, &rt_uniresource)) {
- bu_ptbl_free( &stack );
- rt_db_free_internal( &intern, &rt_uniresource );
+ bu_ptbl_free(&stack);
+ rt_db_free_internal(&intern, &rt_uniresource);
Tcl_AppendResult(interp,
"Database write error, aborting",
(char *)NULL);
@@ -3201,10 +3200,10 @@
name = "UNKNOWN";
}
- ptr = Tcl_CreateHashEntry( name_tbl, name, &new_entry );
+ ptr = Tcl_CreateHashEntry(name_tbl, name, &new_entry);
- if ( !new_entry ) {
- return( (char *)Tcl_GetHashValue( ptr ) );
+ if (!new_entry) {
+ return((char *)Tcl_GetHashValue(ptr));
}
bu_vls_init(&new_name);
@@ -3216,56 +3215,56 @@
* naming mode.
*/
- bu_vls_trunc( &new_name, 0 );
+ bu_vls_trunc(&new_name, 0);
if (cc_data->copy_mode & NO_AFFIX) {
if (num > 0 && cc_data->copy_mode & CUSTOM_PREFIX) {
/* auto-increment prefix */
- bu_vls_printf( &new_name, "%ld_", num );
+ bu_vls_printf(&new_name, "%ld_", num);
}
- bu_vls_strcat( &new_name, name );
+ bu_vls_strcat(&new_name, name);
if (num > 0 && cc_data->copy_mode & CUSTOM_SUFFIX) {
/* auto-increment suffix */
- bu_vls_printf( &new_name, "_%ld", num );
+ bu_vls_printf(&new_name, "_%ld", num);
}
} else if (cc_data->copy_mode & CUSTOM_SUFFIX) {
/* use custom suffix */
- bu_vls_strcpy( &new_name, name );
+ bu_vls_strcpy(&new_name, name);
if (num > 0) {
- bu_vls_printf( &new_name, "_%ld_", num );
+ bu_vls_printf(&new_name, "_%ld_", num);
}
- bu_vls_vlscat( &new_name, &cc_data->affix );
+ bu_vls_vlscat(&new_name, &cc_data->affix);
} else if (cc_data->copy_mode & CUSTOM_PREFIX) {
/* use custom prefix */
- bu_vls_vlscat( &new_name, &cc_data->affix );
+ bu_vls_vlscat(&new_name, &cc_data->affix);
if (num > 0) {
- bu_vls_printf( &new_name, "_%ld_", num );
+ bu_vls_printf(&new_name, "_%ld_", num);
}
- bu_vls_strcat( &new_name, name );
+ bu_vls_strcat(&new_name, name);
} else if (cc_data->copy_mode & AUTO_SUFFIX) {
/* use auto-incrementing suffix */
- bu_vls_strcat( &new_name, name );
- bu_vls_printf( &new_name, "_%ld", num );
+ bu_vls_strcat(&new_name, name);
+ bu_vls_printf(&new_name, "_%ld", num);
} else if (cc_data->copy_mode & AUTO_PREFIX) {
/* use auto-incrementing prefix */
- bu_vls_printf( &new_name, "%ld_", num );
- bu_vls_strcat( &new_name, name );
+ bu_vls_printf(&new_name, "%ld_", num);
+ bu_vls_strcat(&new_name, name);
} else {
/* no custom suffix/prefix specified, use suffix */
if (num > 0) {
- bu_vls_printf( &new_name, "_%ld", num );
+ bu_vls_printf(&new_name, "_%ld", num);
}
- bu_vls_strcpy( &new_name, name );
+ bu_vls_strcpy(&new_name, name);
}
/* make sure it fits for v4 */
- if ( cc_data->old_dbip->dbi_version < 5 ) {
+ if (cc_data->old_dbip->dbi_version < 5) {
if (bu_vls_strlen(&new_name) > 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), V4_MAXNAME);
}
return NULL;
}
- aname = bu_vls_addr( &new_name );
+ aname = bu_vls_addr(&new_name);
num++;
@@ -3281,8 +3280,8 @@
bu_vls_vlscat(&prev_name, &new_name);
}
- } while (db_lookup( dbip, aname, LOOKUP_QUIET ) != DIR_NULL ||
- Tcl_FindHashEntry( used_names_tbl, aname ) != NULL);
+ } while (db_lookup(dbip, aname, LOOKUP_QUIET) != DIR_NULL ||
+ Tcl_FindHashEntry(used_names_tbl, aname) != NULL);
/* if they didn't get what they asked for, warn them */
if (num > 1) {
@@ -3296,12 +3295,12 @@
}
/* we should now have a unique name. store it in the hash */
- ret_name = bu_vls_strgrab( &new_name );
- Tcl_SetHashValue( ptr, (ClientData)ret_name );
- (void)Tcl_CreateHashEntry( used_names_tbl, ret_name, &new_entry );
- bu_vls_free( &new_name );
+ ret_name = bu_vls_strgrab(&new_name);
+ Tcl_SetHashValue(ptr, (ClientData)ret_name);
+ (void)Tcl_CreateHashEntry(used_names_tbl, ret_name, &new_entry);
+ bu_vls_free(&new_name);
- return( ret_name );
+ return(ret_name);
}
/**
@@ -3315,37 +3314,37 @@
struct db_i *dbip,
Tcl_HashTable *name_tbl,
Tcl_HashTable *used_names_tbl,
- struct concat_data *cc_data )
+ struct concat_data *cc_data)
{
char *new_name;
- if ( trp == NULL ) {
+ if (trp == NULL) {
return;
}
- switch ( trp->tr_op ) {
+ switch (trp->tr_op) {
case OP_DB_LEAF:
- new_name = get_new_name( trp->tr_l.tl_name, dbip,
- name_tbl, used_names_tbl, cc_data );
- if ( new_name ) {
- bu_free( trp->tr_l.tl_name, "leaf name" );
- trp->tr_l.tl_name = bu_strdup( new_name );
+ new_name = get_new_name(trp->tr_l.tl_name, dbip,
+ name_tbl, used_names_tbl, cc_data);
+ if (new_name) {
+ bu_free(trp->tr_l.tl_name, "leaf name");
+ trp->tr_l.tl_name = bu_strdup(new_name);
}
break;
case OP_UNION:
case OP_INTERSECT:
case OP_SUBTRACT:
case OP_XOR:
- adjust_names( interp, trp->tr_b.tb_left, dbip,
- name_tbl, used_names_tbl, cc_data );
- adjust_names( interp, trp->tr_b.tb_right, dbip,
- name_tbl, used_names_tbl, cc_data );
+ adjust_names(interp, trp->tr_b.tb_left, dbip,
+ name_tbl, used_names_tbl, cc_data);
+ adjust_names(interp, trp->tr_b.tb_right, dbip,
+ name_tbl, used_names_tbl, cc_data);
break;
case OP_NOT:
case OP_GUARD:
case OP_XNOP:
- adjust_names( interp, trp->tr_b.tb_left, dbip,
- name_tbl, used_names_tbl, cc_data );
+ adjust_names(interp, trp->tr_b.tb_left, dbip,
+ name_tbl, used_names_tbl, cc_data);
break;
}
}
@@ -3362,7 +3361,7 @@
struct db_i *curr_dbip,
Tcl_HashTable *name_tbl,
Tcl_HashTable *used_names_tbl,
- struct concat_data *cc_data )
+ struct concat_data *cc_data)
{
struct rt_db_internal ip;
struct rt_extrude_internal *extr;
@@ -3371,61 +3370,61 @@
struct directory *new_dp;
char *new_name;
- if ( rt_db_get_internal( &ip, input_dp, input_dbip, NULL, &rt_uniresource) < 0 ) {
+ if (rt_db_get_internal(&ip, input_dp, input_dbip, NULL, &rt_uniresource) < 0) {
Tcl_AppendResult(interp, "Failed to get internal form of object (", input_dp->d_namep,
- ") - aborting!!!\n", (char *)NULL );
+ ") - aborting!!!\n", (char *)NULL);
return TCL_ERROR;
}
- if ( ip.idb_major_type == DB5_MAJORTYPE_BRLCAD ) {
+ if (ip.idb_major_type == DB5_MAJORTYPE_BRLCAD) {
/* adjust names of referenced object in any object that reference other objects */
- switch ( ip.idb_minor_type ) {
+ switch (ip.idb_minor_type) {
case DB5_MINORTYPE_BRLCAD_COMBINATION:
comb = (struct rt_comb_internal *)ip.idb_ptr;
- RT_CK_COMB_TCL( interp, comb );
- adjust_names( interp, comb->tree, curr_dbip, name_tbl, used_names_tbl, cc_data );
+ RT_CK_COMB_TCL(interp, comb);
+ adjust_names(interp, comb->tree, curr_dbip, name_tbl, used_names_tbl, cc_data);
break;
case DB5_MINORTYPE_BRLCAD_EXTRUDE:
extr = (struct rt_extrude_internal *)ip.idb_ptr;
- RT_EXTRUDE_CK_MAGIC( extr );
+ RT_EXTRUDE_CK_MAGIC(extr);
- new_name = get_new_name( extr->sketch_name, curr_dbip, name_tbl, used_names_tbl, cc_data );
- if ( new_name ) {
- bu_free( extr->sketch_name, "sketch name" );
- extr->sketch_name = bu_strdup( new_name );
+ new_name = get_new_name(extr->sketch_name, curr_dbip, name_tbl, used_names_tbl, cc_data);
+ if (new_name) {
+ bu_free(extr->sketch_name, "sketch name");
+ extr->sketch_name = bu_strdup(new_name);
}
break;
case DB5_MINORTYPE_BRLCAD_DSP:
dsp = (struct rt_dsp_internal *)ip.idb_ptr;
- RT_DSP_CK_MAGIC( dsp );
+ RT_DSP_CK_MAGIC(dsp);
- if ( dsp->dsp_datasrc == RT_DSP_SRC_OBJ ) {
+ if (dsp->dsp_datasrc == RT_DSP_SRC_OBJ) {
/* This dsp references a database object, may need to change its name */
- new_name = get_new_name( bu_vls_addr( &dsp->dsp_name ), curr_dbip,
- name_tbl, used_names_tbl, cc_data );
- if ( new_name ) {
- bu_vls_free( &dsp->dsp_name );
- bu_vls_strcpy( &dsp->dsp_name, new_name );
+ new_name = get_new_name(bu_vls_addr(&dsp->dsp_name), curr_dbip,
+ name_tbl, used_names_tbl, cc_data);
+ if (new_name) {
+ bu_vls_free(&dsp->dsp_name);
+ bu_vls_strcpy(&dsp->dsp_name, new_name);
}
}
break;
}
}
- new_name = get_new_name(input_dp->d_namep, curr_dbip, name_tbl, used_names_tbl, cc_data );
- if ( !new_name ) {
+ new_name = get_new_name(input_dp->d_namep, curr_dbip, name_tbl, used_names_tbl, cc_data);
+ if (!new_name) {
new_name = input_dp->d_namep;
}
- if ( (new_dp = db_diradd( curr_dbip, new_name, -1L, 0, input_dp->d_flags,
- (genptr_t)&input_dp->d_minor_type ) ) == DIR_NULL ) {
+ if ((new_dp = db_diradd(curr_dbip, new_name, -1L, 0, input_dp->d_flags,
+ (genptr_t)&input_dp->d_minor_type)) == DIR_NULL) {
Tcl_AppendResult(interp, "Failed to add new object name (", new_name,
- ") to directory - aborting!!\n", (char *)NULL );
+ ") to directory - aborting!!\n", (char *)NULL);
return TCL_ERROR;
}
- if ( rt_db_put_internal( new_dp, curr_dbip, &ip, &rt_uniresource ) < 0 ) {
+ if (rt_db_put_internal(new_dp, curr_dbip, &ip, &rt_uniresource) < 0) {
Tcl_AppendResult(interp, "Failed to write new object (", new_name,
- ") to database - aborting!!\n", (char *)NULL );
+ ") to database - aborting!!\n", (char *)NULL);
return TCL_ERROR;
}
@@ -3437,28 +3436,28 @@
*
*/
int
-wdb_concat_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_concat_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct db_i *newdbp;
- int bad = 0;
- struct directory *dp;
- Tcl_HashTable name_tbl;
- Tcl_HashTable used_names_tbl;
- Tcl_HashEntry *ptr;
- Tcl_HashSearch search;
- struct concat_data cc_data;
+ struct db_i *newdbp;
+ int bad = 0;
+ struct directory *dp;
+ Tcl_HashTable name_tbl;
+ Tcl_HashTable used_names_tbl;
+ Tcl_HashEntry *ptr;
+ Tcl_HashSearch search;
+ struct concat_data cc_data;
const char *oldfile;
struct bu_vls vls;
WDB_TCL_CHECK_READ_ONLY;
/* expecting either 3 or 4 args */
- if ( (argc < 3) ||
- (argc > 4) ||
- (argc > 1 && argv[1][0] == '-' && argc != 4) ) {
+ if ((argc < 3) ||
+ (argc > 4) ||
+ (argc > 1 && argv[1][0] == '-' && argc != 4)) {
bu_vls_init(&vls);
bu_vls_printf(&vls, "helplib_alias wdb_concat %s", argv[0]);
Tcl_Eval(interp, bu_vls_addr(&vls));
@@ -3467,15 +3466,15 @@
}
memset(&cc_data, 0, sizeof(struct concat_data));
- bu_vls_init( &cc_data.affix );
+ bu_vls_init(&cc_data.affix);
cc_data.copy_mode = 0;
- if ( argv[1][0] == '-' ) {
+ if (argv[1][0] == '-') {
/* specified suffix or prefix explicitly */
oldfile = argv[2];
- if ( argv[1][1] == 'p' ) {
+ if (argv[1][1] == 'p') {
cc_data.copy_mode |= AUTO_PREFIX;
@@ -3486,7 +3485,7 @@
cc_data.copy_mode |= CUSTOM_PREFIX;
}
- } else if ( argv[1][1] == 's' ) {
+ } else if (argv[1][1] == 's') {
cc_data.copy_mode |= AUTO_SUFFIX;
@@ -3498,7 +3497,7 @@
}
} else {
- bu_vls_free( &cc_data.affix );
+ bu_vls_free(&cc_data.affix);
bu_vls_init(&vls);
bu_vls_printf(&vls, "helplib_alias wdb_concat %s", argv[0]);
@@ -3523,48 +3522,48 @@
}
- if ( wdbp->dbip->dbi_version < 5 ) {
- if ( bu_vls_strlen(&cc_data.affix) > V4_MAXNAME-1) {
+ if (wdbp->dbip->dbi_version < 5) {
+ if (bu_vls_strlen(&cc_data.affix) > V4_MAXNAME-1) {
bu_log("ERROR: affix [%s] is too long for v%d\n", bu_vls_addr(&cc_data.affix), wdbp->dbip->dbi_version);
- bu_vls_free( &cc_data.affix );
+ bu_vls_free(&cc_data.affix);
return TCL_ERROR;
}
}
/* open the input file */
if ((newdbp = db_open(oldfile, "r")) == DBI_NULL) {
- bu_vls_free( &cc_data.affix );
+ bu_vls_free(&cc_data.affix);
perror(oldfile);
Tcl_AppendResult(interp, "%s: Can't open ", argv[0], oldfile, (char *)NULL);
return TCL_ERROR;
}
- if ( newdbp->dbi_version > 4 && wdbp->dbip->dbi_version < 5 ) {
- bu_vls_free( &cc_data.affix );
+ if (newdbp->dbi_version > 4 && wdbp->dbip->dbi_version < 5) {
+ bu_vls_free(&cc_data.affix);
Tcl_AppendResult(interp, argv[0], ": databases are incompatible, use dbupgrade on ",
wdbp->dbip->dbi_filename, " first",
- (char *)NULL );
+ (char *)NULL);
return TCL_ERROR;
}
- db_dirbuild( newdbp );
+ db_dirbuild(newdbp);
cc_data.new_dbip = newdbp;
cc_data.old_dbip = wdbp->dbip;
/* visit each directory pointer in the input database */
- Tcl_InitHashTable( &name_tbl, TCL_STRING_KEYS );
- Tcl_InitHashTable( &used_names_tbl, TCL_STRING_KEYS );
+ Tcl_InitHashTable(&name_tbl, TCL_STRING_KEYS);
+ Tcl_InitHashTable(&used_names_tbl, TCL_STRING_KEYS);
- FOR_ALL_DIRECTORY_START( dp, newdbp ) {
- if ( dp->d_major_type == DB5_MAJORTYPE_ATTRIBUTE_ONLY ) {
+ FOR_ALL_DIRECTORY_START(dp, newdbp) {
+ if (dp->d_major_type == DB5_MAJORTYPE_ATTRIBUTE_ONLY) {
/* skip GLOBAL object */
continue;
}
- copy_object( interp, dp, newdbp, wdbp->dbip, &name_tbl, &used_names_tbl, &cc_data );
+ copy_object(interp, dp, newdbp, wdbp->dbip, &name_tbl, &used_names_tbl, &cc_data);
} FOR_ALL_DIRECTORY_END;
- bu_vls_free( &cc_data.affix );
+ bu_vls_free(&cc_data.affix);
rt_mempurge(&(newdbp->dbi_freep));
/* Free all the directory entries, and close the input database */
@@ -3573,13 +3572,13 @@
db_sync(wdbp->dbip); /* force changes to disk */
/* Free the Hash tables */
- ptr = Tcl_FirstHashEntry( &name_tbl, &search );
- while ( ptr ) {
- bu_free( (char *)Tcl_GetHashValue( ptr ), "new name" );
- ptr = Tcl_NextHashEntry( &search );
+ ptr = Tcl_FirstHashEntry(&name_tbl, &search);
+ while (ptr) {
+ bu_free((char *)Tcl_GetHashValue(ptr), "new name");
+ ptr = Tcl_NextHashEntry(&search);
}
- Tcl_DeleteHashTable( &name_tbl );
- Tcl_DeleteHashTable( &used_names_tbl );
+ Tcl_DeleteHashTable(&name_tbl);
+ Tcl_DeleteHashTable(&used_names_tbl);
return bad ? TCL_ERROR : TCL_OK;
}
@@ -3592,10 +3591,10 @@
* procname concat file.g prefix
*/
static int
-wdb_concat_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_concat_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -3607,18 +3606,18 @@
*
*/
int
-wdb_copyeval_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_copyeval_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct directory *dp;
- struct rt_db_internal internal, new_int;
- mat_t start_mat;
- int id;
- int i;
- int endpos;
- struct ged_trace_data gtd;
+ struct directory *dp;
+ struct rt_db_internal internal, new_int;
+ mat_t start_mat;
+ int id;
+ int i;
+ int endpos;
+ struct ged_trace_data gtd;
struct ged ged;
WDB_TCL_CHECK_READ_ONLY;
@@ -3684,7 +3683,7 @@
if (id >= ID_COMBINATION) {
rt_db_free_internal(&internal, &rt_uniresource);
- Tcl_AppendResult(interp, "final component on path must be a solid!!!\n", (char *)NULL );
+ Tcl_AppendResult(interp, "final component on path must be a solid!!!\n", (char *)NULL);
return TCL_ERROR;
}
@@ -3739,10 +3738,10 @@
* procname copyeval new_solid path_to_solid
*/
static int
-wdb_copyeval_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_copyeval_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -3754,8 +3753,8 @@
*
*/
struct dir_check_stuff {
- struct db_i *main_dbip;
- struct rt_wdb *wdbp;
+ struct db_i *main_dbip;
+ struct rt_wdb *wdbp;
struct directory **dup_dirp;
};
@@ -3764,61 +3763,61 @@
*
*/
void
-wdb_dir_check5(register struct db_i *input_dbip,
- const struct db5_raw_internal *rip,
- long addr,
- genptr_t ptr)
+wdb_dir_check5(register struct db_i *input_dbip,
+ const struct db5_raw_internal *rip,
+ long addr,
+ genptr_t ptr)
{
- char *name;
- struct directory *dupdp;
- struct bu_vls local;
- struct dir_check_stuff *dcsp = (struct dir_check_stuff *)ptr;
+ char *name;
+ struct directory *dupdp;
+ struct bu_vls local;
+ struct dir_check_stuff *dcsp = (struct dir_check_stuff *)ptr;
if (dcsp->main_dbip == DBI_NULL)
return;
RT_CK_DBI(input_dbip);
- RT_CK_RIP( rip );
+ RT_CK_RIP(rip);
- if ( rip->h_dli == DB5HDR_HFLAGS_DLI_HEADER_OBJECT ) return;
- if ( rip->h_dli == DB5HDR_HFLAGS_DLI_FREE_STORAGE ) return;
+ if (rip->h_dli == DB5HDR_HFLAGS_DLI_HEADER_OBJECT) return;
+ if (rip->h_dli == DB5HDR_HFLAGS_DLI_FREE_STORAGE) return;
name = (char *)rip->name.ext_buf;
- if ( name == (char *)NULL ) return;
+ if (name == (char *)NULL) return;
/* do not compare _GLOBAL */
- if ( rip->major_type == DB5_MAJORTYPE_ATTRIBUTE_ONLY &&
- rip->minor_type == 0 )
+ if (rip->major_type == DB5_MAJORTYPE_ATTRIBUTE_ONLY &&
+ rip->minor_type == 0)
return;
/* Add the prefix, if any */
- bu_vls_init( &local );
- if ( dcsp->main_dbip->dbi_version < 5 ) {
+ bu_vls_init(&local);
+ if (dcsp->main_dbip->dbi_version < 5) {
if (dcsp->wdbp->wdb_ncharadd > 0) {
- bu_vls_strncpy( &local, bu_vls_addr( &dcsp->wdbp->wdb_prestr ), dcsp->wdbp->wdb_ncharadd );
- bu_vls_strcat( &local, name );
+ 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, V4_MAXNAME );
+ bu_vls_strncpy(&local, name, V4_MAXNAME);
}
- bu_vls_trunc( &local, V4_MAXNAME );
+ bu_vls_trunc(&local, V4_MAXNAME);
} else {
if (dcsp->wdbp->wdb_ncharadd > 0) {
- (void)bu_vls_vlscat( &local, &dcsp->wdbp->wdb_prestr );
- (void)bu_vls_strcat( &local, name );
+ (void)bu_vls_vlscat(&local, &dcsp->wdbp->wdb_prestr);
+ (void)bu_vls_strcat(&local, name);
} else {
- (void)bu_vls_strcat( &local, name );
+ (void)bu_vls_strcat(&local, name);
}
}
/* Look up this new name in the existing (main) database */
- if ((dupdp = db_lookup(dcsp->main_dbip, bu_vls_addr( &local ), LOOKUP_QUIET)) != DIR_NULL) {
+ if ((dupdp = db_lookup(dcsp->main_dbip, bu_vls_addr(&local), LOOKUP_QUIET)) != DIR_NULL) {
/* Duplicate found, add it to the list */
dcsp->wdbp->wdb_num_dups++;
*dcsp->dup_dirp++ = dupdp;
}
- bu_vls_free( &local );
+ bu_vls_free(&local);
return;
}
@@ -3831,9 +3830,9 @@
int
wdb_dir_check(register struct db_i *input_dbip, register const char *name, long int laddr, int len, int flags, genptr_t ptr)
{
- struct directory *dupdp;
- struct bu_vls local;
- struct dir_check_stuff *dcsp = (struct dir_check_stuff *)ptr;
+ struct directory *dupdp;
+ struct bu_vls local;
+ struct dir_check_stuff *dcsp = (struct dir_check_stuff *)ptr;
if (dcsp->main_dbip == DBI_NULL)
return 0;
@@ -3841,31 +3840,31 @@
RT_CK_DBI(input_dbip);
/* Add the prefix, if any */
- bu_vls_init( &local );
- if ( dcsp->main_dbip->dbi_version < 5 ) {
+ bu_vls_init(&local);
+ if (dcsp->main_dbip->dbi_version < 5) {
if (dcsp->wdbp->wdb_ncharadd > 0) {
- bu_vls_strncpy( &local, bu_vls_addr( &dcsp->wdbp->wdb_prestr ), dcsp->wdbp->wdb_ncharadd );
- bu_vls_strcat( &local, name );
+ 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, V4_MAXNAME );
+ bu_vls_strncpy(&local, name, V4_MAXNAME);
}
- bu_vls_trunc( &local, V4_MAXNAME );
+ bu_vls_trunc(&local, V4_MAXNAME);
} else {
if (dcsp->wdbp->wdb_ncharadd > 0) {
- bu_vls_vlscat( &local, &dcsp->wdbp->wdb_prestr );
- bu_vls_strcat( &local, name );
+ bu_vls_vlscat(&local, &dcsp->wdbp->wdb_prestr);
+ bu_vls_strcat(&local, name);
} else {
- bu_vls_strcat( &local, name );
+ bu_vls_strcat(&local, name);
}
}
/* Look up this new name in the existing (main) database */
- if ((dupdp = db_lookup(dcsp->main_dbip, bu_vls_addr( &local ), LOOKUP_QUIET)) != DIR_NULL) {
+ if ((dupdp = db_lookup(dcsp->main_dbip, bu_vls_addr(&local), LOOKUP_QUIET)) != DIR_NULL) {
/* Duplicate found, add it to the list */
dcsp->wdbp->wdb_num_dups++;
*dcsp->dup_dirp++ = dupdp;
}
- bu_vls_free( &local );
+ bu_vls_free(&local);
return 0;
}
@@ -3874,15 +3873,15 @@
*
*/
int
-wdb_dup_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_dup_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- struct db_i *newdbp = DBI_NULL;
- struct directory **dirp0 = (struct directory **)NULL;
+ struct db_i *newdbp = DBI_NULL;
+ struct directory **dirp0 = (struct directory **)NULL;
struct bu_vls vls;
- struct dir_check_stuff dcs;
+ struct dir_check_stuff dcs;
if (argc < 2 || 3 < argc) {
struct bu_vls vls;
@@ -3894,15 +3893,15 @@
return TCL_ERROR;
}
- bu_vls_trunc( &wdbp->wdb_prestr, 0 );
+ bu_vls_trunc(&wdbp->wdb_prestr, 0);
if (argc == 3)
(void)bu_vls_strcpy(&wdbp->wdb_prestr, argv[2]);
wdbp->wdb_num_dups = 0;
- if ( wdbp->dbip->dbi_version < 5 ) {
+ if (wdbp->dbip->dbi_version < 5) {
if ((wdbp->wdb_ncharadd = bu_vls_strlen(&wdbp->wdb_prestr)) > 12) {
wdbp->wdb_ncharadd = 12;
- bu_vls_trunc( &wdbp->wdb_prestr, 12 );
+ bu_vls_trunc(&wdbp->wdb_prestr, 12);
}
} else {
wdbp->wdb_ncharadd = bu_vls_strlen(&wdbp->wdb_prestr);
@@ -3921,13 +3920,13 @@
if (wdbp->wdb_ncharadd) {
Tcl_AppendResult(interp, " For comparison, all names in ",
argv[1], " were prefixed with: ",
- bu_vls_addr( &wdbp->wdb_prestr ), "\n", (char *)NULL);
+ bu_vls_addr(&wdbp->wdb_prestr), "\n", (char *)NULL);
}
/* Get array to hold names of duplicates */
if ((dirp0 = wdb_getspace(wdbp->dbip, 0)) == (struct directory **) 0) {
Tcl_AppendResult(interp, "f_dup: unable to get memory\n", (char *)NULL);
- db_close( newdbp );
+ db_close(newdbp);
return TCL_ERROR;
}
@@ -3935,7 +3934,7 @@
dcs.main_dbip = wdbp->dbip;
dcs.wdbp = wdbp;
dcs.dup_dirp = dirp0;
- if ( newdbp->dbi_version < 5 ) {
+ if (newdbp->dbi_version < 5) {
if (db_scan(newdbp, wdb_dir_check, 0, (genptr_t)&dcs) < 0) {
Tcl_AppendResult(interp, "dup: db_scan failure", (char *)NULL);
bu_free((genptr_t)dirp0, "wdb_getspace array");
@@ -3943,14 +3942,14 @@
return TCL_ERROR;
}
} else {
- if ( db5_scan( newdbp, wdb_dir_check5, (genptr_t)&dcs) < 0) {
+ if (db5_scan(newdbp, wdb_dir_check5, (genptr_t)&dcs) < 0) {
Tcl_AppendResult(interp, "dup: db_scan failure", (char *)NULL);
bu_free((genptr_t)dirp0, "wdb_getspace array");
db_close(newdbp);
return TCL_ERROR;
}
}
- rt_mempurge( &(newdbp->dbi_freep) ); /* didn't really build a directory */
+ rt_mempurge(&(newdbp->dbi_freep)); /* didn't really build a directory */
bu_vls_init(&vls);
wdb_vls_col_pr4v(&vls, dirp0, (int)(dcs.dup_dirp - dirp0), 0);
@@ -3980,10 +3979,10 @@
*
*/
int
-wdb_group_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_group_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
register struct directory *dp;
register int i;
@@ -4017,10 +4016,10 @@
* procname g groupname object1 object2 .... objectn
*/
static int
-wdb_group_tcl(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_group_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -4032,17 +4031,17 @@
*
*/
int
-wdb_remove_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_remove_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- register struct directory *dp;
- register int i;
- int num_deleted;
- struct rt_db_internal intern;
- struct rt_comb_internal *comb;
- int ret;
+ register struct directory *dp;
+ register int i;
+ int num_deleted;
+ struct rt_db_internal intern;
+ struct rt_comb_internal *comb;
+ int ret;
WDB_TCL_CHECK_READ_ONLY;
@@ -4061,7 +4060,7 @@
if ((dp->d_flags & DIR_COMB) == 0) {
Tcl_AppendResult(interp, "rm: ", dp->d_namep,
- " is not a combination", (char *)NULL );
+ " is not a combination", (char *)NULL);
return TCL_ERROR;
}
@@ -4077,7 +4076,7 @@
num_deleted = 0;
ret = TCL_OK;
for (i = 2; i < argc; i++) {
- if (db_tree_del_dbleaf( &(comb->tree), argv[i], &rt_uniresource ) < 0) {
+ if (db_tree_del_dbleaf(&(comb->tree), argv[i], &rt_uniresource) < 0) {
Tcl_AppendResult(interp, " ERROR_deleting ",
dp->d_namep, "/", argv[i],
"\n", (char *)NULL);
@@ -4118,15 +4117,15 @@
*
*/
int
-wdb_region_cmd(struct rt_wdb *wdbp,
- Tcl_Interp *interp,
- int argc,
- char *argv[])
+wdb_region_cmd(struct rt_wdb *wdbp,
+ Tcl_Interp *interp,
+ int argc,
+ char *argv[])
{
- register struct directory *dp;
- int i;
- int ident, air;
- char oper;
+ register struct directory *dp;
+ int i;
+ int ident, air;
+ char oper;
WDB_TCL_CHECK_READ_ONLY;
@@ -4171,7 +4170,7 @@
continue;
}
oper = argv[i][0];
- if ((dp = db_lookup(wdbp->dbip, argv[i+1], LOOKUP_NOISY )) == DIR_NULL) {
+ if ((dp = db_lookup(wdbp->dbip, argv[i+1], LOOKUP_NOISY)) == DIR_NULL) {
Tcl_AppendResult(interp, "skipping ", argv[i+1], "\n", (char *)NULL);
continue;
}
@@ -4181,7 +4180,7 @@
bu_vls_init(&tmp_vls);
bu_vls_printf(...
[truncated message content] |