From 631da6ad9080f921c62f28f312e708a5fb172ad8 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Thu, 8 Nov 2012 21:59:13 +0000 Subject: [PATCH] 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@376088 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_fax.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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); -- 2.47.3