From 5e46127e17c1a80a03f952c78e0414cf34dfdca7 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Mon, 6 Apr 2015 18:58:30 +0000 Subject: [PATCH] build: Fixes for gcc 5 compilation These are fixes for compilation under gcc 5.0... chan_sip.c: In parse_request needed to make 'lim' unsigned. inline_api.h: Needed to add a check for '__GNUC_STDC_INLINE__' to detect C99 inline semantics (same as clang). ccss.c: In ast_cc_set_parm, needed to fix weird comparison. dsp.c: Needed to work around a possible compiler bug. It was throwing an array-bounds error but neither sgriepentrog, rmudgett nor I could figure out why. manager.c: In action_atxfer, needed to correct an array allocation. This patch will go to 11, 13, trunk. Review: https://reviewboard.asterisk.org/r/4581/ Reported-by: Jeffrey Ollie Tested-by: George Joseph ASTERISK-24932 #close git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@434113 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 3 ++- include/asterisk/inline_api.h | 2 +- main/ccss.c | 2 +- main/dsp.c | 17 +++++++++++------ main/manager.c | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 03e399a958..e4c1069cee 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9459,7 +9459,8 @@ static int parse_request(struct sip_request *req) { char *c = ast_str_buffer(req->data); ptrdiff_t *dst = req->header; - int i = 0, lim = SIP_MAX_HEADERS - 1; + int i = 0; + unsigned int lim = SIP_MAX_HEADERS - 1; unsigned int skipping_headers = 0; ptrdiff_t current_header_offset = 0; char *previous_header = ""; diff --git a/include/asterisk/inline_api.h b/include/asterisk/inline_api.h index a54fd9005c..7ede751fa7 100644 --- a/include/asterisk/inline_api.h +++ b/include/asterisk/inline_api.h @@ -48,7 +48,7 @@ #if !defined(LOW_MEMORY) #if !defined(AST_API_MODULE) -#if defined(__clang__) +#if defined(__clang__) || defined(__GNUC_STDC_INLINE__) #define AST_INLINE_API(hdr, body) static hdr; static inline hdr body #else /* if defined(__clang__) */ #define AST_INLINE_API(hdr, body) hdr; extern inline hdr body diff --git a/main/ccss.c b/main/ccss.c index 7203889afe..aeb902da55 100644 --- a/main/ccss.c +++ b/main/ccss.c @@ -813,7 +813,7 @@ int ast_cc_set_param(struct ast_cc_config_params *params, const char * const nam return 0; } - if (!sscanf(value, "%30u", &value_as_uint) == 1) { + if (sscanf(value, "%30u", &value_as_uint) != 1) { return -1; } diff --git a/main/dsp.c b/main/dsp.c index eecc8dd22b..d9ce16167f 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -102,9 +102,11 @@ static struct progalias { { "uk", PROG_MODE_UK }, }; +#define FREQ_ARRAY_SIZE 7 + static struct progress { enum gsamp_size size; - int freqs[7]; + int freqs[FREQ_ARRAY_SIZE]; } modes[] = { { GSAMP_SIZE_NA, { 350, 440, 480, 620, 950, 1400, 1800 } }, /*!< North America */ { GSAMP_SIZE_CR, { 425 } }, /*!< Costa Rica, Brazil */ @@ -381,7 +383,7 @@ struct ast_dsp { struct ast_dsp_busy_pattern busy_cadence; int historicnoise[DSP_HISTORY]; int historicsilence[DSP_HISTORY]; - goertzel_state_t freqs[7]; + goertzel_state_t freqs[FREQ_ARRAY_SIZE]; int freqcount; int gsamps; enum gsamp_size gsamp_size; @@ -1026,6 +1028,8 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s, int len) int pass; int newstate = DSP_TONE_STATE_SILENCE; int res = 0; + int freqcount = dsp->freqcount > FREQ_ARRAY_SIZE ? FREQ_ARRAY_SIZE : dsp->freqcount; + while (len) { /* Take the lesser of the number of samples we need and what we have */ pass = len; @@ -1033,7 +1037,7 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s, int len) pass = dsp->gsamp_size - dsp->gsamps; } for (x = 0; x < pass; x++) { - for (y = 0; y < dsp->freqcount; y++) { + for (y = 0; y < freqcount; y++) { goertzel_sample(&dsp->freqs[y], s[x]); } dsp->genergy += s[x] * s[x]; @@ -1042,8 +1046,8 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s, int len) dsp->gsamps += pass; len -= pass; if (dsp->gsamps == dsp->gsamp_size) { - float hz[7]; - for (y = 0; y < 7; y++) { + float hz[FREQ_ARRAY_SIZE]; + for (y = 0; y < FREQ_ARRAY_SIZE; y++) { hz[y] = goertzel_result(&dsp->freqs[y]); } switch (dsp->progmode) { @@ -1642,7 +1646,7 @@ static void ast_dsp_prog_reset(struct ast_dsp *dsp) dsp->gsamp_size = modes[dsp->progmode].size; dsp->gsamps = 0; - for (x = 0; x < ARRAY_LEN(modes[dsp->progmode].freqs); x++) { + for (x = 0; x < FREQ_ARRAY_SIZE; x++) { if (modes[dsp->progmode].freqs[x]) { goertzel_init(&dsp->freqs[x], (float)modes[dsp->progmode].freqs[x], dsp->gsamp_size, dsp->sample_rate); max = x + 1; @@ -1668,6 +1672,7 @@ static struct ast_dsp *__ast_dsp_new(unsigned int sample_rate) dsp->digitmode = DSP_DIGITMODE_DTMF; dsp->faxmode = DSP_FAXMODE_DETECT_CNG; dsp->sample_rate = sample_rate; + dsp->freqcount = 0; /* Initialize digit detector */ ast_digit_detect_init(&dsp->digit_state, dsp->digitmode & DSP_DIGITMODE_MF, dsp->sample_rate); dsp->display_inband_dtmf_warning = 1; diff --git a/main/manager.c b/main/manager.c index a979e3d7e3..b717131fe3 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3974,7 +3974,7 @@ static int action_atxfer(struct mansession *s, const struct message *m) static int check_blacklist(const char *cmd) { char *cmd_copy, *cur_cmd; - char *cmd_words[MAX_BLACKLIST_CMD_LEN] = { NULL, }; + char *cmd_words[AST_MAX_CMD_LEN] = { NULL, }; int i; cmd_copy = ast_strdupa(cmd); -- 2.47.2