diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-11-20 13:04:28 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-20 13:04:28 -0600 |
| commit | 8090aaf82382cc8496fe9e94b7ed485c07c28792 (patch) | |
| tree | e7071c3e04f9eeea95db09bc19e924cdb4234bb0 /res | |
| parent | 882bdcdd60fa70cdb4e2bd3eba56af004995bfd9 (diff) | |
| parent | 85d675b14c7f946b86cc371a43aaa7f5d314d8c2 (diff) | |
Merge "res_fax: Remove checks for unsigned values being >= 0." into 15
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_fax.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index b25b6d16d..4a1c0846f 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -4561,12 +4561,7 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat unsigned int gwtimeout; if (sscanf(timeout, "%30u", &gwtimeout) == 1) { - if (gwtimeout >= 0) { - details->gateway_timeout = gwtimeout * 1000; - } else { - ast_log(LOG_WARNING, "%s(%s) timeout cannot be negative. Ignoring timeout\n", - cmd, data); - } + details->gateway_timeout = gwtimeout * 1000; } else { ast_log(LOG_WARNING, "Unsupported timeout '%s' passed to FAXOPT(%s).\n", timeout, data); } @@ -4605,13 +4600,7 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat if (details->faxdetect_id < 0) { if (timeout) { if (sscanf(timeout, "%30u", &fdtimeout) == 1) { - if (fdtimeout >= 0) { - fdtimeout *= 1000; - } else { - ast_log(LOG_WARNING, "%s(%s) timeout cannot be negative. Ignoring timeout\n", - cmd, data); - fdtimeout = 0; - } + fdtimeout *= 1000; } else { ast_log(LOG_WARNING, "Unsupported timeout '%s' passed to FAXOPT(%s).\n", timeout, data); |