From a4155f7be84776c9f24f99c61dd29d3895d58a24 Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Tue, 17 Feb 2015 18:37:43 +0300 Subject: [PATCH] Fixing cppcheck warnings. --- core/parser/collections/array-list.cpp | 14 +++++++++----- jerry-libc/jerry-libc-defs.h | 2 +- jerry-libc/jerry-libc-fatals.c | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/core/parser/collections/array-list.cpp b/core/parser/collections/array-list.cpp index 2cd7e5cc1..4603fbf69 100644 --- a/core/parser/collections/array-list.cpp +++ b/core/parser/collections/array-list.cpp @@ -50,12 +50,16 @@ array_list_append (array_list al, void *element) if ((h->len + 1) * h->element_size + sizeof (array_list_header) > h->size) { size_t size = mem_heap_recommend_allocation_size (h->size + h->element_size); - array_list_header *temp = (array_list_header *) mem_heap_alloc_block (size, MEM_HEAP_ALLOC_SHORT_TERM); - memset (temp, 0, size); - memcpy (temp, h, h->size); - temp->size = size; + JERRY_ASSERT (size > h->size); + + uint8_t* new_block_p = (uint8_t*) mem_heap_alloc_block (size, MEM_HEAP_ALLOC_SHORT_TERM); + memcpy (new_block_p, h, h->size); + memset (new_block_p + h->size, 0, size - h->size); + mem_heap_free_block ((uint8_t *) h); - h = temp; + + h = (array_list_header *) new_block_p; + h->size = size; al = (array_list) h; } memcpy (data (al) + (h->len * h->element_size), element, h->element_size); diff --git a/jerry-libc/jerry-libc-defs.h b/jerry-libc/jerry-libc-defs.h index a03eeed27..fa5d1d15b 100644 --- a/jerry-libc/jerry-libc-defs.h +++ b/jerry-libc/jerry-libc-defs.h @@ -41,7 +41,7 @@ extern void __attr_noreturn___ libc_fatal (const char *msg, const char *file_name, const char *function_name, - const int line_number); + const unsigned int line_number); #ifndef LIBC_NDEBUG # define LIBC_ASSERT(x) do { if (__builtin_expect (!(x), 0)) { \ diff --git a/jerry-libc/jerry-libc-fatals.c b/jerry-libc/jerry-libc-fatals.c index 17ce3abf8..5a8d615c3 100644 --- a/jerry-libc/jerry-libc-fatals.c +++ b/jerry-libc/jerry-libc-fatals.c @@ -30,7 +30,7 @@ void __attr_noreturn___ libc_fatal (const char *msg, /**< fatal error description */ const char *file_name, /**< file name */ const char *function_name, /**< function name */ - const int line_number) /**< line number */ + const unsigned int line_number) /**< line number */ { if (msg != NULL && file_name != NULL