kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 376092 via svnmerge from

Browse Source 
file:///srv/subversion/repos/asterisk/trunk

................
  r376092 | mmichelson | 2012-11-08 16:10:29 -0600 (Thu, 08 Nov 2012) | 18 lines
  
  Fix a "set but not used" warning on newer gccs.
  
  Turns out the "helpful" setting of ms and res in this
  macro is completely useless after the timeout antipattern
  fix.
  
  If you're a new guy looking to write code, don't write
  a macro like this one.
  ........
  
  Merged revisions 376087 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 376088 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 376089 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2012-11-08 22:19:40 +00:00
parent bf369f2018
commit 7c6c20bfc6
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_fax.c
View File

@@ -1215,7 +1215,6 @@ static void set_channel_variables(struct ast_channel *chan, struct ast_fax_sessi
#define GENERIC_FAX_EXEC_ERROR_QUIET(fax, chan, errorstr, reason) \
do { \
GENERIC_FAX_EXEC_SET_VARS(fax, chan, errorstr, reason); \
res = ms = -1; \
} while (0)
#define GENERIC_FAX_EXEC_ERROR(fax, chan, errorstr, reason) \
@@ -1327,7 +1326,7 @@ static int generic_fax_exec(struct ast_channel *chan, struct ast_fax_session_det
{
int ms;
int timeout = RES_FAX_TIMEOUT;
int res, chancount;
int chancount;
unsigned int expected_frametype = -1;
union ast_frame_subclass expected_framesubclass = { .integer = -1 };
unsigned int t38negotiated = (ast_channel_get_t38_state(chan) == T38_STATE_NEGOTIATED);