diff --git a/src/liballocator/mem-heap.c b/src/liballocator/mem-heap.c index 56dadd17c..747ee85dc 100644 --- a/src/liballocator/mem-heap.c +++ b/src/liballocator/mem-heap.c @@ -35,12 +35,12 @@ #ifndef JERRY_NVALGRIND # include "memcheck.h" -# define VALGRIND_NOACCESS_STRUCT( s) VALGRIND_MAKE_MEM_NOACCESS( ( s ), sizeof( *( s ) ) ) -# define VALGRIND_UNDEFINED_STRUCT( s) VALGRIND_MAKE_MEM_UNDEFINED( ( s ), sizeof( *( s ) ) ) -# define VALGRIND_DEFINED_STRUCT( s) VALGRIND_MAKE_MEM_DEFINED( ( s ), sizeof( *( s ) ) ) -# define VALGRIND_NOACCESS_SPACE( p, s) VALGRIND_MAKE_MEM_NOACCESS( ( p ), ( s ) ) -# define VALGRIND_UNDEFINED_SPACE( p, s) VALGRIND_MAKE_MEM_UNDEFINED( ( p ), ( s ) ) -# define VALGRIND_DEFINED_SPACET( p, s) VALGRIND_MAKE_MEM_DEFINED( ( p ), ( s ) ) +# define VALGRIND_NOACCESS_STRUCT( s) (void)VALGRIND_MAKE_MEM_NOACCESS( ( s ), sizeof( *( s ) ) ) +# define VALGRIND_UNDEFINED_STRUCT( s) (void)VALGRIND_MAKE_MEM_UNDEFINED( ( s ), sizeof( *( s ) ) ) +# define VALGRIND_DEFINED_STRUCT( s) (void)VALGRIND_MAKE_MEM_DEFINED( ( s ), sizeof( *( s ) ) ) +# define VALGRIND_NOACCESS_SPACE( p, s) (void)VALGRIND_MAKE_MEM_NOACCESS( ( p ), ( s ) ) +# define VALGRIND_UNDEFINED_SPACE( p, s) (void)VALGRIND_MAKE_MEM_UNDEFINED( ( p ), ( s ) ) +# define VALGRIND_DEFINED_SPACET( p, s) (void)VALGRIND_MAKE_MEM_DEFINED( ( p ), ( s ) ) #else /* !JERRRY_NVALGRIND */ # define VALGRIND_NOACCESS_STRUCT( s) # define VALGRIND_UNDEFINED_STRUCT( s) diff --git a/src/libruntime/target/linux/jerry-libc.c b/src/libruntime/target/linux/jerry-libc.c index c7ee6ecfa..798e96dbc 100644 --- a/src/libruntime/target/linux/jerry-libc.c +++ b/src/libruntime/target/linux/jerry-libc.c @@ -351,12 +351,11 @@ __fwrite(const void *ptr, /**< data to write */ size_t nmemb, /**< number of elements */ _FILE *stream) /**< stream pointer */ { - long int ret; size_t bytes_written = 0; do { - ret = syscall_3( __NR_write, (long int)stream, (long int) ((uint8_t*)ptr + bytes_written), (long int) (size * nmemb - bytes_written)); + long int ret = syscall_3( __NR_write, (long int)stream, (long int) ((uint8_t*)ptr + bytes_written), (long int) (size * nmemb - bytes_written)); bytes_written += (size_t)ret; } while (bytes_written != size * nmemb);