From 4fcdeb9b1dff49f6e01597793424a483ee1c674c Mon Sep 17 00:00:00 2001 From: drowe67 Date: Tue, 7 Feb 2017 05:32:28 +0000 Subject: [PATCH] removed some warnings gcc 6 picked up git-svn-id: https://svn.code.sf.net/p/freetel/code@3025 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/src/ampexp.c | 2 +- codec2-dev/src/freedv_vhf_framing.c | 2 +- codec2-dev/src/generate_codebook.c | 2 +- codec2-dev/src/phaseexp.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codec2-dev/src/ampexp.c b/codec2-dev/src/ampexp.c index cb191164..f98f84b3 100644 --- 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 50d54246..da3901ca 100644 --- 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 705f29d3..835fc7dd 100644 --- 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 f5ee6f09..d6b3350a 100644 --- 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 ) { -- 2.25.1