Merged revisions 376092 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Thu, 8 Nov 2012 22:19:40 +0000 (22:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Thu, 8 Nov 2012 22:19:40 +0000 (22:19 +0000)
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

res/res_fax.c

index 32225d3..5ed7107 100644 (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);