[svn-commits] mmichelson: trunk r376092 - in /trunk: ./ res/res_fax.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Nov  8 16:10:29 2012
New Revision: 376092

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=376092
Log:
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

Modified:
    trunk/   (props changed)
    trunk/res/res_fax.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=376092&r1=376091&r2=376092
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Thu Nov  8 16:10:29 2012
@@ -1215,7 +1215,6 @@
 #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 @@
 {
 	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);