From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 8 Nov 2012 22:08:58 +0000 (+0000)
Subject: Fix a "set but not used" warning on newer gccs.
X-Git-Tag: 11.2.0-rc1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e7a64e55e3c5e93b08d35bab785b28b0ed3639f;p=thirdparty%2Fasterisk.git

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


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

diff --git a/res/res_fax.c b/res/res_fax.c
index fd0294bbeb..db0f17ca50 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -1206,7 +1206,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)	\
@@ -1318,7 +1317,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);