From 508df68455f637bde470fc8b18b2c5b341dedfb9 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 17 Jul 2011 16:37:54 +0000
Subject: [PATCH] cleanup, reduce compiler warnings

---
 ChangeLog              | 5 +++++
 src/frontend/com_fft.c | 3 ++-
 src/frontend/inpcom.c  | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8fea4792e..0042d1f90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-17  Robert Larice
+ * src/frontend/com_fft.c ,
+ * src/frontend/inpcom.c :
+   cleanup, reduce compiler warnings
+
 2011-07-17  Robert Larice
  * src/misc/hash.c :
    nghash cleanup, use `%p' to print a pointer value
diff --git a/src/frontend/com_fft.c b/src/frontend/com_fft.c
index b5fad67f8..8f6a82248 100644
--- a/src/frontend/com_fft.c
+++ b/src/frontend/com_fft.c
@@ -286,7 +286,8 @@ com_psd(wordlist *wl)
     
     // get filter length from parameter input
     s = wl->wl_word;
-    if (!(ave = ft_numparse(&s, FALSE)) || (*ave < 1.0)) {
+    ave = ft_numparse(&s, FALSE);
+    if (!ave || (*ave < 1.0)) {
     	fprintf(cp_out, "Number of averaged data points:  %d\n", 1);
         smooth = 1;
     }
diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 38f8c1e48..c085cdabe 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -537,7 +537,9 @@ inp_fix_macro_param_func_paren_io( struct line *begin_card ) {
             }
 
             if ( is_func ) {
-                if ( ( str_ptr = strstr( card->li_line, "=" ) ) ) *str_ptr = ' ';
+                str_ptr = strstr( card->li_line, "=" );
+                if ( str_ptr )
+                    *str_ptr = ' ';
                 str_ptr = card->li_line + 1;
                 *str_ptr = 'f'; *(str_ptr+1) = 'u'; *(str_ptr+2) = 'n';
                 *(str_ptr+3) = 'c'; *(str_ptr+4) = ' ';