[brlcad-commits] SF.net SVN: brlcad: [29896] brlcad/trunk/src
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad: [29896] brlcad/trunk/src
|
From: <br...@us...> - 2008-01-13 23:39:05
|
Revision: 29896
http://brlcad.svn.sourceforge.net/brlcad/?rev=29896&view=rev
Author: brlcad
Date: 2008-01-13 15:39:10 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
refactor to use bu_exit instead of bu_log+exit where applicable
Modified Paths:
--------------
brlcad/trunk/src/conv/iges/n_iges.cpp
brlcad/trunk/src/conv/iges/nmain.cpp
brlcad/trunk/src/gtools/beset/beset.c
brlcad/trunk/src/halftone/main.c
brlcad/trunk/src/irprep/Makefile.am
brlcad/trunk/src/irprep/irdisp.c
brlcad/trunk/src/libbu/association.c
brlcad/trunk/src/libbu/backtrace.c
brlcad/trunk/src/libbu/fopen_uniq.c
brlcad/trunk/src/libbu/htester.c
brlcad/trunk/src/libbu/image.c
brlcad/trunk/src/libbu/rb_internals.h
brlcad/trunk/src/libbu/semaphore.c
brlcad/trunk/src/libfb/if_ug.c
brlcad/trunk/src/librt/g_ebm.c
brlcad/trunk/src/librt/prep.c
brlcad/trunk/src/sig/Makefile.am
brlcad/trunk/src/sig/a-d.c
brlcad/trunk/src/sig/bw-d.c
brlcad/trunk/src/sig/d-bw.c
brlcad/trunk/src/sig/d-f.c
brlcad/trunk/src/sig/d-i.c
brlcad/trunk/src/sig/d-u.c
brlcad/trunk/src/sig/d2-c.c
brlcad/trunk/src/sig/dconv.c
brlcad/trunk/src/sig/ddisp.c
brlcad/trunk/src/sig/dfft.c
brlcad/trunk/src/sig/dmod.c
brlcad/trunk/src/sig/dsel.c
brlcad/trunk/src/sig/dstat.c
brlcad/trunk/src/sig/f-d.c
brlcad/trunk/src/sig/f-i.c
brlcad/trunk/src/sig/i-d.c
brlcad/trunk/src/sig/i-f.c
brlcad/trunk/src/sig/imod.c
brlcad/trunk/src/sig/istat.c
brlcad/trunk/src/sig/smod.c
brlcad/trunk/src/sig/u-d.c
brlcad/trunk/src/sig/u-f.c
brlcad/trunk/src/sig/umod.c
brlcad/trunk/src/sig/ustat.c
Modified: brlcad/trunk/src/conv/iges/n_iges.cpp
===================================================================
--- brlcad/trunk/src/conv/iges/n_iges.cpp 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/conv/iges/n_iges.cpp 2008-01-13 23:39:10 UTC (rev 29896)
@@ -211,9 +211,8 @@
k = NRECS;
if( fseek(in, 0, SEEK_SET) ) /* rewind file */ {
- bu_log( "Cannot rewind file\n" );
perror( "Recsize" );
- exit( 1 );
+ bu_exit(-1, "Cannot rewind file\n" );
}
if( recl == 0 ) /* then LF's were found */ {
@@ -665,8 +664,7 @@
IGES::readStart(FILE* in) {
Record start(in);
if (!start.isStart()) {
- cerr << "Start section not found" << endl;
- exit(-1);
+ bu_exit(-1, "Start section not found\n");
}
}
@@ -690,8 +688,7 @@
paramSectionStart = test.where();
debug( "Param section starts: " << paramSectionStart );
} else {
- cerr << "Param section not found! Aborting" << endl;
- exit(-1);
+ bu_exit(-1, "Param section not found! Aborting\n");
}
}
Modified: brlcad/trunk/src/conv/iges/nmain.cpp
===================================================================
--- brlcad/trunk/src/conv/iges/nmain.cpp 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/conv/iges/nmain.cpp 2008-01-13 23:39:10 UTC (rev 29896)
@@ -8,8 +8,7 @@
main(int argc, char** argv) {
cout << argc << endl;
if (argc != 3) {
- cerr << "iges <iges_filename> <output_filename>" << endl;
- exit(0);
+ bu_exit(0, "iges <iges_filename> <output_filename>\n");
}
string file(argv[1]);
Modified: brlcad/trunk/src/gtools/beset/beset.c
===================================================================
--- brlcad/trunk/src/gtools/beset/beset.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/gtools/beset/beset.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -51,7 +51,9 @@
struct rt_db_internal source_obj;
-void usage(){fprintf(stderr, "Usage: %s [options] db.g object\nOptions:\n -p #\t\tPopulation size\n -g #\t\tNumber of generations\n -r #\t\tResolution \n -u #\t\tUpper percent of individuals to keep\n -l #\t\tLower percent of individuals to kill\n",bu_getprogname());exit(1);}
+void usage(){
+ bu_exit(1, "Usage: %s [options] db.g object\nOptions:\n -p #\t\tPopulation size\n -g #\t\tNumber of generations\n -r #\t\tResolution \n -u #\t\tUpper percent of individuals to keep\n -l #\t\tLower percent of individuals to kill\n", bu_getprogname());
+}
/* fitness of a given object compared to source */
Modified: brlcad/trunk/src/halftone/main.c
===================================================================
--- brlcad/trunk/src/halftone/main.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/halftone/main.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -122,7 +122,7 @@
*
* Exit:
* parameters have been set.
- * if there is a fatal error exit(!0)
+ * if there is a fatal error, exit non-zero
*
* Uses:
* width - width of pixture
Modified: brlcad/trunk/src/irprep/Makefile.am
===================================================================
--- brlcad/trunk/src/irprep/Makefile.am 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/irprep/Makefile.am 2008-01-13 23:39:10 UTC (rev 29896)
@@ -28,8 +28,13 @@
firpass_SOURCES = firpass.c subroutines.c
firpass_LDADD = ${RT}
+if WITH_X11
irdisp_SOURCES = irdisp.c
irdisp_CFLAGS = ${X_CFLAGS}
+irdisp_LDADD = \
+ ${BU} \
+ ${X_LIBS}
+endif
ir_sgi_SOURCES = ir-sgi.c
ir_sgi_LDADD = ${BU}
Modified: brlcad/trunk/src/irprep/irdisp.c
===================================================================
--- brlcad/trunk/src/irprep/irdisp.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/irprep/irdisp.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -146,8 +146,7 @@
X_or_SGI = irsgi;
else
{
- fprintf( stderr , "Bad choice for display (%s)\n" , choice );
- exit( 1 );
+ bu_exit(1, "Bad choice for display (%s)\n" , choice );
}
(void)printf("\nThe program %s in now being run. If option\n", X_or_SGI);
(void)printf("0 or 1 was used when the name of a file is asked\n");
Modified: brlcad/trunk/src/libbu/association.c
===================================================================
--- brlcad/trunk/src/libbu/association.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/libbu/association.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -82,8 +82,7 @@
* between ERROR_PERFORMING_THE_LOOKUP
* and VALUE_NOT_FOUND.
*/
- bu_log("bu_association: Cannot open association file '%s'\n", fname);
- exit (1);
+ bu_exit(1, "bu_association: Cannot open association file '%s'\n", fname);
}
bu_vls_init(&buffer);
Modified: brlcad/trunk/src/libbu/backtrace.c
===================================================================
--- brlcad/trunk/src/libbu/backtrace.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/libbu/backtrace.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -133,7 +133,7 @@
if ((pipe(input) == -1) || (pipe(output) == -1)) {
perror("unable to open pipe");
fflush(stderr);
- exit(1); /* can't call bu_bomb() */
+ exit(1); /* can't call bu_bomb()/bu_exit() */
}
pid = fork();
@@ -145,11 +145,11 @@
execvp(args[0], args); /* invoke debugger */
perror("exec failed");
fflush(stderr);
- exit(1); /* can't call bu_bomb() */
+ exit(1); /* can't call bu_bomb()/bu_exit() */
} else if (pid == (pid_t) -1) {
perror("unable to fork");
fflush(stderr);
- exit(1); /* can't call bu_bomb() */
+ exit(1); /* can't call bu_bomb()/bu_exit() */
}
FD_ZERO(&fdset);
Modified: brlcad/trunk/src/libbu/fopen_uniq.c
===================================================================
--- brlcad/trunk/src/libbu/fopen_uniq.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/libbu/fopen_uniq.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -86,12 +86,10 @@
snprintf(filename, MAXPATHLEN, namefmt, n);
if ((fd = open(filename, O_RDWR|O_CREAT|O_EXCL, 0600)) < 0) {
- fprintf(stderr, "Cannot open %s, %s\n", filename, strerror(errno));
- exit(-1);
+ bu_exit(-1, "Cannot open %s, %s\n", filename, strerror(errno));
}
if ( (fp=fdopen(fd, "w")) == (FILE *)NULL) {
- fprintf(stderr, "%s", strerror(errno));
- exit(-1);
+ bu_exit(-1, "%s", strerror(errno));
}
if (outfmt)
Modified: brlcad/trunk/src/libbu/htester.c
===================================================================
--- brlcad/trunk/src/libbu/htester.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/libbu/htester.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -89,8 +89,7 @@
#define A argv[1][1]
if( argc != 2 || argv[1][0] != '-' || ( A != 'o' && A != 'i' && A != 'v' )) {
- fprintf(stderr,"Usage: htester [-i|-o|-v] < input\n");
- exit(1);
+ bu_exit(1, "Usage: htester [-i|-o|-v] < input\n");
}
if( argv[1][1] == 'v' ) {
Modified: brlcad/trunk/src/libbu/image.c
===================================================================
--- brlcad/trunk/src/libbu/image.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/libbu/image.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -111,9 +111,8 @@
fh = fdopen(fd,"wb");
if(fh==NULL) {
- perror("png_save trying to get FILE pointer for descriptor");
- exit(-1);
- return 0;
+ perror("fdopen");
+ bu_exit(-1, "png_save trying to get FILE pointer for descriptor\n");
}
png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ -121,10 +120,8 @@
info_ptr = png_create_info_struct (png_ptr);
if(info_ptr == NULL || setjmp (png_jmpbuf (png_ptr))) {
- printf("Ohs Noes!\n"); fflush(stdout);
png_destroy_read_struct (&png_ptr, info_ptr ? &info_ptr : NULL, NULL);
- exit(-1);
- return 0;
+ bu_exit(-1, "Ohs Noes!\n");
}
png_init_io (png_ptr, fh);
@@ -157,8 +154,7 @@
{
int bwsize = size/3, i;
if(bwsize*3 != size) {
- printf("Huh, size=%d is not a multiple of 3.\n", size);
- exit(-1); /* flaming death */
+ bu_exit(-1, "Huh, size=%d is not a multiple of 3.\n", size);
}
/* an ugly na\xEFve pixel grey-scale hack. Does not take human color curves. */
for(i=0;i<bwsize;++i) rgb[i] = (int)((float)rgb[i*3]+(float)rgb[i*3+1]+(float)rgb[i*3+2]/3.0);
@@ -209,11 +205,10 @@
bif->fd = open(bif->filename,O_WRONLY|O_CREAT|O_TRUNC, WRMODE);
if(bif->fd < 0) {
char buf[BUFSIZ];
- snprintf(buf,BUFSIZ,"Opening output file \"%s\" for writing",bif->filename);
- perror(buf);
+ perror("open");
free(bif);
- exit(-1);
- return NULL;
+ snprintf(buf,BUFSIZ,"ERROR opening output file \"%s\" for writing\n",bif->filename);
+ bu_exit(-1, buf);
}
bif->width = width;
bif->height = height;
Modified: brlcad/trunk/src/libbu/rb_internals.h
===================================================================
--- brlcad/trunk/src/libbu/rb_internals.h 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/libbu/rb_internals.h 2008-01-13 23:39:10 UTC (rev 29896)
@@ -63,10 +63,9 @@
#define BU_RB_CKORDER(t, o) \
if (((o) < 0) || ((o) >= (t) -> rbt_nm_orders)) \
{ \
- bu_log( \
+ bu_exit(0, \
"Error: Order %d outside 0..%d (nm_orders-1), file %s, line %d\n", \
(o), (t) -> rbt_nm_orders - 1, __FILE__, __LINE__); \
- exit (0); \
}
/*
Modified: brlcad/trunk/src/libbu/semaphore.c
===================================================================
--- brlcad/trunk/src/libbu/semaphore.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/libbu/semaphore.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -266,7 +266,7 @@
if( !bu_semaphores ) {
fprintf(stderr, "bu_semaphore_init(): could not allocate space for %d semaphores of len %ld\n",
nsemaphores, (long)sizeof(struct bu_semaphores));
- exit(2);
+ exit(2); /* cannot call bu_exit() here */
}
/*
@@ -446,7 +446,7 @@
if( i >= bu_nsemaphores ) {
fprintf(stderr, "bu_semaphore_release(%d): semaphore # exceeds max of %d\n",
i, bu_nsemaphores - 1);
- exit(3);
+ exit(3); /* cannot call bu_exit() here */
}
BU_CKMAG(&bu_semaphores[i], BU_SEMAPHORE_MAGIC, "bu_semaphore");
Modified: brlcad/trunk/src/libfb/if_ug.c
===================================================================
--- brlcad/trunk/src/libfb/if_ug.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/libfb/if_ug.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -229,8 +229,7 @@
/* Now, close down */
if ( ( status = ugraf ( UG_CLOSE, &ug_param ) ) != UGE_OK ) {
perror ( "ugraf close" );
- fprintf(stderr, "ugraf close failed with %d\n", status );
- exit ( 1 );
+ bu_exit(1, "ugraf close failed with %d\n", status );
}
return;
}
@@ -298,9 +297,8 @@
#ifndef never
if ( ( status = ugraf ( UG_WAIT, &ug_param ) ) != UGE_OK ) {
- fprintf(stderr,"ugraf wait failed with %d at %s\n", status, str );
perror ( "ugraf wait" );
- exit ( 1 );
+ bu_exit(1, "ugraf wait failed with %d at %s\n", status, str );
}
#endif
}
Modified: brlcad/trunk/src/librt/g_ebm.c
===================================================================
--- brlcad/trunk/src/librt/g_ebm.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/librt/g_ebm.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -1650,8 +1650,7 @@
strcpy( rec.ss.ss_args, "file=bm.bw w=6 n=6 d=6.0" );
if( rt_ebm_prep( &Tsolid, &rec, 0 ) != 0 ) {
- printf("prep failed\n");
- exit(1);
+ bu_exit(1, "prep failed\n");
}
rt_ebm_print( &Tsolid );
ebmp = bmsp = (struct rt_ebm_specific *)Tsolid.st_specific;
@@ -1661,7 +1660,7 @@
#if 1
if( (fp = fopen("ebm.rays", "r")) == NULL ) {
perror("ebm.rays");
- exit(1);
+ bu_exit(1, "ERROR: unable to open ebm.rays\n");
}
for(;;) {
x = fscanf( fp, "%lf %lf %lf %lf %lf %lf\n",
Modified: brlcad/trunk/src/librt/prep.c
===================================================================
--- brlcad/trunk/src/librt/prep.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/librt/prep.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -245,13 +245,11 @@
rtip->rti_dbip->dbi_filename,
rtip->rti_dbip->dbi_uses,
rtip->rti_air_discards );
- bu_log("rt_prep_parallel: no primitives left to prep\n");
- exit(1);
+ bu_exit(1, "rt_prep_parallel: no primitives left to prep\n");
}
if ( rtip->nregions <= 0 ) {
- bu_log("rt_prep_parallel: no regions left to prep\n");
- exit(1);
+ bu_exit(1, "rt_prep_parallel: no regions left to prep\n");
}
/* In case everything is a halfspace, set a minimum space */
@@ -670,11 +668,10 @@
struct resource *ores = (struct resource *)
BU_PTBL_GET(&rtip->rti_resources, cpu_num);
if( ores != NULL && ores != resp ) {
- bu_log("rt_init_resource(cpu=%d) re-registering resource, had x%x, new=x%x\n",
+ bu_exit(1, "rt_init_resource(cpu=%d) re-registering resource, had x%x, new=x%x\n",
cpu_num,
ores,
resp );
- exit(1);
}
BU_PTBL_SET(&rtip->rti_resources, cpu_num, resp);
}
@@ -1256,8 +1253,7 @@
case OP_DB_LEAF:
dp = db_lookup( dbip, tp->tr_l.tl_name, 1 );
if( dp == DIR_NULL ) {
- bu_log( "Unable to lookup geometry [%s]\nAborting.", tp->tr_l.tl_name );
- exit(1);
+ bu_exit(1, "Unable to lookup geometry [%s]\nAborting.\n", tp->tr_l.tl_name );
}
db_add_node_to_full_path( *curr_path, dp );
if( dp == end ) {
@@ -1269,8 +1265,7 @@
(*curr_path) = newpath;
} else if( (dp->d_flags & DIR_COMB) && !(dp->d_flags & DIR_REGION ) ) {
if( rt_db_get_internal( &intern, dp, dbip, NULL, resp ) < 0 ) {
- bu_log( "Unable to load [%s]\nAborting.\n", tp->tr_l.tl_name );
- exit(1);
+ bu_exit(1, "Unable to load [%s]\nAborting.\n", tp->tr_l.tl_name );
}
comb = (struct rt_comb_internal *)intern.idb_ptr;
rt_find_path( dbip, comb->tree, end, paths, curr_path, resp );
@@ -1291,8 +1286,7 @@
rt_find_path( dbip, tp->tr_b.tb_left, end, paths, curr_path, resp );
break;
default:
- bu_log( "rt_find_path(): Unrecognized OP (%d)\n", tp->tr_op );
- exit(1);
+ bu_exit(1, "rt_find_path(): Unrecognized OP (%d)\n", tp->tr_op );
break;
}
}
@@ -1485,8 +1479,7 @@
}
}
- bu_log( "rt_unprep(): Failed to find soltab structure for an instance of [%s]\n", dp->d_namep );
- exit(1);
+ bu_exit(1, "rt_unprep(): Failed to find soltab structure for an instance of [%s]\n", dp->d_namep );
return( (union tree *)NULL );
}
@@ -1742,9 +1735,7 @@
point_t region_min, region_max;
if( rt_bound_tree( rp->reg_treetop, region_min, region_max ) ) {
- bu_log( "rt_reprep(): rt_bound_tree() FAILED for [%s]\n",
- rp->reg_name );
- exit(1);
+ bu_exit(1, "rt_reprep(): rt_bound_tree() FAILED for [%s]\n", rp->reg_name );
}
if( region_max[X] < INFINITY ) {
/* infinite regions are exempted from this */
Modified: brlcad/trunk/src/sig/Makefile.am
===================================================================
--- brlcad/trunk/src/sig/Makefile.am 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/Makefile.am 2008-01-13 23:39:10 UTC (rev 29896)
@@ -45,23 +45,45 @@
d_a_SOURCES = d-a.c
d_a_LDADD = ${BU}
-i_d_SOURCES = i-d.c
+bw_d_SOURCES = bw-d.c
+bw_d_LDADD = ${BU}
+
+c_d_SOURCES = c-d.c
+c_d_LDADD = ${BU} ${LIBM}
+
d_i_SOURCES = d-i.c
+d_i_LDADD = ${BU}
+
d_u_SOURCES = d-u.c
-bw_d_SOURCES = bw-d.c
+d_u_LDADD = ${BU}
+
d_bw_SOURCES = d-bw.c
+d_bw_LDADD = ${BU}
+
d_f_SOURCES = d-f.c
+d_f_LDADD = ${BU}
+
f_d_SOURCES = f-d.c
+f_d_LDADD = ${BU}
+
f_i_SOURCES = f-i.c
+f_i_LDADD = ${BU}
+
+i_d_SOURCES = i-d.c
+i_d_LDADD = ${BU}
+
i_f_SOURCES = i-f.c
+i_f_LDADD = ${BU}
-c_d_SOURCES = c-d.c
-c_d_LDADD = ${BU} ${LIBM}
-
i_a_SOURCES = i-a.c
u_a_SOURCES = u-a.c
+
u_d_SOURCES = u-d.c
+u_d_LDADD = ${BU}
+
u_f_SOURCES = u-f.c
+u_f_LDADD = ${BU}
+
u_bw_SOURCES = u-bw.c
# Processors
@@ -97,7 +119,7 @@
# Misc
dstat_SOURCES = dstat.c
-dstat_LDADD = ${LIBM}
+dstat_LDADD = ${BU} ${LIBM}
dsel_SOURCES = dsel.c
dsel_LDADD = ${BU}
Modified: brlcad/trunk/src/sig/a-d.c
===================================================================
--- brlcad/trunk/src/sig/a-d.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/a-d.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -37,8 +37,6 @@
#define COMMENT_CHAR '#'
-static const char usage[] = "\
-Usage: a-d [values] < ascii > doubles\n";
int main(int argc, char **argv)
{
@@ -46,7 +44,7 @@
int i;
if( isatty(fileno(stdout)) ) {
- bu_exit(1, "%s", usage );
+ bu_exit(1, "Usage: a-d [values] < ascii > doubles\n");
}
if( argc > 1 ) {
@@ -84,8 +82,7 @@
else if (feof(stdin))
exit (0);
else {
- bu_log("Error in input stream\n");
- exit (1);
+ bu_exit(1, "Error in input stream\n");
}
}
}
Modified: brlcad/trunk/src/sig/bw-d.c
===================================================================
--- brlcad/trunk/src/sig/bw-d.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/bw-d.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -39,12 +39,11 @@
#endif
#include "machine.h"
+#include "bu.h"
unsigned char ibuf[512];
double obuf[512];
-static char usage[] = "\
-Usage: bw-d [-n || scale] < unsigned_chars > doubles\n";
int main(int argc, char **argv)
{
@@ -62,8 +61,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit(1, "Usage: bw-d [-n || scale] < unsigned_chars > doubles\n");
}
while( (num = fread( &ibuf[0], sizeof( ibuf[0] ), 512, stdin)) > 0 ) {
Modified: brlcad/trunk/src/sig/d-bw.c
===================================================================
--- brlcad/trunk/src/sig/d-bw.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/d-bw.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -38,12 +38,11 @@
#endif
#include "machine.h"
+#include "bu.h"
double ibuf[512];
unsigned char obuf[512];
-static char usage[] = "\
-Usage: d-bw [-n || scale] < doubles > unsigned_chars\n";
int main(int argc, char **argv)
{
@@ -63,8 +62,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit(1, "Usage: d-bw [-n || scale] < doubles > unsigned_chars\n" );
}
clip_high = clip_low = 0;
Modified: brlcad/trunk/src/sig/d-f.c
===================================================================
--- brlcad/trunk/src/sig/d-f.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/d-f.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -40,12 +40,11 @@
#endif
#include "machine.h"
+#include "bu.h"
double ibuf[512] = { 0.0 };
float obuf[512] = { 0.0f};
-static char usage[] = "\
-Usage: d-f [-n || scale] < doubles > floats\n";
int main(int argc, char **argv)
{
@@ -63,8 +62,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit(1, "Usage: d-f [-n || scale] < doubles > floats\n");
}
while( (num = fread( &ibuf[0], sizeof( ibuf[0] ), 512, stdin)) > 0 ) {
Modified: brlcad/trunk/src/sig/d-i.c
===================================================================
--- brlcad/trunk/src/sig/d-i.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/d-i.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -40,12 +40,11 @@
#endif
#include "machine.h"
+#include "bu.h"
double ibuf[512];
short obuf[512];
-static char usage[] = "\
-Usage: d-i [-n || scale] < doubles > shorts\n";
int main(int argc, char **argv)
{
@@ -65,8 +64,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit(1, "Usage: d-i [-n || scale] < doubles > shorts\n");
}
clip_high = clip_low = 0;
Modified: brlcad/trunk/src/sig/d-u.c
===================================================================
--- brlcad/trunk/src/sig/d-u.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/d-u.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -40,12 +40,11 @@
#endif
#include "machine.h"
+#include "bu.h"
double ibuf[512];
unsigned short obuf[512];
-static char usage[] = "\
-Usage: d-i [-n || scale] < doubles > unsigned_shorts\n";
int main(int argc, char **argv)
{
@@ -65,8 +64,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit(1, "Usage: d-i [-n || scale] < doubles > unsigned_shorts\n");
}
clip_high = clip_low = 0;
Modified: brlcad/trunk/src/sig/d2-c.c
===================================================================
--- brlcad/trunk/src/sig/d2-c.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/d2-c.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -24,9 +24,6 @@
* Author -
* Phillip Dykstra
*/
-#ifndef lint
-static char RCSid[] = "@(#)$Header$ (BRL)";
-#endif
#include "common.h"
@@ -34,14 +31,13 @@
#include <stdio.h>
#include "machine.h"
+#include "bu.h"
double obuf[2*1024];
double real[1024], imag[1024];
void open_file(FILE **fp, char *name);
-static char usage[] = "\
-Usage: d2-c real_file imag_file > complex (- stdin, . skip)\n";
int main(int argc, char **argv)
{
@@ -51,8 +47,7 @@
FILE *rfp, *ifp;
if( argc != 3 || isatty(fileno(stdout)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit( 1, "Usage: d2-c real_file imag_file > complex (- stdin, . skip)\n" );
}
open_file( &rfp, argv[1] );
@@ -94,8 +89,7 @@
}
if( (*fp = fopen( name, "r" )) == NULL ) {
- fprintf( stderr, "d2-c: Can't open \"%s\"\n", name );
- exit( 2 );
+ bu_exit(2, "d2-c: Can't open \"%s\"\n", name );
}
}
Modified: brlcad/trunk/src/sig/dconv.c
===================================================================
--- brlcad/trunk/src/sig/dconv.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/dconv.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -38,6 +38,7 @@
#include <math.h>
#include "machine.h"
+#include "bu.h"
#define MAXM 4096
@@ -50,12 +51,31 @@
double xbuf[2*MAXM];
double ibuf[2*MAXM]; /* impulse response */
-void mult(double *o, double *b, int n);
-static const char usage[] = "\
-Usage: dconv filter < doubles > doubles\n\
- XXX Warning: kernal size must be 2^i - 1\n";
+/*
+ * Multiply two "real valued" spectra of length n
+ * and put the result in the first.
+ * The order is: [Re(0),Re(1)...Re(N/2),Im(N/2-1),...,Im(1)]
+ * so for: 0 < i < n/2, (x[i],x[n-i]) is a complex pair.
+ */
+void
+mult(double *o, double *b, int n)
+{
+ int i;
+ double r;
+ /* do DC and Nyquist components */
+ o[0] *= b[0];
+ o[n/2] *= b[n/2];
+
+ for( i = 1; i < n/2; i++ ) {
+ r = o[i] * b[i] - o[n-i] * b[n-i];
+ o[n-i] = o[i] * b[n-i] + o[n-i] * b[i];
+ o[i] = r;
+ }
+}
+
+
int main(int argc, char **argv)
{
int i;
@@ -67,7 +87,7 @@
L = N - M + 1; /* number of "good" points per section */
if( argc != 2 || isatty(fileno(stdin)) || isatty(fileno(stdout)) ) {
- bu_exit(1, "%s", usage );
+ bu_exit(1, "Usage: dconv filter < doubles > doubles\nXXX Warning: kernal size must be 2^i - 1\n" );
}
#ifdef never
@@ -84,17 +104,14 @@
#endif /* never */
if( (fp = fopen( argv[1], "r" )) == NULL ) {
- fprintf( stderr, "dconv: can't open \"%s\"\n", argv[1] );
- exit( 2 );
+ bu_exit(2, "dconv: can't open \"%s\"\n", argv[1] );
}
if( (M = fread( ibuf, sizeof(*ibuf), 2*MAXM, fp )) == 0 ) {
- fprintf( stderr, "dconv: problem reading filter file\n" );
- exit( 3 );
+ bu_exit(3, "dconv: problem reading filter file\n" );
}
fclose( fp );
if( M > MAXM ) {
- fprintf( stderr, "dconv: only compiled for up to %d sized filter kernels\n", MAXM );
- exit( 4 );
+ bu_exit(4, "dconv: only compiled for up to %d sized filter kernels\n", MAXM );
}
/*XXX HACK HACK HACK HACK XXX*/
/* Assume M = 2^i - 1 */
@@ -137,29 +154,6 @@
}
/*
- * Multiply two "real valued" spectra of length n
- * and put the result in the first.
- * The order is: [Re(0),Re(1)...Re(N/2),Im(N/2-1),...,Im(1)]
- * so for: 0 < i < n/2, (x[i],x[n-i]) is a complex pair.
- */
-void
-mult(double *o, double *b, int n)
-{
- int i;
- double r;
-
- /* do DC and Nyquist components */
- o[0] *= b[0];
- o[n/2] *= b[n/2];
-
- for( i = 1; i < n/2; i++ ) {
- r = o[i] * b[i] - o[n-i] * b[n-i];
- o[n-i] = o[i] * b[n-i] + o[n-i] * b[i];
- o[i] = r;
- }
-}
-
-/*
* Local Variables:
* mode: C
* tab-width: 8
Modified: brlcad/trunk/src/sig/ddisp.c
===================================================================
--- brlcad/trunk/src/sig/ddisp.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/ddisp.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -78,7 +78,7 @@
bu_exit(1, "%s", usage );
}
if( (fbp = fb_open( NULL, fbsize, fbsize )) == FBIO_NULL ) {
- exit( 2 );
+ bu_exit(2, "Unable to open framebuffer\n");
}
L = (argc > 1) ? atoi(argv[1]) : 512;
Modified: brlcad/trunk/src/sig/dfft.c
===================================================================
--- brlcad/trunk/src/sig/dfft.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/dfft.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -33,6 +33,7 @@
#include <math.h>
#include "machine.h"
+#include "bu.h"
#define MAXFFT 4096
#define MAXOUT 2048 /* MAXFFT/2 XXX (Actually + 1) */
@@ -91,8 +92,7 @@
}
if( L > MAXFFT ) {
- fprintf( stderr, "dfft: can't go over %d\n", MAXFFT );
- exit( 2 );
+ bu_exit(2, "dfft: can't go over %d\n", MAXFFT );
}
/* Calculate Critical Band filter weights */
Modified: brlcad/trunk/src/sig/dmod.c
===================================================================
--- brlcad/trunk/src/sig/dmod.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/dmod.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -46,8 +46,6 @@
char *file_name = NULL;
FILE *infp = NULL;
-static char usage[] = "\
-Usage: dmod {-a add -s sub -m mult -d div -A(abs) -e exp -r root} [doubles]\n";
#define ADD 1
#define MULT 2
@@ -85,8 +83,7 @@
op[ numop ] = MULT;
d = atof(bu_optarg);
if( d == 0.0 ) {
- fprintf( stderr, "dmod: divide by zero!\n" );
- exit( 2 );
+ bu_exit(2, "dmod: divide by zero!\n" );
}
val[ numop++ ] = 1.0 / d;
break;
@@ -102,8 +99,7 @@
op[ numop ] = POW;
d = atof(bu_optarg);
if( d == 0.0 ) {
- fprintf( stderr, "dmod: zero root!\n" );
- exit( 2 );
+ bu_exit(2, "dmod: zero root!\n" );
}
val[ numop++ ] = 1.0 / d;
break;
@@ -147,8 +143,7 @@
if( !get_args( argc, argv ) || isatty(fileno(infp))
|| isatty(fileno(stdout)) ) {
- (void)fputs(usage, stderr);
- exit( 1 );
+ bu_exit(1, "Usage: dmod {-a add -s sub -m mult -d div -A(abs) -e exp -r root} [doubles]\n");
}
while( (n = fread(buf, sizeof(*buf), BUFLEN, infp)) > 0 ) {
Modified: brlcad/trunk/src/sig/dsel.c
===================================================================
--- brlcad/trunk/src/sig/dsel.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/dsel.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -25,24 +25,49 @@
#include <stdio.h>
#include <math.h>
+#include "machine.h"
+#include "bu.h"
+
+#define INTEGER_MAX ( ((int) ~0) >> 1 )
+
+
double buf[4096] = {0};
-static const char usage[] = "\
-Usage: dsel num\n\
- dsel skip keep ...\n";
-#define INTEGER_MAX ( ((int) ~0) >> 1 )
+void
+skip(register int num)
+{
+ register int n, m;
-void skip(register int num);
-void keep(register int num);
+ while( num > 0 ) {
+ n = num > 1024 ? 1024 : num;
+ if( (m = fread( buf, sizeof(*buf), n, stdin )) == 0 )
+ exit( 0 );
+ num -= m;
+ }
+}
+void
+keep(register int num)
+{
+ register int n, m;
+
+ while( num > 0 ) {
+ n = num > 1024 ? 1024 : num;
+ if( (m = fread( buf, sizeof(*buf), n, stdin )) == 0 )
+ exit( 0 );
+ fwrite( buf, sizeof(*buf), m, stdout );
+ num -= n;
+ }
+}
+
int main(int argc, char **argv)
{
int nskip; /* number to skip */
int nkeep; /* number to keep */
if( argc < 1 || isatty(fileno(stdin)) || isatty(fileno(stdout)) ) {
- bu_exit(1, "%s", usage );
+ bu_exit(1, "Usage: dsel num\n dsel skip keep ...\n");
}
if( argc == 2 ) {
@@ -72,33 +97,7 @@
return 0;
}
-void
-skip(register int num)
-{
- register int n, m;
- while( num > 0 ) {
- n = num > 1024 ? 1024 : num;
- if( (m = fread( buf, sizeof(*buf), n, stdin )) == 0 )
- exit( 0 );
- num -= m;
- }
-}
-
-void
-keep(register int num)
-{
- register int n, m;
-
- while( num > 0 ) {
- n = num > 1024 ? 1024 : num;
- if( (m = fread( buf, sizeof(*buf), n, stdin )) == 0 )
- exit( 0 );
- fwrite( buf, sizeof(*buf), m, stdout );
- num -= n;
- }
-}
-
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/sig/dstat.c
===================================================================
--- brlcad/trunk/src/sig/dstat.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/dstat.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -35,6 +35,8 @@
#include <stdio.h>
#include <math.h>
+#include "machine.h"
+#include "bu.h"
#define IBUFSIZE 1024 /* Max read size */
double buf[IBUFSIZE]; /* Input buffer */
@@ -42,9 +44,6 @@
int verbose = 0;
-static char usage[] = "\
-Usage: dstat [-v] [file.doubles]\n";
-
int main(int argc, char **argv)
{
int i, n;
@@ -65,8 +64,7 @@
/* look for optional input file */
if( argc > 1 ) {
if( (fp = fopen(argv[1],"r")) == 0 ) {
- fprintf( stderr, "dstat: can't open \"%s\"\n", argv[1] );
- exit( 1 );
+ bu_exit(1, "dstat: can't open \"%s\"\n", argv[1] );
}
argv++;
argc--;
@@ -75,8 +73,7 @@
/* check usage */
if( argc > 1 || isatty(fileno(fp)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit(1, "Usage: dstat [-v] [file.doubles]\n");
}
/*
Modified: brlcad/trunk/src/sig/f-d.c
===================================================================
--- brlcad/trunk/src/sig/f-d.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/f-d.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -41,12 +41,11 @@
#endif
#include "machine.h"
+#include "bu.h"
float ibuf[512];
double obuf[512];
-static char usage[] = "\
-Usage: f-d [-n || scale] < floats > doubles\n";
int main(int argc, char **argv)
{
@@ -64,8 +63,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) || isatty(fileno(stdout)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit(1, "Usage: f-d [-n || scale] < floats > doubles\n");
}
while( (num = fread( &ibuf[0], sizeof( ibuf[0] ), 512, stdin)) > 0 ) {
Modified: brlcad/trunk/src/sig/f-i.c
===================================================================
--- brlcad/trunk/src/sig/f-i.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/f-i.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -40,13 +40,11 @@
#endif
#include "machine.h"
+#include "bu.h"
-
float ibuf[512];
short obuf[512];
-static char usage[] = "\
-Usage: f-i [-n || scale] < floats > shorts\n";
int main(int argc, char **argv)
{
@@ -66,8 +64,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit( 1, "Usage: f-i [-n || scale] < floats > shorts\n" );
}
clip_high = clip_low = 0;
Modified: brlcad/trunk/src/sig/i-d.c
===================================================================
--- brlcad/trunk/src/sig/i-d.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/i-d.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -39,12 +39,11 @@
#endif
#include "machine.h"
+#include "bu.h"
short ibuf[512];
double obuf[512];
-static char usage[] = "\
-Usage: i-d [-n || scale] < shorts > doubles\n";
int main(int argc, char **argv)
{
@@ -62,8 +61,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit( 1, "Usage: i-d [-n || scale] < shorts > doubles\n");
}
while( (num = fread( &ibuf[0], sizeof( ibuf[0] ), 512, stdin)) > 0 ) {
Modified: brlcad/trunk/src/sig/i-f.c
===================================================================
--- brlcad/trunk/src/sig/i-f.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/i-f.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -39,13 +39,11 @@
#endif
#include "machine.h"
+#include "bu.h"
-
short ibuf[512];
float obuf[512];
-static char usage[] = "\
-Usage: i-f [-n || scale] < shorts > floats\n";
int main(int argc, char **argv)
{
@@ -63,8 +61,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit( 1, "Usage: i-f [-n || scale] < shorts > floats\n" );
}
while( (num = fread( &ibuf[0], sizeof( ibuf[0] ), 512, stdin)) > 0 ) {
Modified: brlcad/trunk/src/sig/imod.c
===================================================================
--- brlcad/trunk/src/sig/imod.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/imod.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -52,8 +52,6 @@
char *progname = "(noname)";
char *file_name = NULL;
-char usage[] = "\
-Usage: imod {-a add -s sub -m mult -d div -A(abs) -e exp -r root} [file.s]\n";
#define ADD 1
#define MULT 2
@@ -91,8 +89,7 @@
op[ numop ] = MULT;
d = atof(bu_optarg);
if( d == 0.0 ) {
- (void)fprintf( stderr, "bwmod: divide by zero!\n" );
- exit( 2 );
+ bu_exit(2, "bwmod: divide by zero!\n" );
}
val[ numop++ ] = 1.0 / d;
break;
@@ -108,8 +105,7 @@
op[ numop ] = POW;
d = atof(bu_optarg);
if( d == 0.0 ) {
- (void)fprintf( stderr, "bwmod: zero root!\n" );
- exit( 2 );
+ bu_exit(2, "bwmod: zero root!\n" );
}
val[ numop++ ] = 1.0 / d;
break;
@@ -179,10 +175,8 @@
if (!(progname=strrchr(*argv, '/')))
progname = *argv;
- if( !get_args( argc, argv ) || isatty(fileno(stdin))
- || isatty(fileno(stdout)) ) {
- (void)fputs(usage, stderr);
- exit( 1 );
+ if( !get_args( argc, argv ) || isatty(fileno(stdin)) || isatty(fileno(stdout)) ) {
+ bu_exit( 1, "Usage: imod {-a add -s sub -m mult -d div -A(abs) -e exp -r root} [file.s]\n" );
}
mk_trans_tbl();
@@ -199,9 +193,7 @@
}
/* output */
if (fwrite(iobuf, sizeof(*iobuf), n, stdout) != n) {
- (void)fprintf(stderr, "%s: Error writing stdout\n",
- progname);
- exit(-1);
+ bu_exit(-1, "%s: Error writing stdout\n", progname);
}
}
Modified: brlcad/trunk/src/sig/istat.c
===================================================================
--- brlcad/trunk/src/sig/istat.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/istat.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -39,22 +39,18 @@
#include "bu.h"
-char *options = "h";
-char *progname = "(noname)";
-
/*
* U S A G E --- tell user how to invoke this program, then exit
*/
-void usage(void)
+void usage(const char *progname)
{
- (void) fprintf(stderr, "Usage: %s [ file ]\n", progname);
- exit(1);
+ bu_exit(1, "Usage: %s [ file ]\n", progname);
}
/*
* P A R S E _ A R G S --- Parse through command line flags
*/
-int parse_args(int ac, char **av)
+int parse_args(int ac, char **av, char *progname)
{
int c;
@@ -65,11 +61,11 @@
bu_opterr = 0;
/* get all the option flags from the command line */
- while ((c=bu_getopt(ac,av,options)) != EOF)
+ while ((c=bu_getopt(ac,av,"h")) != EOF)
switch (c) {
case '?' :
case 'h' :
- default : usage(); break;
+ default : usage(progname); break;
}
return(bu_optind);
@@ -117,11 +113,12 @@
*/
int main(int ac, char **av)
{
- int arg_index;
+ char *progname = "(noname)";
+ int arg_index;
/* parse command flags
*/
- arg_index = parse_args(ac, av);
+ arg_index = parse_args(ac, av, progname);
if (arg_index < ac) {
/* open file of shorts */
if (freopen(av[arg_index], "r", stdin) == (FILE *)NULL) {
@@ -129,7 +126,7 @@
return(-1);
}
} else if (isatty((int)fileno(stdin))) {
- usage();
+ usage(progname);
}
comp_stats(stdin);
Modified: brlcad/trunk/src/sig/smod.c
===================================================================
--- brlcad/trunk/src/sig/smod.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/smod.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -30,27 +30,25 @@
* 25 October 1990
*
*/
-#ifndef lint
-static char RCSid[] = "@(#)$Header$ (BRL)";
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-char *progname = "(noname)";
+#include "machine.h"
+#include "bu.h"
-char *file_name;
-char usage[] = "\
-Usage: smod {-a add -s sub -m mult -d div -A(abs) -e exp -r root} [file.s]\n";
-
#define ADD 1
#define MULT 2
#define ABS 3
#define POW 4
#define BUFLEN (8192*2) /* usually 2 pages of memory, 16KB */
+
+char *progname = "(noname)";
+char *file_name;
+
int numop = 0; /* number of operations */
int op[256]; /* operations */
double val[256]; /* arguments to operations */
@@ -60,8 +58,7 @@
unsigned char clip_l[256]; /* map of values which clip low */
-get_args( argc, argv )
-register char **argv;
+int get_args( int argc, char **argv )
{
register int c;
double d;
@@ -84,8 +81,7 @@
op[ numop ] = MULT;
d = atof(bu_optarg);
if( d == 0.0 ) {
- (void)fprintf( stderr, "bwmod: divide by zero!\n" );
- exit( 2 );
+ bu_exit(2, "bwmod: divide by zero!\n" );
}
val[ numop++ ] = 1.0 / d;
break;
@@ -101,8 +97,7 @@
op[ numop ] = POW;
d = atof(bu_optarg);
if( d == 0.0 ) {
- (void)fprintf( stderr, "bwmod: zero root!\n" );
- exit( 2 );
+ bu_exit(2, "bwmod: zero root!\n" );
}
val[ numop++ ] = 1.0 / d;
break;
@@ -167,9 +162,7 @@
}
}
-int main( argc, argv )
-int argc;
-char **argv;
+int main( int argc, char **argv )
{
register unsigned int i, j, n;
unsigned long clip_high, clip_low;
@@ -178,10 +171,8 @@
if (!(progname=strrchr(*argv, '/')))
progname = *argv;
- if( !get_args( argc, argv ) || isatty(fileno(stdin))
- || isatty(fileno(stdout)) ) {
- (void)fputs(usage, stderr);
- exit( 1 );
+ if( !get_args( argc, argv ) || isatty(fileno(stdin)) || isatty(fileno(stdout)) ) {
+ bu_exit( 1, "Usage: smod {-a add -s sub -m mult -d div -A(abs) -e exp -r root} [file.s]\n" );
}
mk_trans_tbl();
@@ -197,9 +188,7 @@
}
/* output */
if (fwrite(iobuf, sizeof(*iobuf), n, stdout) != n) {
- (void)fprintf(stderr, "%s: Error writing stdout\n",
- progname);
- exit(-1);
+ bu_exit(-1, "%s: Error writing stdout\n", progname);
}
}
Modified: brlcad/trunk/src/sig/u-d.c
===================================================================
--- brlcad/trunk/src/sig/u-d.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/u-d.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -39,13 +39,12 @@
#endif
#include "machine.h"
+#include "bu.h"
unsigned short ibuf[512];
double obuf[512];
-static char usage[] = "\
-Usage: u-d [-n || scale] < shorts > doubles\n";
int main(int argc, char **argv)
{
@@ -63,8 +62,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit( 1, "Usage: u-d [-n || scale] < shorts > doubles\n" );
}
while( (num = fread( &ibuf[0], sizeof( ibuf[0] ), 512, stdin)) > 0 ) {
Modified: brlcad/trunk/src/sig/u-f.c
===================================================================
--- brlcad/trunk/src/sig/u-f.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/u-f.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -40,13 +40,12 @@
#endif
#include "machine.h"
+#include "bu.h"
unsigned short ibuf[512];
float obuf[512];
-static char usage[] = "\
-Usage: i-f [-n || scale] < shorts > floats\n";
int main(int argc, char **argv)
{
@@ -64,8 +63,7 @@
}
if( argc > 1 || scale == 0 || isatty(fileno(stdin)) ) {
- fputs( usage, stderr );
- exit( 1 );
+ bu_exit( 1, "Usage: i-f [-n || scale] < shorts > floats\n" );
}
while( (num = fread( &ibuf[0], sizeof( ibuf[0] ), 512, stdin)) > 0 ) {
Modified: brlcad/trunk/src/sig/umod.c
===================================================================
--- brlcad/trunk/src/sig/umod.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/umod.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -53,8 +53,6 @@
char *progname = "umod";
char *file_name = NULL;
-char usage[] = "\
-Usage: smod {-a add -s sub -m mult -d div -A(abs) -e exp -r root} [file.s]\n";
#define ADD 1
#define MULT 2
@@ -92,8 +90,7 @@
op[ numop ] = MULT;
d = atof(bu_optarg);
if( d == 0.0 ) {
- (void)fprintf( stderr, "bwmod: divide by zero!\n" );
- exit( 2 );
+ bu_exit(2, "bwmod: divide by zero!\n" );
}
val[ numop++ ] = 1.0 / d;
break;
@@ -109,8 +106,7 @@
op[ numop ] = POW;
d = atof(bu_optarg);
if( d == 0.0 ) {
- (void)fprintf( stderr, "bwmod: zero root!\n" );
- exit( 2 );
+ bu_exit(2, "bwmod: zero root!\n" );
}
val[ numop++ ] = 1.0 / d;
break;
@@ -177,10 +173,8 @@
if (!(progname=strrchr(*argv, '/')))
progname = *argv;
- if( !get_args( argc, argv ) || isatty(fileno(stdin))
- || isatty(fileno(stdout)) ) {
- (void)fputs(usage, stderr);
- exit( 1 );
+ if( !get_args( argc, argv ) || isatty(fileno(stdin)) || isatty(fileno(stdout)) ) {
+ bu_exit( 1, "Usage: smod {-a add -s sub -m mult -d div -A(abs) -e exp -r root} [file.s]\n" );
}
mk_trans_tbl();
@@ -196,9 +190,7 @@
}
/* output */
if (fwrite(iobuf, sizeof(*iobuf), n, stdout) != n) {
- (void)fprintf(stderr, "%s: Error writing stdout\n",
- progname);
- exit(-1);
+ bu_exit(-1, "%s: Error writing stdout\n", progname);
}
}
Modified: brlcad/trunk/src/sig/ustat.c
===================================================================
--- brlcad/trunk/src/sig/ustat.c 2008-01-13 23:26:59 UTC (rev 29895)
+++ brlcad/trunk/src/sig/ustat.c 2008-01-13 23:39:10 UTC (rev 29896)
@@ -46,8 +46,7 @@
*/
void usage(void)
{
- (void) fprintf(stderr, "Usage: %s [ file ]\n", progname);
- exit(1);
+ bu_exit(1, "Usage: %s [ file ]\n", progname);
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|