Cleared some simple Coverity issues

This commit is contained in:
Steve Underwood 2014-04-30 12:42:46 +08:00
parent 2cdae46b19
commit dac846cc7e
6 changed files with 8 additions and 7 deletions

View File

@ -771,8 +771,8 @@ static int parse_string_out(at_state_t *s, const char **t, char **target, const
default:
return false;
}
while (*t)
t++;
while (**t)
(*t)++;
return true;
}
/*- End of function --------------------------------------------------------*/

View File

@ -149,7 +149,7 @@ static void assess_error_rate(bert_state_t *s)
(i.e. we look for >=10 errors in 1000 bits). We make an assessment every 100 bits, using a sliding
window over the last 1000 bits. We assess the 1 in 1000 rate over 10000 bits in a similar way, and
so on for the lower error rates. */
test = false;
test = true;
for (i = 2; i <= 7; i++)
{
if (++s->decade_ptr[i] < 10)

View File

@ -274,6 +274,7 @@ static void fax_set_rx_type(void *user_data, int type, int bit_rate, int short_t
break;
case T30_MODEM_DONE:
span_log(&s->logging, SPAN_LOG_FLOW, "FAX exchange complete\n");
/* Fall through */
default:
fax_modems_set_rx_handler(t, (span_rx_handler_t) &span_dummy_rx, s, (span_rx_fillin_handler_t) &span_dummy_rx_fillin, s);
break;

View File

@ -226,7 +226,7 @@ static __inline__ uint8_t linear_to_alaw(int linear)
return (uint8_t) (0x7F ^ mask);
}
/* We must be just a tiny step below zero */
return (uint8_t) (0x00 ^ mask);
return (uint8_t) mask;
}
/* Combine the sign, segment, and quantization bits. */
return (uint8_t) (((seg << 4) | ((linear >> ((seg) ? (seg + 3) : 4)) & 0x0F)) ^ mask);

View File

@ -964,7 +964,7 @@ static int send_nsf_frame(t30_state_t *s)
span_log(&s->logging, SPAN_LOG_FLOW, "Sending user supplied NSF - %d octets\n", s->tx_info.nsf_len);
s->tx_info.nsf[0] = ADDRESS_FIELD;
s->tx_info.nsf[1] = CONTROL_FIELD_NON_FINAL_FRAME;
s->tx_info.nsf[2] = (uint8_t) (T30_NSF | s->dis_received);
s->tx_info.nsf[2] = T30_NSF;
send_frame(s, s->tx_info.nsf, s->tx_info.nsf_len + 3);
return true;
}
@ -996,7 +996,7 @@ static int send_nsc_frame(t30_state_t *s)
span_log(&s->logging, SPAN_LOG_FLOW, "Sending user supplied NSC - %d octets\n", s->tx_info.nsc_len);
s->tx_info.nsc[0] = ADDRESS_FIELD;
s->tx_info.nsc[1] = CONTROL_FIELD_NON_FINAL_FRAME;
s->tx_info.nsc[2] = (uint8_t) (T30_NSC | s->dis_received);
s->tx_info.nsc[2] = T30_NSC;
send_frame(s, s->tx_info.nsc, s->tx_info.nsc_len + 3);
return true;
}

View File

@ -325,7 +325,7 @@ static int best_colour_resolution(float actual, int allowed_resolutions)
return -1;
best_ratio = 0.0f;
best_entry = -1;
best_entry = 0;
for (i = 0; x_res_table[i].resolution > 0.0f; i++)
{
if (!(allowed_resolutions & x_res_table[i].resolution_code))