diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-01 01:03:07 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-01 01:03:07 +0000 |
commit | 7c81679557f8c92ebb8afd32548fe0092b32d342 (patch) | |
tree | b2a0c47ec4376a446a2451c23df6b65c06c7eff6 /channels | |
parent | 80248fe9520657bc87f9ebe2ddbd9ca2c8ddf93a (diff) |
Merged revisions 209759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines
Minor changes inspired by testing with latest GCC.
The latest GCC (what will become 4.5.x) has a few new warnings, that in these
cases found some either downright buggy code, or at least seriously poorly
designed code that could be improved.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@209760 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_dahdi.c | 2 | ||||
-rw-r--r-- | channels/chan_misdn.c | 2 | ||||
-rw-r--r-- | channels/misdn/ie.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 9bc91024c..98a8ab3ee 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -2526,7 +2526,7 @@ static void my_pri_fixup_chans(void *old_chan, void *new_chan) old->dsp_features = 0; } -static int sig_pri_tone_to_dahditone(enum analog_tone tone) +static int sig_pri_tone_to_dahditone(enum sig_pri_tone tone) { switch (tone) { case SIG_PRI_TONE_RINGTONE: diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 8f9d5fb0b..a85392eed 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -11081,7 +11081,7 @@ static int misdn_command_cc_deactivate(struct ast_channel *chan, struct misdn_co error_str = misdn_no_response_from_network; } else if (cc_record->reject_code != FacReject_None) { error_str = misdn_to_str_reject_code(cc_record->reject_code); - } else if (cc_record->reject_code != FacError_None) { + } else if (cc_record->error_code != FacError_None) { error_str = misdn_to_str_error_code(cc_record->error_code); } else { error_str = NULL; diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c index 33596098d..818a2f279 100644 --- a/channels/misdn/ie.c +++ b/channels/misdn/ie.c @@ -247,7 +247,7 @@ static void dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *c if (p[0] <= octet) goto done; - if (!p[octet++] & 0x80) + if (~p[octet++] & 0x80) goto l2; /* Wheee. V.110 speed information */ |