From 5ef3d3d51df50580476d7f3db9911361d16f49fb Mon Sep 17 00:00:00 2001 From: Daniel Kochmanski Date: Fri, 1 Sep 2017 09:31:00 +0200 Subject: [PATCH] Revert "Fix additional coverity warnings." This reverts commit 06f56970748230ccbee2c0f121f3abf2b9d9f05e. --- src/c/array.d | 3 ++- src/c/cfun.d | 1 - src/c/character.d | 1 - src/c/compiler.d | 4 ++-- src/c/eval.d | 6 ++++++ src/c/numbers/minus.d | 1 - src/c/numbers/times.d | 4 ---- src/c/read.d | 4 ++-- src/c/string.d | 32 ++++++++++++++++---------------- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/c/array.d b/src/c/array.d index d945e369d..ca08ccddd 100644 --- a/src/c/array.d +++ b/src/c/array.d @@ -550,6 +550,7 @@ 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; @@ -751,7 +752,7 @@ cl_array_element_type(cl_object a) void ecl_displace(cl_object from, cl_object to, cl_object offset) { - cl_fixnum j; + cl_index j; void *base; cl_elttype totype, fromtype; fromtype = from->array.elttype; diff --git a/src/c/cfun.d b/src/c/cfun.d index 523da579e..8840060c5 100644 --- a/src/c/cfun.d +++ b/src/c/cfun.d @@ -126,7 +126,6 @@ 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; diff --git a/src/c/character.d b/src/c/character.d index 8456bdfb3..949ca83d5 100644 --- a/src/c/character.d +++ b/src/c/character.d @@ -206,7 +206,6 @@ ecl_char_eq(cl_object x, cl_object y) c = ecl_va_arg(cs); for (j = 1; jc_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 diff --git a/src/c/eval.d b/src/c/eval.d index 9b2751139..7f4e697b5 100644 --- a/src/c/eval.d +++ b/src/c/eval.d @@ -224,6 +224,12 @@ 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; diff --git a/src/c/numbers/minus.d b/src/c/numbers/minus.d index d92646852..045e5c919 100644 --- a/src/c/numbers/minus.d +++ b/src/c/numbers/minus.d @@ -68,7 +68,6 @@ 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); diff --git a/src/c/numbers/times.d b/src/c/numbers/times.d index 40f0c9dc9..110e6e8a2 100644 --- a/src/c/numbers/times.d +++ b/src/c/numbers/times.d @@ -141,13 +141,9 @@ 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; diff --git a/src/c/read.d b/src/c/read.d index 174d789bf..90a0a5267 100644 --- a/src/c/read.d +++ b/src/c/read.d @@ -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_fixnum dim, dimcount, i; + cl_index 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); @) diff --git a/src/c/string.d b/src/c/string.d index 2807a209a..87c1ac8fa 100644 --- a/src/c/string.d +++ b/src/c/string.d @@ -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)