Skip to content

Commit 5826ce2

Browse files
committed
Fix: lit_utf8_size_t was used but ecma_length_t is correct
JerryScript-DCO-1.0-Signed-off-by: Akos Kiss [email protected]
1 parent d96c2ba commit 5826ce2

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2097,8 +2097,8 @@ ecma_builtin_string_prototype_object_conversion_helper (ecma_value_t this_arg, /
20972097
{
20982098
ecma_char_t character = lit_utf8_read_next (&input_str_curr_p);
20992099
ecma_char_t character_buffer[LIT_MAXIMUM_OTHER_CASE_LENGTH];
2100+
ecma_length_t character_length;
21002101
lit_utf8_byte_t utf8_byte_buffer[LIT_CESU8_MAX_BYTES_IN_CODE_POINT];
2101-
lit_utf8_size_t character_length;
21022102

21032103
if (lower_case)
21042104
{
@@ -2115,7 +2115,7 @@ ecma_builtin_string_prototype_object_conversion_helper (ecma_value_t this_arg, /
21152115

21162116
JERRY_ASSERT (character_length >= 1 && character_length <= LIT_MAXIMUM_OTHER_CASE_LENGTH);
21172117

2118-
for (lit_utf8_size_t i = 0; i < character_length; i++)
2118+
for (ecma_length_t i = 0; i < character_length; i++)
21192119
{
21202120
output_length += lit_code_unit_to_utf8 (character_buffer[i], utf8_byte_buffer);
21212121
}
@@ -2136,7 +2136,7 @@ ecma_builtin_string_prototype_object_conversion_helper (ecma_value_t this_arg, /
21362136
{
21372137
ecma_char_t character = lit_utf8_read_next (&input_str_curr_p);
21382138
ecma_char_t character_buffer[LIT_MAXIMUM_OTHER_CASE_LENGTH];
2139-
lit_utf8_size_t character_length;
2139+
ecma_length_t character_length;
21402140

21412141
if (lower_case)
21422142
{
@@ -2153,7 +2153,7 @@ ecma_builtin_string_prototype_object_conversion_helper (ecma_value_t this_arg, /
21532153

21542154
JERRY_ASSERT (character_length >= 1 && character_length <= LIT_MAXIMUM_OTHER_CASE_LENGTH);
21552155

2156-
for (lit_utf8_size_t i = 0; i < character_length; i++)
2156+
for (ecma_length_t i = 0; i < character_length; i++)
21572157
{
21582158
output_char_p += lit_code_unit_to_utf8 (character_buffer[i], output_char_p);
21592159
}

jerry-core/ecma/operations/ecma-regexp-object.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ re_canonicalize (ecma_char_t ch, /**< character */
349349
{
350350
/* 2. */
351351
ecma_char_t u[LIT_MAXIMUM_OTHER_CASE_LENGTH];
352-
lit_utf8_size_t size = lit_char_to_upper_case (ch, u, LIT_MAXIMUM_OTHER_CASE_LENGTH);
352+
ecma_length_t size = lit_char_to_upper_case (ch, u, LIT_MAXIMUM_OTHER_CASE_LENGTH);
353353

354354
/* 3. */
355355
if (size == 1)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,10 @@ lit_char_is_word_char (ecma_char_t c) /**< code unit */
353353
* @return the length of the lowercase character sequence
354354
* which is always between 1 and LIT_MAXIMUM_OTHER_CASE_LENGTH.
355355
*/
356-
lit_utf8_size_t
356+
ecma_length_t
357357
lit_char_to_lower_case (ecma_char_t character, /**< input character value */
358358
ecma_char_t *output_buffer_p, /**< [out] buffer for the result characters */
359-
size_t buffer_size) /**< buffer size */
359+
ecma_length_t buffer_size) /**< buffer size */
360360
{
361361
TODO ("Needs a proper lower case implementation. See issue #323.");
362362

@@ -387,10 +387,10 @@ lit_char_to_lower_case (ecma_char_t character, /**< input character value */
387387
* @return the length of the uppercase character sequence
388388
* which is always between 1 and LIT_MAXIMUM_OTHER_CASE_LENGTH.
389389
*/
390-
lit_utf8_size_t
390+
ecma_length_t
391391
lit_char_to_upper_case (ecma_char_t character, /**< input character value */
392392
ecma_char_t *output_buffer_p, /**< buffer for the result characters */
393-
size_t buffer_size) /**< buffer size */
393+
ecma_length_t buffer_size) /**< buffer size */
394394
{
395395
TODO ("Needs a proper upper case implementation. See issue #323.");
396396

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ extern bool lit_char_is_word_char (ecma_char_t);
234234
*/
235235
#define LIT_MAXIMUM_OTHER_CASE_LENGTH (3)
236236

237-
lit_utf8_size_t lit_char_to_lower_case (ecma_char_t, ecma_char_t *, size_t);
238-
lit_utf8_size_t lit_char_to_upper_case (ecma_char_t, ecma_char_t *, size_t);
237+
ecma_length_t lit_char_to_lower_case (ecma_char_t, ecma_char_t *, ecma_length_t);
238+
ecma_length_t lit_char_to_upper_case (ecma_char_t, ecma_char_t *, ecma_length_t);
239239

240240
#endif /* LIT_CHAR_HELPERS_H */

0 commit comments

Comments
 (0)