[brlcad-commits] CVS: brlcad/src/sig Makefile.am, 14.9, 14.10 dfft.c, 14.7, 14.8

[Erik G. <eri...@us...>]

Update of /cvsroot/brlcad/brlcad/src/sig
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6248

Modified Files:
	Makefile.am dfft.c 
Log Message:
coerce dfft to use bu_getopt instead of the big whileifelseifelseif construct

Index: Makefile.am
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/Makefile.am,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- Makefile.am	28 Aug 2007 15:49:10 -0000	14.9
+++ Makefile.am	28 Aug 2007 15:52:20 -0000	14.10
@@ -76,7 +76,7 @@
 dmod_LDADD = ${BU} ${BU_LIBS} ${LIBM}
 
 dfft_SOURCES = dfft.c interp.c butter.c
-dfft_LDADD = ${FFT} ${FFT_LIBS}
+dfft_LDADD = ${FFT} ${FFT_LIBS} ${BU} ${BU_LIBS}
 
 dconv_SOURCES = dconv.c
 dconv_LDADD = ${FFT} ${FFT_LIBS}

Index: dfft.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/sig/dfft.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- dfft.c	23 Jan 2007 01:13:47 -0000	14.7
+++ dfft.c	28 Aug 2007 15:52:20 -0000	14.8
@@ -74,38 +74,29 @@
 
 int main(int argc, char **argv)
 {
-	int	i, n;
-	int	L;
+	int	i, n, c;
+	int	L = 1024;
 
 	if( isatty(fileno(stdin)) || isatty(fileno(stdout)) ) {
 		fprintf( stderr, usage );
 		exit( 1 );
 	}
 
-	while( argc > 1 ) {
-		if( strcmp(argv[1], "-d") == 0 ) {
-			mindB = -atof( argv[2] );
-			argc--;
-			argv++;
-		} else if( strcmp(argv[1], "-c") == 0 ) {
-			cflag++;
-		} else if( strcmp(argv[1], "-l") == 0 ) {
-			lflag++;
-		} else if( strcmp(argv[1], "-p") == 0 ) {
-			phase++;
-		} else if( strcmp(argv[1], "-L") == 0 ) {
-			linear_output++;
-		} else if( strcmp(argv[1], "-A") == 0 ) {
-			ascii_output++;
-		} else if( strcmp(argv[1], "-N") == 0 ) {
-			normalize_output++;
-		} else
-			break;
-		argc--;
-		argv++;
+	while( (c = bu_getopt(argc, argv, "d:clpLANh")) != EOF)
+	    switch(c) {
+	    case 'd': mindB = -atof(optarg); break;
+	    case 'c': cflag++; break;
+	    case 'l': lflag++; break;
+	    case 'p': phase++; break;
+	    case 'L': linear_output++; break;
+	    case 'A': ascii_output++; break;
+	    case 'N': normalize_output++; break;
+	    case 'h': printf(usage); return EXIT_SUCCESS;
+	    case ':': printf("Missing argument to %c\n%s\n", c, usage); return EXIT_FAILURE;
+	    case '?': 
+	    default:  printf("Unknown argument: %c\n%s\n", c, usage); return EXIT_FAILURE;
 	}
 
-	L = (argc > 1) ? atoi(argv[1]) : 1024;
 	if( L > MAXFFT ) {
 		fprintf( stderr, "dfft: can't go over %d\n", MAXFFT );
 		exit( 2 );