Partial cppcheck cleanup. Some sscanf warnings remain.

diff --git a/morse.d/beepALSA.c b/morse.d/beepALSA.c
index e9cb9d3e61c3a0a7c8a1c1155754bb1fdb826879..b7bbb03d12f42e05a11ec5cbf0898148538816b4 100644 (file)
--- a/morse.d/beepALSA.c
+++ b/morse.d/beepALSA.c
@@ -60,10 +60,7 @@ int BeepInit (void)
 
 int Beep (int time, int volume, int pitch)
 {
-  static int      last_pitch = -1, last_n = -1, last_volume = -1;
-  int             i, n, first_len, down_len, cycle;
-  double          dt;
-
+    int n;
   /*
    * Finagle the number of samples
    */
@@ -81,6 +78,8 @@ int Beep (int time, int volume, int pitch)
   if (volume <= 0) {
     snd_pcm_writei(handle, silence, channels*n);
   } else {
+    static int      last_pitch = -1, last_n = -1, last_volume = -1;
+    int             first_len, down_len, cycle;
     /*
      * clip to Nyquist
      * (Of course this means that if you ask for too high a frequency you
@@ -119,6 +118,8 @@ int Beep (int time, int volume, int pitch)
       last_pitch = pitch;
       last_n = n;
       last_volume = volume;
+      double          dt;
+      int i;
 
       dt = 2. * M_PI / cycle;  /* sine scale factor */
 

diff --git a/morse.d/beepOSS.c b/morse.d/beepOSS.c
index 6573539b10a0c1f3bcf520910c46f05fe44268ae..aeea766dd45ec3b3ac251e2739be2eb2c868a861 100644 (file)
--- a/morse.d/beepOSS.c
+++ b/morse.d/beepOSS.c
@@ -91,10 +91,7 @@ int BeepInit (void)
 
 int Beep (int time, int volume, int pitch)
 {
-  static int      last_pitch = -1, last_n = -1, last_volume = -1;
-  int             i, n, first_len, down_len, cycle;
-  double          dt;
-  
+    int n;
   /*
    * Finagle the number of samples
    */
@@ -114,6 +111,8 @@ int Beep (int time, int volume, int pitch)
     }
   else
     {
+      static int      last_pitch = -1, last_n = -1, last_volume = -1;
+      int             first_len, down_len, cycle;
       /*
        * clip to Nyquist
        * (Of course this means that if you ask for too high a frequency you
@@ -148,7 +147,9 @@ int Beep (int time, int volume, int pitch)
          last_pitch = pitch;
          last_n = n;
          last_volume = volume;
-         
+         int i;
+         double          dt;
+ 
          dt = 2. * M_PI / cycle;       /* sine scale factor */
          
          /* Ramp up; begin with silence */

diff --cc morse.d/beepPA.c
Simple merge

diff --cc morse.d/morse.c
Simple merge