From: Automerge script <automerge@asterisk.org>
Date: Thu, 8 Nov 2012 22:25:04 +0000 (+0000)
Subject: Merged revisions 376088 via svnmerge from
X-Git-Tag: 10.12.0-digiumphones-rc1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=847cdb015e9b3b7f3980d8b5ce4a94ef6136f92a;p=thirdparty%2Fasterisk.git

Merged revisions 376088 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r376088 | mmichelson | 2012-11-08 15:59:13 -0600 (Thu, 08 Nov 2012) | 12 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
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@376117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_fax.c b/res/res_fax.c
index bb5da90a16..bf59eb1216 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -1181,7 +1181,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)	\
@@ -1293,7 +1292,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);