Skip to content

Commit 7d21071

Browse files
committed
Fixes msvc warnings
``` [build] [88/235 31% :: 2.167] Building C object jerry-core\CMakeFiles\jerry-core.dir\api\jerryscript.c.obj [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\api\jerryscript.c(3239): warning C4028: formal parameter 1 different from declaration [build] [89/235 32% :: 2.171] Building C object jerry-core\CMakeFiles\jerry-core.dir\ecma\base\ecma-helpers-conversion.c.obj [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\ecma\base\ecma-helpers-conversion.c(295): warning C4028: formal parameter 2 different from declaration [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\ecma\base\ecma-helpers-conversion.c(724): warning C4146: unary minus operator applied to unsigned type, result still unsigned [build] [187/235 74% :: 4.786] Building C object jerry-core\CMakeFiles\jerry-core.dir\lit\lit-char-helpers.c.obj [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\lit\lit-char-helpers.c(141): warning C4018: '<=': signed/unsigned mismatch [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\lit\lit-char-helpers.c(517): warning C4028: formal parameter 2 different from declaration [build] [210/235 83% :: 5.284] Building C object jerry-core\CMakeFiles\jerry-core.dir\parser\js\js-scanner-util.c.obj [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\parser\js\js-scanner-util.c(2257): warning C4090: 'function': different 'const' qualifiers [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\parser\js\js-scanner-util.c(2486): warning C4090: 'function': different 'const' qualifiers ``` The following warnings can not be fixed properly by direct cast, as byte code can resident in ready-only ROM, looking for suggestion. ``` [build] [207/235 82% :: 5.305] Building C object jerry-core\CMakeFiles\jerry-core.dir\parser\js\js-scanner-util.c.obj [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\parser\js\js-scanner-util.c(2257): warning C4090: 'function': different 'const' qualifiers [build] E:\CI-Cor\acrop\acrop-deps\acrop-jerry\jerryscript\jerry-core\parser\js\js-scanner-util.c(2486): warning C4090: 'function': different 'const' qualifiers ``` The code is ``` memcpy (&literal.char_p, data_p + 2 + 1, sizeof (uintptr_t)); ``` JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo [email protected]
1 parent d00f481 commit 7d21071

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

jerry-core/ecma/base/ecma-helpers-conversion.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ ecma_number_to_uint32 (ecma_number_t num) /**< ecma-number */
721721
JERRY_ASSERT (num_in_uint32_range < uint64_2_pow_32);
722722
uint32_t uint32_num = (uint32_t) num_in_uint32_range;
723723

724-
const uint32_t ret = sign ? -uint32_num : uint32_num;
724+
const uint32_t ret = sign ? (0 - uint32_num) : uint32_num;
725725

726726
#ifndef JERRY_NDEBUG
727727
if (sign && uint32_num != 0)

jerry-core/ecma/base/ecma-helpers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ bool ecma_delete_native_pointer_property (ecma_object_t *obj_p, const jerry_obje
505505
/* ecma-helpers-conversion.c */
506506
ecma_number_t ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, lit_utf8_size_t str_size, uint32_t option);
507507
ecma_number_t ecma_utf8_string_to_number_by_radix (const lit_utf8_byte_t *str_p,
508-
lit_utf8_size_t str_size,
508+
const lit_utf8_size_t str_size,
509509
uint32_t radix,
510510
uint32_t option);
511511
lit_utf8_size_t ecma_uint32_to_utf8_string (uint32_t value, lit_utf8_byte_t *out_buffer_p, lit_utf8_size_t buffer_size);

jerry-core/include/jerryscript-core.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ jerry_value_t jerry_object_find_own (const jerry_value_t object,
602602
* @{
603603
*/
604604
jerry_value_t jerry_object_delete (jerry_value_t object, const jerry_value_t key);
605-
jerry_value_t jerry_object_delete_sz (const jerry_value_t object, const char *key_p);
605+
jerry_value_t jerry_object_delete_sz (jerry_value_t object, const char *key_p);
606606
jerry_value_t jerry_object_delete_index (jerry_value_t object, uint32_t index);
607607
bool jerry_object_delete_internal (jerry_value_t object, const jerry_value_t key);
608608
bool jerry_object_delete_native_ptr (jerry_value_t object, const jerry_object_native_info_t *native_info_p);

jerry-core/lit/lit-char-helpers.c

+8-7
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,13 @@ lit_char_is_white_space (lit_code_point_t c) /**< code point */
136136
return true;
137137
}
138138

139-
return (c <= LIT_UTF16_CODE_UNIT_MAX
140-
&& ((c >= lit_unicode_white_space_interval_starts[0]
141-
&& c <= lit_unicode_white_space_interval_starts[0] + lit_unicode_white_space_interval_lengths[0])
142-
|| lit_search_char_in_array ((ecma_char_t) c,
143-
lit_unicode_white_space_chars,
144-
NUM_OF_ELEMENTS (lit_unicode_white_space_chars))));
139+
return (
140+
c <= LIT_UTF16_CODE_UNIT_MAX
141+
&& ((c >= lit_unicode_white_space_interval_starts[0]
142+
&& c <= (uint32_t) (lit_unicode_white_space_interval_starts[0] + lit_unicode_white_space_interval_lengths[0]))
143+
|| lit_search_char_in_array ((ecma_char_t) c,
144+
lit_unicode_white_space_chars,
145+
NUM_OF_ELEMENTS (lit_unicode_white_space_chars))));
145146
} /* lit_char_is_white_space */
146147

147148
/**
@@ -513,7 +514,7 @@ lit_char_hex_lookup (const lit_utf8_byte_t *buf_p, /**< buffer */
513514
*/
514515
uint32_t
515516
lit_parse_decimal (const lit_utf8_byte_t **buffer_p, /**< [in/out] character buffer */
516-
const lit_utf8_byte_t *buffer_end_p) /**< buffer end */
517+
const lit_utf8_byte_t *const buffer_end_p) /**< buffer end */
517518
{
518519
const lit_utf8_byte_t *current_p = *buffer_p;
519520
JERRY_ASSERT (lit_char_is_decimal_digit (*current_p));

0 commit comments

Comments
 (0)