Commit 8e975d70 authored by malenov's avatar malenov
Browse files

fix some more [-Werror=dangling-else]

parent d8e82a3d

lib_com/options.h

+4 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
/* ################### Start DEBUGGING switches ########################### */



#ifndef RELEASE

/*#define DEBUGGING*/                           /* Activate debugging part of the code */

#define DEBUGGING                           /* Activate debugging part of the code */

#endif

/*#define WMOPS*/                               /* Activate complexity and memory counters */

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */
@@ -57,7 +57,7 @@ 
/*#define MEM_COUNT_DETAILS*/                   /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */



#ifdef DEBUGGING

/*#define DEBUG_MODE_INFO*/                     /* output most important parameters to the subdirectory "res/" */

#define DEBUG_MODE_INFO                     /* output most important parameters to the subdirectory "res/" */

#ifdef DEBUG_MODE_INFO

/*#define DEBUG_MODE_ACELP*/                    /* output most important ACELP core parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_TCX*/                      /* output most important TCX core parameters to the subdirectory "res/" */
@@ -159,6 +159,8 @@ 
#define FIX_NUM_SUBFRAME_UPDATE



#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */



#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */



/* #################### End BE switches ################################## */

lib_lc3plus/dec_lc3_fl.c

+5 −1
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ LC3PLUS_Error Dec_LC3PLUS_fl(LC3PLUS_Dec* decoder, uint8_t* input, LC3_INT32 num 
        }

    }



    if ((decoder->last_error == LC3PLUS_OK) && bfi) decoder->last_error = LC3PLUS_DECODE_ERROR;

    if ((decoder->last_error == LC3PLUS_OK) && bfi) 

    {

        decoder->last_error = LC3PLUS_DECODE_ERROR;

    }



    return bfi == 1 ? LC3PLUS_DECODE_ERROR : LC3PLUS_OK;

}

lib_lc3plus/fft/iis_fft.c

+2 −1
Original line number Diff line number Diff line
@@ -39,8 +39,9 @@ static IIS_FFT_ERROR create(HANDLE_IIS_FFT* handle, LC3_INT type, LC3_INT len, I 


    /* check argument sanity */

    if ((sign != IIS_FFT_FWD) && (sign != IIS_FFT_BWD))

    {

        return IIS_FFT_INTERNAL_ERROR;



    }



    if (!(*handle))

    {