patches based on clang warnings provided by Alexander - thanks

git-svn-id: https://svn.code.sf.net/p/freetel/code@3575 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/octave/cohpsk_frame_design.ods b/codec2-dev/octave/cohpsk_frame_design.ods
index 915ea08f50e284fe14e3587a5f6309d806758c6b..0e304c7b49646597f84bfe3d3ebf589492a23a89 100644 (file)
Binary files a/codec2-dev/octave/cohpsk_frame_design.ods and b/codec2-dev/octave/cohpsk_frame_design.ods differ

diff --git a/codec2-dev/src/ampexp.h b/codec2-dev/src/ampexp.h
index 8954ea282e1db773408e4bc0265697531558b829..37c3a7a6fa24c64fc2ad82fbdcad04625ae6a101 100644 (file)
--- a/codec2-dev/src/ampexp.h
+++ b/codec2-dev/src/ampexp.h
@@ -25,7 +25,7 @@
   along with this program; if not,see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __AMPEX__
+#ifndef __AMPEXP__
 #define __AMPEXP__
 
 #include "defines.h"

diff --git a/codec2-dev/src/freedv_api.c b/codec2-dev/src/freedv_api.c
index 954db4b89ca31bc501fcb3159d488b5e04f5c6ba..d7d292831366aa3fd46c92c7bae815d33aecf0a4 100644 (file)
--- a/codec2-dev/src/freedv_api.c
+++ b/codec2-dev/src/freedv_api.c
@@ -344,7 +344,7 @@ struct freedv *freedv_open_advanced(int mode, struct freedv_advanced *adv) {
         f->n_codec_bits = codec2_bits_per_frame(f->codec2);
         nbit = f->n_codec_bits;
         nbyte = (nbit + 7) / 8;
-    } else if ((mode == FREEDV_MODE_800XA)) {
+    } else if (mode == FREEDV_MODE_800XA) {
         f->n_speech_samples = 2*codec2_samples_per_frame(f->codec2);
         f->n_codec_bits = codec2_bits_per_frame(f->codec2);
         nbit = f->n_codec_bits;
@@ -678,7 +678,7 @@ void freedv_tx(struct freedv *f, short mod_out[], short speech_in[]) {
      
     if ((f->mode == FREEDV_MODE_2400A) || (f->mode == FREEDV_MODE_2400B) || (f->mode == FREEDV_MODE_800XA)){
         /* 800XA has two codec frames per modem frame */
-        if((f->mode == FREEDV_MODE_800XA)){
+        if(f->mode == FREEDV_MODE_800XA){
             codec2_encode(f->codec2, &f->packed_codec_bits[0], &speech_in[  0]);
             codec2_encode(f->codec2, &f->packed_codec_bits[4], &speech_in[320]);
         }else{

diff --git a/codec2-dev/src/mpdecode_core.c b/codec2-dev/src/mpdecode_core.c
index 02478def7414547ab0851cbf97f94f2a0304921d..7310c53fd11c21183a81d3b2481c832ea071c43a 100644 (file)
--- a/codec2-dev/src/mpdecode_core.c
+++ b/codec2-dev/src/mpdecode_core.c
@@ -856,7 +856,7 @@ int extract_output(char out_char[], int DecodedBits[], int ParityCheckCount[], i
     for (i=0;i<max_iter;i++) {
         if (converged == 0)
             iter++;
-        if ((ParityCheckCount[i] == NumberParityBits)) {
+        if (ParityCheckCount[i] == NumberParityBits) {
             for (j=0; j<CodeLength; j++) {
                 out_char[j] = DecodedBits[i+j*max_iter];
             }