Revision: 76533
http://sourceforge.net/p/brlcad/code/76533
Author: brlcad
Date: 2020-07-27 20:11:12 +0000 (Mon, 27 Jul 2020)
Log Message:
-----------
general ws cleanup, some reformatting for consistency
Modified Paths:
--------------
brlcad/trunk/src/libged/3ptarb/3ptarb.c
brlcad/trunk/src/libged/bot/bot_dump.c
brlcad/trunk/src/libged/check/check.c
brlcad/trunk/src/libged/check/check_exp_air.c
brlcad/trunk/src/libged/check/check_unconf_air.c
brlcad/trunk/src/libged/check/check_volume.c
brlcad/trunk/src/libged/comb/comb.c
brlcad/trunk/src/libged/constraint/constraint.c
brlcad/trunk/src/libged/draw/loadview.c
brlcad/trunk/src/libged/draw/preview.c
brlcad/trunk/src/libged/erase/erase.c
brlcad/trunk/src/libged/get_comb/get_comb.c
brlcad/trunk/src/libged/glob/glob.c
brlcad/trunk/src/libged/heal/heal.c
brlcad/trunk/src/libged/how/how.c
brlcad/trunk/src/libged/lc/lc.c
brlcad/trunk/src/libged/metaball/metaball.c
brlcad/trunk/src/libged/nmg/nmg.c
brlcad/trunk/src/libged/nmg/nmg_cmface.c
brlcad/trunk/src/libged/nmg/nmg_kill_f.c
brlcad/trunk/src/libged/nmg/nmg_kill_v.c
brlcad/trunk/src/libged/nmg/nmg_make_v.c
brlcad/trunk/src/libged/nmg/nmg_mm.c
brlcad/trunk/src/libged/nmg/nmg_move_v.c
brlcad/trunk/src/libged/overlay/overlay.c
brlcad/trunk/src/libged/rot/rot.c
brlcad/trunk/src/libged/rt/rt.c
brlcad/trunk/src/libged/screengrab/screengrab.c
brlcad/trunk/src/libged/set_transparency/set_transparency.c
brlcad/trunk/src/libged/tables/tables.c
brlcad/trunk/src/libged/tests/test_list.c
brlcad/trunk/src/libged/tol/tol.c
brlcad/trunk/src/libged/tops/tops.c
brlcad/trunk/src/libged/view/data_lines.c
brlcad/trunk/src/libged/view/snap.c
brlcad/trunk/src/libged/wcodes/wcodes.c
Modified: brlcad/trunk/src/libged/3ptarb/3ptarb.c
===================================================================
--- brlcad/trunk/src/libged/3ptarb/3ptarb.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/3ptarb/3ptarb.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -275,7 +275,6 @@
#endif /* GED_PLUGIN */
-
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/bot/bot_dump.c
===================================================================
--- brlcad/trunk/src/libged/bot/bot_dump.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/bot/bot_dump.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -1389,7 +1389,6 @@
}
-
int
ged_dbot_dump_core(struct ged *gedp, int argc, const char *argv[])
{
Modified: brlcad/trunk/src/libged/check/check.c
===================================================================
--- brlcad/trunk/src/libged/check/check.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/check/check.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -169,7 +169,7 @@
analyze_set_elevation(state, options->elevation_deg);
options->getfromview = 0;
break;
-
+
case 'f':
options->densityFileName = bu_optarg;
analyze_set_densityfile(state, options->densityFileName);
Modified: brlcad/trunk/src/libged/check/check_exp_air.c
===================================================================
--- brlcad/trunk/src/libged/check/check_exp_air.c 2020-07-27 20:07:58 UTC
(rev 76532)
+++ brlcad/trunk/src/libged/check/check_exp_air.c 2020-07-27 20:11:12 UTC
(rev 76533)
@@ -32,7 +32,7 @@
int expAir_color[3];
};
-HIDDEN void
+HIDDEN void
exposed_air(const struct partition *pp,
point_t last_out_point,
point_t pt,
Modified: brlcad/trunk/src/libged/check/check_unconf_air.c
===================================================================
--- brlcad/trunk/src/libged/check/check_unconf_air.c 2020-07-27 20:07:58 UTC
(rev 76532)
+++ brlcad/trunk/src/libged/check/check_unconf_air.c 2020-07-27 20:11:12 UTC
(rev 76533)
@@ -33,7 +33,7 @@
double tolerance;
};
-HIDDEN void
+HIDDEN void
unconf_air(const struct xray *ray,
const struct partition *ipart,
const struct partition *opart,
@@ -52,7 +52,7 @@
}
bu_semaphore_acquire(BU_SEM_GENERAL);
-
+
add_to_list(context->unconfAirList,
ipart->pt_regionp->reg_name,
opart->pt_regionp->reg_name,
Modified: brlcad/trunk/src/libged/check/check_volume.c
===================================================================
--- brlcad/trunk/src/libged/check/check_volume.c 2020-07-27 20:07:58 UTC
(rev 76532)
+++ brlcad/trunk/src/libged/check/check_volume.c 2020-07-27 20:11:12 UTC
(rev 76533)
@@ -76,7 +76,7 @@
if (plot_volume){
fclose(plot_volume);
bu_vls_printf(_ged_current_gedp->ged_result_str, "\nplot file saved as
%s",name);
- }
+ }
return 0;
}
Modified: brlcad/trunk/src/libged/comb/comb.c
===================================================================
--- brlcad/trunk/src/libged/comb/comb.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/comb/comb.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -772,7 +772,6 @@
}
-
#ifdef GED_PLUGIN
#include "../include/plugin.h"
struct ged_cmd_impl comb_cmd_impl = {
Modified: brlcad/trunk/src/libged/constraint/constraint.c
===================================================================
--- brlcad/trunk/src/libged/constraint/constraint.c 2020-07-27 20:07:58 UTC
(rev 76532)
+++ brlcad/trunk/src/libged/constraint/constraint.c 2020-07-27 20:11:12 UTC
(rev 76533)
@@ -325,7 +325,7 @@
return GED_HELP;
}
if (BU_STR_EQUIV(argv[1], "help")) {
- constraint_help(gedp, argc, argv);
+ constraint_help(gedp, argc, argv);
return GED_OK;
}
Modified: brlcad/trunk/src/libged/draw/loadview.c
===================================================================
--- brlcad/trunk/src/libged/draw/loadview.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/draw/loadview.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -185,7 +185,7 @@
dbName++;
memset(dbName + strlen(dbName)-1, 0, 1);
}
-
+
if (!bu_file_same(gedp->ged_wdbp->dbip->dbi_filename, dbName)) {
/* warn here if they are not the same file, otherwise,
* proceed as expected, and try to load the objects.
Modified: brlcad/trunk/src/libged/draw/preview.c
===================================================================
--- brlcad/trunk/src/libged/draw/preview.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/draw/preview.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -359,7 +359,8 @@
argc -= bu_optind-1;
argv += bu_optind-1;
- if ((fp = fopen(argv[1], "r")) == NULL) {
+ fp = fopen(argv[1], "r");
+ if (fp == NULL) {
perror(argv[1]);
return GED_ERROR;
}
Modified: brlcad/trunk/src/libged/erase/erase.c
===================================================================
--- brlcad/trunk/src/libged/erase/erase.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/erase/erase.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -29,7 +29,6 @@
#include <string.h>
-
#include "../ged_private.h"
/*
@@ -178,7 +177,6 @@
}
-
#ifdef GED_PLUGIN
#include "../include/plugin.h"
struct ged_cmd_impl erase_cmd_impl = {"erase", ged_erase_core,
GED_CMD_DEFAULT};
Modified: brlcad/trunk/src/libged/get_comb/get_comb.c
===================================================================
--- brlcad/trunk/src/libged/get_comb/get_comb.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/get_comb/get_comb.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -169,7 +169,7 @@
bu_vls_printf(gedp->ged_result_str, "}");
- if (comb->region_flag) {
+ if (comb->region_flag) {
bu_vls_printf(gedp->ged_result_str, " Yes %ld %ld %ld %ld",
comb->region_id, comb->aircode, comb->GIFTmater,
comb->los);
} else {
Modified: brlcad/trunk/src/libged/glob/glob.c
===================================================================
--- brlcad/trunk/src/libged/glob/glob.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/glob/glob.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -70,21 +70,21 @@
buf[1] = '\0';
backslashed = 0;
for (ptr = bu_vls_addr(src); *ptr; ptr++) {
- if (*ptr == '[' && !backslashed)
- bu_vls_strcat(dest, "\\[");
- else if (*ptr == ']' && !backslashed)
- bu_vls_strcat(dest, "\\]");
- else if (backslashed) {
- bu_vls_strcat(dest, "\\");
- buf[0] = *ptr;
- bu_vls_strcat(dest, buf);
- backslashed = 0;
- } else if (*ptr == '\\')
- backslashed = 1;
- else {
- buf[0] = *ptr;
- bu_vls_strcat(dest, buf);
- }
+ if (*ptr == '[' && !backslashed)
+ bu_vls_strcat(dest, "\\[");
+ else if (*ptr == ']' && !backslashed)
+ bu_vls_strcat(dest, "\\]");
+ else if (backslashed) {
+ bu_vls_strcat(dest, "\\");
+ buf[0] = *ptr;
+ bu_vls_strcat(dest, buf);
+ backslashed = 0;
+ } else if (*ptr == '\\')
+ backslashed = 1;
+ else {
+ buf[0] = *ptr;
+ bu_vls_strcat(dest, buf);
+ }
}
}
@@ -102,8 +102,8 @@
char *src = NULL;
if (dbip == DBI_NULL) {
- bu_vls_sprintf(dest, "%s", input);
- return 0;
+ bu_vls_sprintf(dest, "%s", input);
+ return 0;
}
src = bu_strdup(input);
@@ -110,86 +110,86 @@
start = end = src;
while (*end != '\0') {
- /* Run through entire string */
+ /* Run through entire string */
- /* First, pass along leading whitespace. */
+ /* First, pass along leading whitespace. */
- start = end; /* Begin where last word ended */
- while (*start != '\0') {
- if (*start == ' ' ||
- *start == '\t' ||
- *start == '\n')
- bu_vls_putc(dest, *start++);
- else
- break;
- }
- if (*start == '\0')
- break;
- /* Next, advance "end" pointer to the end of the word, while
- * adding each character to the "word" vls. Also make a note
- * of any unbackslashed wildcard characters.
- */
+ start = end; /* Begin where last word ended */
+ while (*start != '\0') {
+ if (*start == ' ' ||
+ *start == '\t' ||
+ *start == '\n')
+ bu_vls_putc(dest, *start++);
+ else
+ break;
+ }
+ if (*start == '\0')
+ break;
+ /* Next, advance "end" pointer to the end of the word, while
+ * adding each character to the "word" vls. Also make a note
+ * of any unbackslashed wildcard characters.
+ */
- end = start;
- bu_vls_trunc(&word, 0);
- is_fnmatch = 0;
- backslashed = 0;
- while (*end != '\0') {
- if (*end == ' ' ||
- *end == '\t' ||
- *end == '\n')
- break;
- if ((*end == '*' || *end == '?' || *end == '[') && !backslashed)
- is_fnmatch = 1;
- if (*end == '\\' && !backslashed)
- backslashed = 1;
- else
- backslashed = 0;
- bu_vls_putc(&word, *end++);
- }
+ end = start;
+ bu_vls_trunc(&word, 0);
+ is_fnmatch = 0;
+ backslashed = 0;
+ while (*end != '\0') {
+ if (*end == ' ' ||
+ *end == '\t' ||
+ *end == '\n')
+ break;
+ if ((*end == '*' || *end == '?' || *end == '[') && !backslashed)
+ is_fnmatch = 1;
+ if (*end == '\\' && !backslashed)
+ backslashed = 1;
+ else
+ backslashed = 0;
+ bu_vls_putc(&word, *end++);
+ }
- /* If the client told us not to do expansion on the first word
- * in the stream, disable matching */
- if (firstword && skip_first) {
- is_fnmatch = 0;
- }
+ /* If the client told us not to do expansion on the first word
+ * in the stream, disable matching */
+ if (firstword && skip_first) {
+ is_fnmatch = 0;
+ }
- /* Now, if the word was suspected of being a wildcard, try to
- * match it to the database.
- */
- /* Now, if the word was suspected of being a wildcard, try to
- * match it to the database.
- */
- if (is_fnmatch) {
- register int i, num;
- register struct directory *dp;
- bu_vls_trunc(&temp, 0);
- for (i = num = 0; i < RT_DBNHASH; i++) {
- for (dp = dbip->dbi_Head[i]; dp != RT_DIR_NULL; dp =
dp->d_forw) {
- if (bu_path_match(bu_vls_addr(&word), dp->d_namep, 0) !=
0) continue;
- if (!(flags & _GED_GLOB_HIDDEN) && (dp->d_flags &
RT_DIR_HIDDEN)) continue;
- if (!(flags & _GED_GLOB_NON_GEOM) && (dp->d_flags &
RT_DIR_NON_GEOM)) continue;
- if (num == 0)
- bu_vls_strcat(&temp, dp->d_namep);
- else {
- bu_vls_strcat(&temp, " ");
- bu_vls_strcat(&temp, dp->d_namep);
- }
- match_cnt++;
- ++num;
- }
- }
+ /* Now, if the word was suspected of being a wildcard, try to
+ * match it to the database.
+ */
+ /* Now, if the word was suspected of being a wildcard, try to
+ * match it to the database.
+ */
+ if (is_fnmatch) {
+ register int i, num;
+ register struct directory *dp;
+ bu_vls_trunc(&temp, 0);
+ for (i = num = 0; i < RT_DBNHASH; i++) {
+ for (dp = dbip->dbi_Head[i]; dp != RT_DIR_NULL; dp =
dp->d_forw) {
+ if (bu_path_match(bu_vls_addr(&word), dp->d_namep, 0) != 0)
continue;
+ if (!(flags & _GED_GLOB_HIDDEN) && (dp->d_flags &
RT_DIR_HIDDEN)) continue;
+ if (!(flags & _GED_GLOB_NON_GEOM) && (dp->d_flags &
RT_DIR_NON_GEOM)) continue;
+ if (num == 0)
+ bu_vls_strcat(&temp, dp->d_namep);
+ else {
+ bu_vls_strcat(&temp, " ");
+ bu_vls_strcat(&temp, dp->d_namep);
+ }
+ match_cnt++;
+ ++num;
+ }
+ }
- if (num == 0) {
- _debackslash(&temp, &word);
- _backslash_specials(dest, &temp);
- } else
- bu_vls_vlscat(dest, &temp);
- } else {
- _debackslash(dest, &word);
- }
+ if (num == 0) {
+ _debackslash(&temp, &word);
+ _backslash_specials(dest, &temp);
+ } else
+ bu_vls_vlscat(dest, &temp);
+ } else {
+ _debackslash(dest, &word);
+ }
- firstword = 0;
+ firstword = 0;
}
bu_vls_free(&temp);
Modified: brlcad/trunk/src/libged/heal/heal.c
===================================================================
--- brlcad/trunk/src/libged/heal/heal.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/heal/heal.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -55,7 +55,7 @@
bu_vls_trunc(gedp->ged_result_str, 0);
if(argc == 1) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s <bot_solid>", argv[0]);
+ bu_vls_printf(gedp->ged_result_str, "Usage: %s <bot_solid>", argv[0]);
return GED_HELP;
}
Modified: brlcad/trunk/src/libged/how/how.c
===================================================================
--- brlcad/trunk/src/libged/how/how.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/how/how.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -92,7 +92,6 @@
}
-
#ifdef GED_PLUGIN
#include "../include/plugin.h"
struct ged_cmd_impl how_cmd_impl = {
Modified: brlcad/trunk/src/libged/lc/lc.c
===================================================================
--- brlcad/trunk/src/libged/lc/lc.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/lc/lc.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -93,7 +93,7 @@
temp2=atoi(r2->los);
continue_run:
if ( temp1 > temp2 )
- return 1;
+ return 1;
if ( temp1 == temp2 )
return 0;
return -1;
@@ -251,7 +251,7 @@
} else {
bu_vls_printf(gedp->ged_result_str, "Error: Group name not
specified.\n");
}
- error_cnt++;
+ error_cnt++;
} else if (argc + unrecognized_flag_cnt > 2) {
bu_vls_printf(gedp->ged_result_str, "Error: More than one group name
was specified.\n");
error_cnt++;
@@ -319,7 +319,7 @@
struct directory *dp_curr_dir = DB_FULL_PATH_CUR_DIR(entry);
struct bu_attribute_value_set avs;
- j = BU_PTBL_LEN(&results2) - i - 1 ;
+ j = BU_PTBL_LEN(&results2) - i - 1;
regions[j].ignore = 0;
bu_avs_init_empty(&avs);
Modified: brlcad/trunk/src/libged/metaball/metaball.c
===================================================================
--- brlcad/trunk/src/libged/metaball/metaball.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/metaball/metaball.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -578,4 +578,3 @@
* End:
* ex: shiftwidth=4 tabstop=8
*/
-
Modified: brlcad/trunk/src/libged/nmg/nmg.c
===================================================================
--- brlcad/trunk/src/libged/nmg/nmg.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/nmg/nmg.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -59,35 +59,41 @@
if (argc < 3) {
bu_vls_printf(gedp->ged_result_str, "Usage: %s\n\t%s\n", argv[0], usage);
bu_vls_printf(gedp->ged_result_str, "commands:\n");
- bu_vls_printf(gedp->ged_result_str, "\tmm - creates a new "
- "NMG model structure and fills the appropriate fields. The result "
- "is an empty model.\n");
- bu_vls_printf(gedp->ged_result_str, "\tcmface - creates a "
- "manifold face in the first encountered shell of the NMG "
- "object. Vertices are listed as the suffix and define the "
- "winding-order of the face.\n");
- bu_vls_printf(gedp->ged_result_str, "\tkill V - removes the "
- "vertexuse and vertex geometry of the selected vertex (via its "
- "coordinates) and higher-order topology containing the vertex. "
- "When specifying vertex to be removed, user generally will display
"
- "vertex coordinates in object via the MGED command labelvert.\n");
- bu_vls_printf(gedp->ged_result_str, "\tkill F - removes the "
- "faceuse and face geometry of the selected face (via its "
- "index). When specifying the face to be removed, user
generally "
- "will display face indices in object via the MGED command "
- "labelface.\n");
- bu_vls_printf(gedp->ged_result_str, "\tmove V - moves an existing
"
- "vertex specified by the coordinates x_initial y_initial "
- "z_initial to the position with coordinates x_final y_final "
- "z_final.\n");
- bu_vls_printf(gedp->ged_result_str, "\tmake V - creates a new "
- "vertex in the nmg object.\n");
+ bu_vls_printf(gedp->ged_result_str,
+ "\tmm - creates a new "
+ "NMG model structure and fills the appropriate fields. The
result "
+ "is an empty model.\n");
+ bu_vls_printf(gedp->ged_result_str,
+ "\tcmface - creates a "
+ "manifold face in the first encountered shell of the NMG "
+ "object. Vertices are listed as the suffix and define the "
+ "winding-order of the face.\n");
+ bu_vls_printf(gedp->ged_result_str,
+ "\tkill V - removes the "
+ "vertexuse and vertex geometry of the selected vertex (via
its "
+ "coordinates) and higher-order topology containing the
vertex. "
+ "When specifying vertex to be removed, user generally will
display "
+ "vertex coordinates in object via the MGED command
labelvert.\n");
+ bu_vls_printf(gedp->ged_result_str,
+ "\tkill F - removes the "
+ "faceuse and face geometry of the selected face (via its "
+ "index). When specifying the face to be removed, user
generally "
+ "will display face indices in object via the MGED command "
+ "labelface.\n");
+ bu_vls_printf(gedp->ged_result_str,
+ "\tmove V - moves an existing "
+ "vertex specified by the coordinates x_initial y_initial "
+ "z_initial to the position with coordinates x_final y_final "
+ "z_final.\n");
+ bu_vls_printf(gedp->ged_result_str,
+ "\tmake V - creates a new "
+ "vertex in the nmg object.\n");
return GED_HELP;
}
if (argc < 3) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+ return GED_ERROR;
}
/* advance CLI arguments for subcommands */
@@ -95,34 +101,34 @@
++argv;
if( BU_STR_EQUAL( "mm", subcmd ) ) {
- ged_nmg_mm_core(gedp, argc, argv);
+ ged_nmg_mm_core(gedp, argc, argv);
}
else if( BU_STR_EQUAL( "cmface", subcmd ) ) {
- ged_nmg_cmface_core(gedp, argc, argv);
+ ged_nmg_cmface_core(gedp, argc, argv);
}
else if( BU_STR_EQUAL( "kill", subcmd ) ) {
- const char* opt = argv[2];
- if ( BU_STR_EQUAL( "V", opt ) ) {
- ged_nmg_kill_v_core(gedp, argc, argv);
- } else if ( BU_STR_EQUAL( "F", opt ) ) {
- ged_nmg_kill_f_core(gedp, argc, argv);
- }
+ const char* opt = argv[2];
+ if ( BU_STR_EQUAL( "V", opt ) ) {
+ ged_nmg_kill_v_core(gedp, argc, argv);
+ } else if ( BU_STR_EQUAL( "F", opt ) ) {
+ ged_nmg_kill_f_core(gedp, argc, argv);
+ }
}
else if( BU_STR_EQUAL( "move", subcmd ) ) {
- const char* opt = argv[2];
- if ( BU_STR_EQUAL( "V", opt ) ) {
- ged_nmg_move_v_core(gedp, argc, argv);
- }
+ const char* opt = argv[2];
+ if ( BU_STR_EQUAL( "V", opt ) ) {
+ ged_nmg_move_v_core(gedp, argc, argv);
+ }
}
else if( BU_STR_EQUAL( "make", subcmd ) ) {
- const char* opt = argv[2];
- if ( BU_STR_EQUAL( "V", opt ) ) {
- ged_nmg_make_v_core(gedp, argc, argv);
- }
+ const char* opt = argv[2];
+ if ( BU_STR_EQUAL( "V", opt ) ) {
+ ged_nmg_make_v_core(gedp, argc, argv);
+ }
}
else {
- bu_vls_printf(gedp->ged_result_str, "%s is not a subcommand.", subcmd
);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "%s is not a subcommand.", subcmd );
+ return GED_ERROR;
}
return GED_OK;
Modified: brlcad/trunk/src/libged/nmg/nmg_cmface.c
===================================================================
--- brlcad/trunk/src/libged/nmg/nmg_cmface.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/nmg/nmg_cmface.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -71,8 +71,8 @@
/* attempt to resolve and verify */
name = argv[0];
- if ( (dp=db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET))
- == RT_DIR_NULL ) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
return GED_ERROR;
}
@@ -93,11 +93,11 @@
NMG_CK_MODEL(m);
if (BU_LIST_IS_EMPTY(&m->r_hd)) {
- r = nmg_mrsv(m);
- s = BU_LIST_FIRST(shell, &r->s_hd);
+ r = nmg_mrsv(m);
+ s = BU_LIST_FIRST(shell, &r->s_hd);
} else {
- r = BU_LIST_FIRST(nmgregion, &m->r_hd);
- s = BU_LIST_FIRST(shell, &r->s_hd);
+ r = BU_LIST_FIRST(nmgregion, &m->r_hd);
+ s = BU_LIST_FIRST(shell, &r->s_hd);
}
NMG_CK_REGION(r);
@@ -105,15 +105,15 @@
verts = (struct tmp_v *)NULL;
verts = (struct tmp_v *)bu_calloc(num_verts,
- sizeof(struct tmp_v), "verts");
+ sizeof(struct tmp_v), "verts");
face_verts = (struct vertex ***) bu_calloc( num_verts,
- sizeof(struct vertex **), "face_verts");
+ sizeof(struct vertex **),
"face_verts");
for (idx=0; idx < num_verts; idx++){
- verts[idx].pt[0] = (fastf_t)atof(argv[idx*3+2]);
- verts[idx].pt[1] = (fastf_t)atof(argv[idx*3+3]);
- verts[idx].pt[2] = (fastf_t)atof(argv[idx*3+4]);
- face_verts[idx] = &verts[idx].v;
+ verts[idx].pt[0] = (fastf_t)atof(argv[idx*3+2]);
+ verts[idx].pt[1] = (fastf_t)atof(argv[idx*3+3]);
+ verts[idx].pt[2] = (fastf_t)atof(argv[idx*3+4]);
+ face_verts[idx] = &verts[idx].v;
}
fu = nmg_cmface( s, face_verts, num_verts );
@@ -121,15 +121,19 @@
/* assign geometry for entire vertex list (if we have one) */
for (idx=0; idx < num_verts; idx++) {
- if (verts[idx].v) nmg_vertex_gv(verts[idx].v, verts[idx].pt);
+ if (verts[idx].v) {
+ nmg_vertex_gv(verts[idx].v, verts[idx].pt);
+ }
}
/* assign face geometry */
if (s) {
- for (BU_LIST_FOR (fu, faceuse, &s->fu_hd)) {
- if (fu->orientation != OT_SAME) continue;
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
- }
+ for (BU_LIST_FOR (fu, faceuse, &s->fu_hd)) {
+ if (fu->orientation != OT_SAME) {
+ continue;
+ }
+ nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ }
}
tol.magic = BN_TOL_MAGIC;
@@ -141,9 +145,9 @@
nmg_rebound(m, &tol);
if ( wdb_put_internal(gedp->ged_wdbp, name, &internal, 1.0) < 0 ) {
- bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
- rt_db_free_internal(&internal);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
+ rt_db_free_internal(&internal);
+ return GED_ERROR;
}
rt_db_free_internal(&internal);
Modified: brlcad/trunk/src/libged/nmg/nmg_kill_f.c
===================================================================
--- brlcad/trunk/src/libged/nmg/nmg_kill_f.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/nmg/nmg_kill_f.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -45,29 +45,29 @@
NMG_CK_REGION(r);
if (r->ra_p) {
- NMG_CK_REGION_A(r->ra_p);
+ NMG_CK_REGION_A(r->ra_p);
}
for (BU_LIST_FOR(s, shell, &r->s_hd)) {
- NMG_CK_SHELL(s);
+ NMG_CK_SHELL(s);
- if (s->sa_p) {
- NMG_CK_SHELL_A(s->sa_p);
- }
+ if (s->sa_p) {
+ NMG_CK_SHELL_A(s->sa_p);
+ }
- /* Faces in shell */
- for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
- NMG_CK_FACEUSE(fu);
- f = fu->f_p;
- NMG_CK_FACE(f);
+ /* Faces in shell */
+ for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
+ NMG_CK_FACEUSE(fu);
+ f = fu->f_p;
+ NMG_CK_FACE(f);
- if ( fid == f->index ) {
- /* this kills both facesuses using the face,
- * and the face itself.
- */
- nmg_kfu(fu);
- }
- }
+ if ( fid == f->index ) {
+ /* this kills both facesuses using the face,
+ * and the face itself.
+ */
+ nmg_kfu(fu);
+ }
+ }
}
}
}
@@ -93,29 +93,28 @@
/* must be wanting help */
if (argc < 4) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
- return GED_HELP;
+ bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+ return GED_HELP;
}
/* attempt to resolve and verify */
name = argv[0];
- if ( (dp=db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET))
- == RT_DIR_NULL ) {
- bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
- return GED_ERROR;
+ dp = db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
+ bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
+ return GED_ERROR;
}
- if (rt_db_get_internal(&internal, dp, gedp->ged_wdbp->dbip,
- bn_mat_identity, &rt_uniresource) < 0) {
- bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
- return GED_ERROR;
+ if (rt_db_get_internal(&internal, dp, gedp->ged_wdbp->dbip,
bn_mat_identity, &rt_uniresource) < 0) {
+ bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
+ return GED_ERROR;
}
if (internal.idb_type != ID_NMG) {
- bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", name);
- rt_db_free_internal(&internal);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", name);
+ rt_db_free_internal(&internal);
+ return GED_ERROR;
}
/* get face index from command line */
@@ -127,9 +126,9 @@
remove_face(m, fid);
if ( wdb_put_internal(gedp->ged_wdbp, name, &internal, 1.0) < 0 ) {
- bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
- rt_db_free_internal(&internal);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
+ rt_db_free_internal(&internal);
+ return GED_ERROR;
}
rt_db_free_internal(&internal);
Modified: brlcad/trunk/src/libged/nmg/nmg_kill_v.c
===================================================================
--- brlcad/trunk/src/libged/nmg/nmg_kill_v.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/nmg/nmg_kill_v.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -53,204 +53,204 @@
*/
for (BU_LIST_FOR(r, nmgregion, &m->r_hd)) {
- NMG_CK_REGION(r);
+ NMG_CK_REGION(r);
- if (r->ra_p) {
- NMG_CK_REGION_A(r->ra_p);
- }
+ if (r->ra_p) {
+ NMG_CK_REGION_A(r->ra_p);
+ }
- for (BU_LIST_FOR(s, shell, &r->s_hd)) {
- NMG_CK_SHELL(s);
+ for (BU_LIST_FOR(s, shell, &r->s_hd)) {
+ NMG_CK_SHELL(s);
- if (s->sa_p) {
- NMG_CK_SHELL_A(s->sa_p);
- }
+ if (s->sa_p) {
+ NMG_CK_SHELL_A(s->sa_p);
+ }
- /* Faces in shell */
- for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
- NMG_CK_FACEUSE(fu);
- f = fu->f_p;
- NMG_CK_FACE(f);
+ /* Faces in shell */
+ for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
+ NMG_CK_FACEUSE(fu);
+ f = fu->f_p;
+ NMG_CK_FACE(f);
- if (f->g.magic_p) switch (*f->g.magic_p) {
- case NMG_FACE_G_PLANE_MAGIC:
- break;
- case NMG_FACE_G_SNURB_MAGIC:
- break;
- }
+ if (f->g.magic_p) switch (*f->g.magic_p) {
+ case NMG_FACE_G_PLANE_MAGIC:
+ break;
+ case NMG_FACE_G_SNURB_MAGIC:
+ break;
+ }
- /* Loops in face */
- for (BU_LIST_FOR(lu, loopuse, &fu->lu_hd)) {
- NMG_CK_LOOPUSE(lu);
- l = lu->l_p;
- NMG_CK_LOOP(l);
+ /* Loops in face */
+ for (BU_LIST_FOR(lu, loopuse, &fu->lu_hd)) {
+ NMG_CK_LOOPUSE(lu);
+ l = lu->l_p;
+ NMG_CK_LOOP(l);
- if (l->lg_p) {
- NMG_CK_LOOP_G(l->lg_p);
- }
+ if (l->lg_p) {
+ NMG_CK_LOOP_G(l->lg_p);
+ }
- if (BU_LIST_FIRST_MAGIC(&lu->down_hd) ==
NMG_VERTEXUSE_MAGIC) {
- /* Loop of Lone vertex */
- vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
+ if (BU_LIST_FIRST_MAGIC(&lu->down_hd) ==
NMG_VERTEXUSE_MAGIC) {
+ /* Loop of Lone vertex */
+ vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST)
) {
- nmg_kvu(vu);
- nmg_klu(lu);
- }
- }
+ if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) )
{
+ nmg_kvu(vu);
+ nmg_klu(lu);
+ }
+ }
- continue;
- }
+ continue;
+ }
- for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
- NMG_CK_EDGEUSE(eu);
- e = eu->e_p;
- NMG_CK_EDGE(e);
+ for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
+ NMG_CK_EDGEUSE(eu);
+ e = eu->e_p;
+ NMG_CK_EDGE(e);
- if (eu->g.magic_p) {
- switch (*eu->g.magic_p) {
- case NMG_EDGE_G_LSEG_MAGIC:
- break;
- case NMG_EDGE_G_CNURB_MAGIC:
- break;
- }
- }
+ if (eu->g.magic_p) {
+ switch (*eu->g.magic_p) {
+ case NMG_EDGE_G_LSEG_MAGIC:
+ break;
+ case NMG_EDGE_G_CNURB_MAGIC:
+ break;
+ }
+ }
- vu = eu->vu_p;
+ vu = eu->vu_p;
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord,
- rv, BN_TOL_DIST) ) {
- nmg_kvu(vu);
- nmg_keu(eu);
- nmg_klu(lu);
- }
- }
- }
- }
- }
+ if ( VNEAR_EQUAL(v->vg_p->coord,
+ rv, BN_TOL_DIST) ) {
+ nmg_kvu(vu);
+ nmg_keu(eu);
+ nmg_klu(lu);
+ }
+ }
+ }
+ }
+ }
- /* Wire loops in shell */
- for (BU_LIST_FOR(lu, loopuse, &s->lu_hd)) {
- NMG_CK_LOOPUSE(lu);
- l = lu->l_p;
- NMG_CK_LOOP(l);
+ /* Wire loops in shell */
+ for (BU_LIST_FOR(lu, loopuse, &s->lu_hd)) {
+ NMG_CK_LOOPUSE(lu);
+ l = lu->l_p;
+ NMG_CK_LOOP(l);
- if (l->lg_p) {
- NMG_CK_LOOP_G(l->lg_p);
- }
+ if (l->lg_p) {
+ NMG_CK_LOOP_G(l->lg_p);
+ }
- if (BU_LIST_FIRST_MAGIC(&lu->down_hd) == NMG_VERTEXUSE_MAGIC) {
- /* Wire loop of Lone vertex */
- vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
- nmg_kvu(vu);
- nmg_klu(lu);
- }
- }
- continue;
- }
+ if (BU_LIST_FIRST_MAGIC(&lu->down_hd) == NMG_VERTEXUSE_MAGIC) {
+ /* Wire loop of Lone vertex */
+ vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
+ if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
+ nmg_kvu(vu);
+ nmg_klu(lu);
+ }
+ }
+ continue;
+ }
- for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
- NMG_CK_EDGEUSE(eu);
- e = eu->e_p;
- NMG_CK_EDGE(e);
+ for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
+ NMG_CK_EDGEUSE(eu);
+ e = eu->e_p;
+ NMG_CK_EDGE(e);
- if (eu->g.magic_p) switch (*eu->g.magic_p) {
- case NMG_EDGE_G_LSEG_MAGIC:
- break;
- case NMG_EDGE_G_CNURB_MAGIC:
- break;
- }
- vu = eu->vu_p;
+ if (eu->g.magic_p) switch (*eu->g.magic_p) {
+ case NMG_EDGE_G_LSEG_MAGIC:
+ break;
+ case NMG_EDGE_G_CNURB_MAGIC:
+ break;
+ }
+ vu = eu->vu_p;
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
- nmg_kvu(vu);
- nmg_keu(eu);
- nmg_klu(lu);
- }
- }
- }
- }
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
+ if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
+ nmg_kvu(vu);
+ nmg_keu(eu);
+ nmg_klu(lu);
+ }
+ }
+ }
+ }
- /* Wire edges in shell */
- for (BU_LIST_FOR(eu, edgeuse, &s->eu_hd)) {
- NMG_CK_EDGEUSE(eu);
- e = eu->e_p;
- NMG_CK_EDGE(e);
+ /* Wire edges in shell */
+ for (BU_LIST_FOR(eu, edgeuse, &s->eu_hd)) {
+ NMG_CK_EDGEUSE(eu);
+ e = eu->e_p;
+ NMG_CK_EDGE(e);
- if (eu->g.magic_p) {
- switch (*eu->g.magic_p) {
- case NMG_EDGE_G_LSEG_MAGIC:
- break;
- case NMG_EDGE_G_CNURB_MAGIC:
- break;
- }
- }
+ if (eu->g.magic_p) {
+ switch (*eu->g.magic_p) {
+ case NMG_EDGE_G_LSEG_MAGIC:
+ break;
+ case NMG_EDGE_G_CNURB_MAGIC:
+ break;
+ }
+ }
- vu = eu->vu_p;
+ vu = eu->vu_p;
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
- nmg_kvu(vu);
- nmg_keu(eu);
- }
- }
- }
+ if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
+ nmg_kvu(vu);
+ nmg_keu(eu);
+ }
+ }
+ }
- /* Lone vertex in shell */
- vu = s->vu_p;
+ /* Lone vertex in shell */
+ vu = s->vu_p;
- if (vu) {
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ if (vu) {
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
- nmg_kvu(vu);
- }
- }
- }
- }
+ if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
+ nmg_kvu(vu);
+ }
+ }
+ }
+ }
}
}
@@ -275,29 +275,28 @@
/* must be wanting help */
if (argc < 6) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
- return GED_HELP;
+ bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+ return GED_HELP;
}
/* attempt to resolve and verify */
name = argv[0];
- if ( (dp=db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET))
- == RT_DIR_NULL ) {
- bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
- return GED_ERROR;
+ dp = db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
+ bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
+ return GED_ERROR;
}
- if (rt_db_get_internal(&internal, dp, gedp->ged_wdbp->dbip,
- bn_mat_identity, &rt_uniresource) < 0) {
- bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
- return GED_ERROR;
+ if (rt_db_get_internal(&internal, dp, gedp->ged_wdbp->dbip,
bn_mat_identity, &rt_uniresource) < 0) {
+ bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
+ return GED_ERROR;
}
if (internal.idb_type != ID_NMG) {
- bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", name);
- rt_db_free_internal(&internal);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", name);
+ rt_db_free_internal(&internal);
+ return GED_ERROR;
}
vt[0] = atof(argv[3]); vt[1] = atof(argv[4]); vt[2] = atof(argv[5]);
@@ -308,9 +307,9 @@
remove_vertex(m, vt);
if ( wdb_put_internal(gedp->ged_wdbp, name, &internal, 1.0) < 0 ) {
- bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
- rt_db_free_internal(&internal);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
+ rt_db_free_internal(&internal);
+ return GED_ERROR;
}
rt_db_free_internal(&internal);
Modified: brlcad/trunk/src/libged/nmg/nmg_make_v.c
===================================================================
--- brlcad/trunk/src/libged/nmg/nmg_make_v.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/nmg/nmg_make_v.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -69,8 +69,8 @@
/* attempt to resolve and verify */
name = argv[0];
- if ( (dp=db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET))
- == RT_DIR_NULL ) {
+ dp = db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
return GED_ERROR;
}
@@ -91,11 +91,11 @@
NMG_CK_MODEL(m);
if (BU_LIST_IS_EMPTY(&m->r_hd)) {
- r = nmg_mrsv(m);
- s = BU_LIST_FIRST(shell, &r->s_hd);
+ r = nmg_mrsv(m);
+ s = BU_LIST_FIRST(shell, &r->s_hd);
} else {
- r = BU_LIST_FIRST(nmgregion, &m->r_hd);
- s = BU_LIST_FIRST(shell, &r->s_hd);
+ r = BU_LIST_FIRST(nmgregion, &m->r_hd);
+ s = BU_LIST_FIRST(shell, &r->s_hd);
}
NMG_CK_REGION(r);
@@ -102,18 +102,17 @@
NMG_CK_SHELL(s);
verts = (struct tmp_v *)NULL;
- verts = (struct tmp_v *)bu_calloc(num_verts,
- sizeof(struct tmp_v), "verts");
+ verts = (struct tmp_v *)bu_calloc(num_verts, sizeof(struct tmp_v),
"verts");
for (idx=0; idx < num_verts; idx++){
- struct shell* ns = nmg_msv(r);
- NMG_CK_SHELL(ns);
+ struct shell* ns = nmg_msv(r);
+ NMG_CK_SHELL(ns);
- verts[idx].pt[0] = (fastf_t)atof(argv[idx*3+3]);
- verts[idx].pt[1] = (fastf_t)atof(argv[idx*3+4]);
- verts[idx].pt[2] = (fastf_t)atof(argv[idx*3+5]);
+ verts[idx].pt[0] = (fastf_t)atof(argv[idx*3+3]);
+ verts[idx].pt[1] = (fastf_t)atof(argv[idx*3+4]);
+ verts[idx].pt[2] = (fastf_t)atof(argv[idx*3+5]);
- nmg_vertex_gv( ns->vu_p->v_p, verts[idx].pt);
+ nmg_vertex_gv( ns->vu_p->v_p, verts[idx].pt);
}
tol.magic = BN_TOL_MAGIC;
@@ -125,9 +124,9 @@
nmg_rebound(m, &tol);
if ( wdb_put_internal(gedp->ged_wdbp, name, &internal, 1.0) < 0 ) {
- bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
- rt_db_free_internal(&internal);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
+ rt_db_free_internal(&internal);
+ return GED_ERROR;
}
rt_db_free_internal(&internal);
Modified: brlcad/trunk/src/libged/nmg/nmg_mm.c
===================================================================
--- brlcad/trunk/src/libged/nmg/nmg_mm.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/nmg/nmg_mm.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -47,8 +47,8 @@
GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
if (argc != 2) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
- return GED_HELP;
+ bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+ return GED_HELP;
}
/* attempt to resolve and verify */
@@ -68,8 +68,7 @@
(void)signal(SIGINT, SIG_IGN);
/* add model to database */
- GED_DB_DIRADD(gedp, dp, name, RT_DIR_PHONY_ADDR, 0,
- RT_DIR_SOLID, (void *)&internal.idb_type, GED_ERROR);
+ GED_DB_DIRADD(gedp, dp, name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void
*)&internal.idb_type, GED_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, GED_ERROR);
return GED_OK;
Modified: brlcad/trunk/src/libged/nmg/nmg_move_v.c
===================================================================
--- brlcad/trunk/src/libged/nmg/nmg_move_v.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/nmg/nmg_move_v.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -51,209 +51,209 @@
*/
for (BU_LIST_FOR(r, nmgregion, &m->r_hd)) {
- NMG_CK_REGION(r);
+ NMG_CK_REGION(r);
- if (r->ra_p) {
- NMG_CK_REGION_A(r->ra_p);
- }
+ if (r->ra_p) {
+ NMG_CK_REGION_A(r->ra_p);
+ }
- for (BU_LIST_FOR(s, shell, &r->s_hd)) {
- NMG_CK_SHELL(s);
+ for (BU_LIST_FOR(s, shell, &r->s_hd)) {
+ NMG_CK_SHELL(s);
- if (s->sa_p) {
- NMG_CK_SHELL_A(s->sa_p);
- }
+ if (s->sa_p) {
+ NMG_CK_SHELL_A(s->sa_p);
+ }
- /* Faces in shell */
- for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
- NMG_CK_FACEUSE(fu);
- f = fu->f_p;
- NMG_CK_FACE(f);
+ /* Faces in shell */
+ for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
+ NMG_CK_FACEUSE(fu);
+ f = fu->f_p;
+ NMG_CK_FACE(f);
- if (f->g.magic_p) switch (*f->g.magic_p) {
- case NMG_FACE_G_PLANE_MAGIC:
- break;
- case NMG_FACE_G_SNURB_MAGIC:
- break;
- }
+ if (f->g.magic_p) switch (*f->g.magic_p) {
+ case NMG_FACE_G_PLANE_MAGIC:
+ break;
+ case NMG_FACE_G_SNURB_MAGIC:
+ break;
+ }
- /* Loops in face */
- for (BU_LIST_FOR(lu, loopuse, &fu->lu_hd)) {
- NMG_CK_LOOPUSE(lu);
- l = lu->l_p;
- NMG_CK_LOOP(l);
+ /* Loops in face */
+ for (BU_LIST_FOR(lu, loopuse, &fu->lu_hd)) {
+ NMG_CK_LOOPUSE(lu);
+ l = lu->l_p;
+ NMG_CK_LOOP(l);
- if (l->lg_p) {
- NMG_CK_LOOP_G(l->lg_p);
- }
+ if (l->lg_p) {
+ NMG_CK_LOOP_G(l->lg_p);
+ }
- if (BU_LIST_FIRST_MAGIC(&lu->down_hd) ==
NMG_VERTEXUSE_MAGIC) {
- /* Loop of Lone vertex */
- vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
+ if (BU_LIST_FIRST_MAGIC(&lu->down_hd) ==
NMG_VERTEXUSE_MAGIC) {
+ /* Loop of Lone vertex */
+ vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, v_old,
BN_TOL_DIST) ) {
- v->vg_p->coord[0] = v_new[0];
- v->vg_p->coord[1] = v_new[1];
- v->vg_p->coord[2] = v_new[2];
- }
- }
+ if ( VNEAR_EQUAL(v->vg_p->coord, v_old,
BN_TOL_DIST) ) {
+ v->vg_p->coord[0] = v_new[0];
+ v->vg_p->coord[1] = v_new[1];
+ v->vg_p->coord[2] = v_new[2];
+ }
+ }
- continue;
- }
+ continue;
+ }
- for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
- NMG_CK_EDGEUSE(eu);
- e = eu->e_p;
- NMG_CK_EDGE(e);
+ for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
+ NMG_CK_EDGEUSE(eu);
+ e = eu->e_p;
+ NMG_CK_EDGE(e);
- if (eu->g.magic_p) {
- switch (*eu->g.magic_p) {
- case NMG_EDGE_G_LSEG_MAGIC:
- break;
- case NMG_EDGE_G_CNURB_MAGIC:
- break;
- }
- }
+ if (eu->g.magic_p) {
+ switch (*eu->g.magic_p) {
+ case NMG_EDGE_G_LSEG_MAGIC:
+ break;
+ case NMG_EDGE_G_CNURB_MAGIC:
+ break;
+ }
+ }
- vu = eu->vu_p;
+ vu = eu->vu_p;
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord,
- v_old, BN_TOL_DIST) ) {
- v->vg_p->coord[0] = v_new[0];
- v->vg_p->coord[1] = v_new[1];
- v->vg_p->coord[2] = v_new[2];
- }
- }
- }
- }
- }
+ if ( VNEAR_EQUAL(v->vg_p->coord,
+ v_old, BN_TOL_DIST) ) {
+ v->vg_p->coord[0] = v_new[0];
+ v->vg_p->coord[1] = v_new[1];
+ v->vg_p->coord[2] = v_new[2];
+ }
+ }
+ }
+ }
+ }
- /* Wire loops in shell */
- for (BU_LIST_FOR(lu, loopuse, &s->lu_hd)) {
- NMG_CK_LOOPUSE(lu);
- l = lu->l_p;
- NMG_CK_LOOP(l);
+ /* Wire loops in shell */
+ for (BU_LIST_FOR(lu, loopuse, &s->lu_hd)) {
+ NMG_CK_LOOPUSE(lu);
+ l = lu->l_p;
+ NMG_CK_LOOP(l);
- if (l->lg_p) {
- NMG_CK_LOOP_G(l->lg_p);
- }
+ if (l->lg_p) {
+ NMG_CK_LOOP_G(l->lg_p);
+ }
- if (BU_LIST_FIRST_MAGIC(&lu->down_hd) == NMG_VERTEXUSE_MAGIC) {
- /* Wire loop of Lone vertex */
- vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, v_old, BN_TOL_DIST) )
{
- v->vg_p->coord[0] = v_new[0];
- v->vg_p->coord[1] = v_new[1];
- v->vg_p->coord[2] = v_new[2];
- }
- }
- continue;
- }
+ if (BU_LIST_FIRST_MAGIC(&lu->down_hd) == NMG_VERTEXUSE_MAGIC) {
+ /* Wire loop of Lone vertex */
+ vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
+ if ( VNEAR_EQUAL(v->vg_p->coord, v_old, BN_TOL_DIST) ) {
+ v->vg_p->coord[0] = v_new[0];
+ v->vg_p->coord[1] = v_new[1];
+ v->vg_p->coord[2] = v_new[2];
+ }
+ }
+ continue;
+ }
- for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
- NMG_CK_EDGEUSE(eu);
- e = eu->e_p;
- NMG_CK_EDGE(e);
+ for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
+ NMG_CK_EDGEUSE(eu);
+ e = eu->e_p;
+ NMG_CK_EDGE(e);
- if (eu->g.magic_p) switch (*eu->g.magic_p) {
- case NMG_EDGE_G_LSEG_MAGIC:
- break;
- case NMG_EDGE_G_CNURB_MAGIC:
- break;
- }
- vu = eu->vu_p;
+ if (eu->g.magic_p) switch (*eu->g.magic_p) {
+ case NMG_EDGE_G_LSEG_MAGIC:
+ break;
+ case NMG_EDGE_G_CNURB_MAGIC:
+ break;
+ }
+ vu = eu->vu_p;
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, v_old, BN_TOL_DIST) )
{
- v->vg_p->coord[0] = v_new[0];
- v->vg_p->coord[1] = v_new[1];
- v->vg_p->coord[2] = v_new[2];
- }
- }
- }
- }
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
+ if ( VNEAR_EQUAL(v->vg_p->coord, v_old, BN_TOL_DIST) ) {
+ v->vg_p->coord[0] = v_new[0];
+ v->vg_p->coord[1] = v_new[1];
+ v->vg_p->coord[2] = v_new[2];
+ }
+ }
+ }
+ }
- /* Wire edges in shell */
- for (BU_LIST_FOR(eu, edgeuse, &s->eu_hd)) {
- NMG_CK_EDGEUSE(eu);
- e = eu->e_p;
- NMG_CK_EDGE(e);
+ /* Wire edges in shell */
+ for (BU_LIST_FOR(eu, edgeuse, &s->eu_hd)) {
+ NMG_CK_EDGEUSE(eu);
+ e = eu->e_p;
+ NMG_CK_EDGE(e);
- if (eu->g.magic_p) {
- switch (*eu->g.magic_p) {
- case NMG_EDGE_G_LSEG_MAGIC:
- break;
- case NMG_EDGE_G_CNURB_MAGIC:
- break;
- }
- }
+ if (eu->g.magic_p) {
+ switch (*eu->g.magic_p) {
+ case NMG_EDGE_G_LSEG_MAGIC:
+ break;
+ case NMG_EDGE_G_CNURB_MAGIC:
+ break;
+ }
+ }
- vu = eu->vu_p;
+ vu = eu->vu_p;
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, v_old, BN_TOL_DIST) ) {
- v->vg_p->coord[0] = v_new[0];
- v->vg_p->coord[1] = v_new[1];
- v->vg_p->coord[2] = v_new[2];
- }
- }
- }
+ if ( VNEAR_EQUAL(v->vg_p->coord, v_old, BN_TOL_DIST) ) {
+ v->vg_p->coord[0] = v_new[0];
+ v->vg_p->coord[1] = v_new[1];
+ v->vg_p->coord[2] = v_new[2];
+ }
+ }
+ }
- /* Lone vertex in shell */
- vu = s->vu_p;
+ /* Lone vertex in shell */
+ vu = s->vu_p;
- if (vu) {
- /* check and remove vertexuse */
- NMG_CK_VERTEXUSE(vu);
- v = vu->v_p;
- NMG_CK_VERTEX(v);
+ if (vu) {
+ /* check and remove vertexuse */
+ NMG_CK_VERTEXUSE(vu);
+ v = vu->v_p;
+ NMG_CK_VERTEX(v);
- if (v->vg_p) {
- NMG_CK_VERTEX_G(v->vg_p);
+ if (v->vg_p) {
+ NMG_CK_VERTEX_G(v->vg_p);
- if ( VNEAR_EQUAL(v->vg_p->coord, v_old, BN_TOL_DIST) ) {
- v->vg_p->coord[0] = v_new[0];
- v->vg_p->coord[1] = v_new[1];
- v->vg_p->coord[2] = v_new[2];
- }
- }
- }
- }
+ if ( VNEAR_EQUAL(v->vg_p->coord, v_old, BN_TOL_DIST) ) {
+ v->vg_p->coord[0] = v_new[0];
+ v->vg_p->coord[1] = v_new[1];
+ v->vg_p->coord[2] = v_new[2];
+ }
+ }
+ }
+ }
}
}
@@ -279,29 +279,28 @@
/* must be wanting help */
if (argc != 9 ) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
- return GED_HELP;
+ bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+ return GED_HELP;
}
/* attempt to resolve and verify */
name = argv[0];
- if ( (dp=db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET))
- == RT_DIR_NULL ) {
- bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
- return GED_ERROR;
+ dp = db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) {
+ bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
+ return GED_ERROR;
}
- if (rt_db_get_internal(&internal, dp, gedp->ged_wdbp->dbip,
- bn_mat_identity, &rt_uniresource) < 0) {
- bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
- return GED_ERROR;
+ if (rt_db_get_internal(&internal, dp, gedp->ged_wdbp->dbip,
bn_mat_identity, &rt_uniresource) < 0) {
+ bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
+ return GED_ERROR;
}
if (internal.idb_type != ID_NMG) {
- bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", name);
- rt_db_free_internal(&internal);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", name);
+ rt_db_free_internal(&internal);
+ return GED_ERROR;
}
vtold[0] = atof(argv[3]);
@@ -318,9 +317,9 @@
move_vertex(m, vtold, vtnew);
if ( wdb_put_internal(gedp->ged_wdbp, name, &internal, 1.0) < 0 ) {
- bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
- rt_db_free_internal(&internal);
- return GED_ERROR;
+ bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
+ rt_db_free_internal(&internal);
+ return GED_ERROR;
}
rt_db_free_internal(&internal);
Modified: brlcad/trunk/src/libged/overlay/overlay.c
===================================================================
--- brlcad/trunk/src/libged/overlay/overlay.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/overlay/overlay.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -45,10 +45,14 @@
type_int = bu_file_mime(argv[0], BU_MIME_IMAGE);
type = (type_int < 0) ? BU_MIME_IMAGE_UNKNOWN : (bu_mime_image_t)type_int;
if (type == BU_MIME_IMAGE_UNKNOWN) {
- if (msg) bu_vls_sprintf(msg, "Error - unknown geometry file type: %s
\n", argv[0]);
- return -1;
+ if (msg) {
+ bu_vls_sprintf(msg, "Error - unknown geometry file type: %s \n",
argv[0]);
+ }
+ return -1;
}
- if (set_type) (*set_type) = type;
+ if (set_type) {
+ (*set_type) = type;
+ }
return 1;
}
Modified: brlcad/trunk/src/libged/rot/rot.c
===================================================================
--- brlcad/trunk/src/libged/rot/rot.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/rot/rot.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -32,7 +32,6 @@
#include "../ged_private.h"
-
int
ged_rot_core(struct ged *gedp, int argc, const char *argv[])
{
Modified: brlcad/trunk/src/libged/rt/rt.c
===================================================================
--- brlcad/trunk/src/libged/rt/rt.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/rt/rt.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -39,7 +39,6 @@
#include "../ged_private.h"
-
int
ged_rt_core(struct ged *gedp, int argc, const char *argv[])
{
Modified: brlcad/trunk/src/libged/screengrab/screengrab.c
===================================================================
--- brlcad/trunk/src/libged/screengrab/screengrab.c 2020-07-27 20:07:58 UTC
(rev 76532)
+++ brlcad/trunk/src/libged/screengrab/screengrab.c 2020-07-27 20:11:12 UTC
(rev 76533)
@@ -45,10 +45,14 @@
type_int = bu_file_mime(argv[0], BU_MIME_IMAGE);
type = (type_int < 0) ? BU_MIME_IMAGE_UNKNOWN : (bu_mime_image_t)type_int;
if (type == BU_MIME_IMAGE_UNKNOWN) {
- if (msg) bu_vls_sprintf(msg, "Error - unknown geometry file type: %s
\n", argv[0]);
- return -1;
+ if (msg) {
+ bu_vls_sprintf(msg, "Error - unknown geometry file type: %s \n",
argv[0]);
+ }
+ return -1;
}
- if (set_type) (*set_type) = type;
+ if (set_type) {
+ (*set_type) = type;
+ }
return 1;
}
Modified: brlcad/trunk/src/libged/set_transparency/set_transparency.c
===================================================================
--- brlcad/trunk/src/libged/set_transparency/set_transparency.c 2020-07-27
20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/set_transparency/set_transparency.c 2020-07-27
20:11:12 UTC (rev 76533)
@@ -26,8 +26,6 @@
#include "common.h"
-
-
#include "../ged_private.h"
Modified: brlcad/trunk/src/libged/tables/tables.c
===================================================================
--- brlcad/trunk/src/libged/tables/tables.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/tables/tables.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -42,7 +42,6 @@
#include "../ged_private.h"
-
#define ABORTED -99
#define OLDSOLID 0
#define NEWSOLID 1
Modified: brlcad/trunk/src/libged/tests/test_list.c
===================================================================
--- brlcad/trunk/src/libged/tests/test_list.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/tests/test_list.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -39,7 +39,7 @@
}
if (ac > 1) {
- size_t invocations = 0;
+ size_t invocations = 0;
seconds = atoi(av[1]);
start = bu_gettime();
Modified: brlcad/trunk/src/libged/tol/tol.c
===================================================================
--- brlcad/trunk/src/libged/tol/tol.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/tol/tol.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -122,8 +122,6 @@
}
-
-
return GED_OK;
}
Modified: brlcad/trunk/src/libged/tops/tops.c
===================================================================
--- brlcad/trunk/src/libged/tops/tops.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/tops/tops.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -130,7 +130,6 @@
}
-
#ifdef GED_PLUGIN
#include "../include/plugin.h"
struct ged_cmd_impl tops_cmd_impl = {
Modified: brlcad/trunk/src/libged/view/data_lines.c
===================================================================
--- brlcad/trunk/src/libged/view/data_lines.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/view/data_lines.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -297,13 +297,13 @@
argc--;argv++;
if (bu_cmd_valid(_view_dline_cmds, argv[0]) != BRLCAD_OK) {
- bu_vls_printf(gedp->ged_result_str, "invalid subcommand: %s", argv[1]);
+ bu_vls_printf(gedp->ged_result_str, "invalid subcommand: %s", argv[1]);
return GED_ERROR;
}
int ret;
if (bu_cmd(_view_dline_cmds, argc, argv, 0, (void *)&vs, &ret) ==
BRLCAD_OK) {
- return GED_OK;
+ return GED_OK;
}
return GED_ERROR;
Modified: brlcad/trunk/src/libged/view/snap.c
===================================================================
--- brlcad/trunk/src/libged/view/snap.c 2020-07-27 20:07:58 UTC (rev 76532)
+++ brlcad/trunk/src/libged/view/snap.c 2020-07-27 20:11:12 UTC (rev 76533)
@@ -52,18 +52,18 @@
double d = strtod(argv[0], &endptr);
if (endptr != NULL && strlen(endptr) > 0) {
- /* Had some invalid character in the input, fail */
- if (msg) {
- bu_vls_printf(msg, "Invalid string specifier for double: %s\n",
argv[0]);
- }
- return -1;
+ /* Had some invalid character in the input, fail */
+ if (msg) {
+ bu_vls_printf(msg, "Invalid string specifier for double: %s\n",
argv[0]);
+ }
+ return -1;
}
if (errno == ERANGE) {
- if (msg) {
- bu_vls_printf(msg, "Invalid input for double (range error): %s\n",
argv[0]);
- }
- return -1;
+ if (msg) {
+ bu_vls_printf(msg, "Invalid input for double (range error): %s\n",
argv[0]);
+ }
+ return -1;
}
if (tol_set) (*tol_set) = d;
@@ -128,8 +128,8 @@
/* adjust argc to match the leftovers of the options parsing */
argc = opt_ret;
if (argc != 2 && argc != 3) {
- _ged_cmd_help(gedp, usage, d);
- return GED_ERROR;
+ _ged_cmd_help(gedp, usage, d);
+ return GED_ERROR;
}
/* We may get a 2D screen point or a 3D model space point. Either
@@ -205,8 +205,6 @@
}
-
-
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/wcodes/wcodes.c
===================================================================
--- brlcad/trunk/src/libged/wcodes/wcodes.c 2020-07-27 20:07:58 UTC (rev
76532)
+++ brlcad/trunk/src/libged/wcodes/wcodes.c 2020-07-27 20:11:12 UTC (rev
76533)
@@ -142,7 +142,7 @@
/* must be wanting help */
if (argc < 3) {
bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
- if (argc == 1)
+ if (argc == 1)
return GED_HELP;
return GED_ERROR;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
