removed some warnings gcc 6 picked up

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

diff --git a/codec2-dev/src/ampexp.c b/codec2-dev/src/ampexp.c
index cb19116454b9d2d0469555b89540f4ac5d9b49d7..f98f84b3f3cba82fc3b06b6d4212350a407d8b72 100644 (file)
--- a/codec2-dev/src/ampexp.c
+++ b/codec2-dev/src/ampexp.c
@@ -96,7 +96,7 @@ static float get_float(FILE * in, const char * name, char * * cursor, char * buf
 
       if ( end != s )
         *cursor = end;
-        return f;
+      return f;
     }
 
     if ( fgets(buffer, size, in) == NULL ) {

diff --git a/codec2-dev/src/freedv_vhf_framing.c b/codec2-dev/src/freedv_vhf_framing.c
index 50d5424651a0556a8ae51f2b173889f4da65acd6..da3901ca388b9083ef8f4e48c5f11154840e3d58 100644 (file)
--- a/codec2-dev/src/freedv_vhf_framing.c
+++ b/codec2-dev/src/freedv_vhf_framing.c
@@ -732,7 +732,7 @@ int fvhff_deframe_bits(struct freedv_vhf_deframer * def,uint8_t codec2_out[],uin
     int uw_sync_tol;
     int miss_tol;
     int extracted_frame = 0;
-    enum frame_payload_type pt;
+    enum frame_payload_type pt = FRAME_PAYLOAD_TYPE_VOICE;
     
     /* Possibly set up frame-specific params here */
     if(frame_type == FREEDV_VHF_FRAME_A){

diff --git a/codec2-dev/src/generate_codebook.c b/codec2-dev/src/generate_codebook.c
index 705f29d3822c05abac4c7f55e70ff9c7bad49e77..835fc7ddfc8e61ea07ca83631435960fd6515bc4 100644 (file)
--- a/codec2-dev/src/generate_codebook.c
+++ b/codec2-dev/src/generate_codebook.c
@@ -102,7 +102,7 @@ get_float(FILE * in, const char * name, char * * cursor, char * buffer,
 
       if ( end != s )
         *cursor = end;
-        return f;
+      return f;
     }
 
     if ( fgets(buffer, size, in) == NULL ) {

diff --git a/codec2-dev/src/phaseexp.c b/codec2-dev/src/phaseexp.c
index f5ee6f09baf862c143715a0154c8f22b74cc4542..d6b3350a8f509a3bdccf16eaca51a4a304a6bdb9 100644 (file)
--- a/codec2-dev/src/phaseexp.c
+++ b/codec2-dev/src/phaseexp.c
@@ -69,7 +69,7 @@ float get_float(FILE * in, const char * name, char * * cursor, char * buffer, in
 
       if ( end != s )
         *cursor = end;
-        return f;
+      return f;
     }
 
     if ( fgets(buffer, size, in) == NULL ) {