From e773bbdd10377f2ef26d2a500708ed19c9b75463 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 8 Nov 2012 22:10:29 +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
........
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/trunk@376092 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 32225d32d8..5ed7107d2a 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -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);
--
GitLab