res_fax: Remove checks for unsigned values being >= 0.

It's impossible for gwtimeout or fdtimeout to be less than 0 because
they are unsigned int's.  Remove checks and unreachable branches.

Change-Id: Ib2286960621e6ee245e40013c84986143302bc78
changes/84/7284/1
Corey Farrell 9 years ago
parent ef8ee3ee69
commit 0f270cbe9e

@ -4563,12 +4563,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);
}
@ -4607,13 +4602,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);

Loading…
Cancel
Save