Fix additional coverity warnings.

This commit is contained in:
Fabrizio Fabbri 2017-06-06 23:43:02 +02:00
parent da47ed7f5f
commit 06f5697074
No known key found for this signature in database
GPG key ID: 8276EDF3D10E6C35
9 changed files with 28 additions and 28 deletions

View file

@ -550,7 +550,6 @@ ecl_array_allocself(cl_object x)
}
#endif
case ecl_aet_bc: {
cl_index elt_size = 1;
x->vector.self.bc = (ecl_base_char *)ecl_alloc_atomic(d+1);
/* Null terminate the string */
x->vector.self.bc[d] = 0;
@ -752,7 +751,7 @@ cl_array_element_type(cl_object a)
void
ecl_displace(cl_object from, cl_object to, cl_object offset)
{
cl_index j;
cl_fixnum j;
void *base;
cl_elttype totype, fromtype;
fromtype = from->array.elttype;

View file

@ -127,6 +127,7 @@ cl_function_lambda_expression(cl_object fun)
case t_bclosure:
lex = fun->bclosure.lex;
fun = fun->bclosure.code;
// fallthrough
case t_bytecodes:
name = fun->bytecodes.name;
output = fun->bytecodes.definition;

View file

@ -206,6 +206,7 @@ ecl_char_eq(cl_object x, cl_object y)
c = ecl_va_arg(cs);
for (j = 1; j<i; j++)
if (ecl_char_eq(ecl_va_arg(ds), c)) {
ecl_va_end(ds);
@(return ECL_NIL);
}
ecl_va_end(ds);

View file

@ -2088,7 +2088,7 @@ c_tagbody(cl_env_ptr env, cl_object args, int flags)
static int
c_the(cl_env_ptr env, cl_object stmt, int flags) {
cl_object type = pop(&stmt);
pop(&stmt);
cl_object value = pop(&stmt);
if (stmt != ECL_NIL) {
FEprogram_error_noreturn("THE: Too many arguments",0);
@ -3154,7 +3154,7 @@ si_make_lambda(cl_object name, cl_object rest)
the_env->c_env = old_c_env;
memset(&new_c_env, 0, sizeof(new_c_env));
} ECL_UNWIND_PROTECT_END;
return the_env->values[0];
@(return the_env->values[0]);
@)
void

View file

@ -224,12 +224,6 @@ cl_eval(cl_object form)
if (ECL_CONS_CAR(form) == @'quote') {
return cl_second(form);
}
/* value = cl_macroexpand(2, form, env); */
/* if (value != form) { */
/* form = value; */
/* goto AGAIN; */
/* } */
ERROR:
FEerror("EXT:CONSTANT-FORM-VALUE invoked with a non-constant form ~A",
0, form);
break;

View file

@ -68,6 +68,7 @@ ecl_minus(cl_object x, cl_object y)
return ecl_make_double_float(ecl_to_double(x) - ecl_double_float(y));
}
CASE_RATIO_FIXNUM;
// fallthrough
CASE_RATIO_BIGNUM {
cl_object z = ecl_times(x->ratio.den, y);
z = ecl_minus(x->ratio.num, z);

View file

@ -141,9 +141,13 @@ ecl_times(cl_object x, cl_object y)
}
#endif
CASE_COMPLEX_FIXNUM;
// fallthrough
CASE_COMPLEX_BIGNUM;
// fallthrough
CASE_COMPLEX_RATIO;
// fallthrough
CASE_COMPLEX_SINGLE_FLOAT;
// fallthrough
CASE_COMPLEX_DOUBLE_FLOAT; COMPLEX_X: {
cl_object aux = x;
x = y; y = aux;

View file

@ -883,7 +883,7 @@ sharp_asterisk_reader(cl_object in, cl_object c, cl_object d)
cl_env_ptr env = ecl_process_env();
cl_index sp = ECL_STACK_INDEX(env);
cl_object last, elt, x;
cl_index dim, dimcount, i;
cl_fixnum dim, dimcount, i;
cl_object rtbl = ecl_current_readtable();
enum ecl_chattrib a;
@ -1795,7 +1795,7 @@ do_read_delimited_list(int d, cl_object in, bool proper_list)
return funcall(5, @'gray::stream-read-sequence', stream, sequence, start, end);
else
#endif
return si_do_read_sequence(sequence, stream, start, end);
@(return si_do_read_sequence(sequence, stream, start, end));
@)

View file

@ -603,52 +603,52 @@ string_compare(cl_narg narg, int sign1, int sign2, int case_sensitive, ecl_va_li
@(defun string< (&rest args)
@
return string_compare(narg, -1, -1, 1, args);
@(return string_compare(narg, -1, -1, 1, args));
@)
@(defun string> (&rest args)
@
return string_compare(narg, +1, +1, 1, args);
@(return string_compare(narg, +1, +1, 1, args));
@)
@(defun string<= (&rest args)
@
return string_compare(narg, -1, 0, 1, args);
@(return string_compare(narg, -1, 0, 1, args));
@)
@(defun string>= (&rest args)
@
return string_compare(narg, 0, +1, 1, args);
@(return string_compare(narg, 0, +1, 1, args));
@)
@(defun string/= (&rest args)
@
return string_compare(narg, -1, +1, 1, args);
@(return string_compare(narg, -1, +1, 1, args));
@)
@(defun string-lessp (&rest args)
@
return string_compare(narg, -1, -1, 0, args);
@(return string_compare(narg, -1, -1, 0, args));
@)
@(defun string-greaterp (&rest args)
@
return string_compare(narg, +1, +1, 0, args);
@(return string_compare(narg, +1, +1, 0, args));
@)
@(defun string-not-greaterp (&rest args)
@
return string_compare(narg, -1, 0, 0, args);
@(return string_compare(narg, -1, 0, 0, args));
@)
@(defun string-not-lessp (&rest args)
@
return string_compare(narg, 0, +1, 0, args);
@(return string_compare(narg, 0, +1, 0, args));
@)
@(defun string-not-equal (&rest args)
@
return string_compare(narg, -1, +1, 0, args);
@(return string_compare(narg, -1, +1, 0, args));
@)
bool
@ -781,7 +781,7 @@ char_upcase(ecl_character c, bool *bp)
@(defun string-upcase (&rest args)
@
return string_case(narg, @[string-upcase], char_upcase, args);
@(return string_case(narg, @[string-upcase], char_upcase, args));
@)
static ecl_character
@ -792,7 +792,7 @@ char_downcase(ecl_character c, bool *bp)
@(defun string-downcase (&rest args)
@
return string_case(narg, @[string-downcase], char_downcase, args);
@(return string_case(narg, @[string-downcase], char_downcase, args));
@)
static ecl_character
@ -814,7 +814,7 @@ char_capitalize(ecl_character c, bool *bp)
@(defun string-capitalize (&rest args)
@
return string_case(narg, @[string-capitalize], char_capitalize, args);
@(return string_case(narg, @[string-capitalize], char_capitalize, args));
@)
@ -858,17 +858,17 @@ nstring_case(cl_narg narg, cl_object fun, ecl_casefun casefun, ecl_va_list ARGS)
@(defun nstring-upcase (&rest args)
@
return nstring_case(narg, @'nstring-upcase', char_upcase, args);
@(return nstring_case(narg, @'nstring-upcase', char_upcase, args));
@)
@(defun nstring-downcase (&rest args)
@
return nstring_case(narg, @'nstring-downcase', char_downcase, args);
@(return nstring_case(narg, @'nstring-downcase', char_downcase, args));
@)
@(defun nstring-capitalize (&rest args)
@
return nstring_case(narg, @'nstring-capitalize', char_capitalize, args);
@(return nstring_case(narg, @'nstring-capitalize', char_capitalize, args));
@)
@(defun si::base-string-concatenate (&rest args)