diff --git a/src/globals.h b/src/globals.h index a65a91eb1..0dc8318b9 100644 --- a/src/globals.h +++ b/src/globals.h @@ -54,7 +54,7 @@ typedef enum ERR_INT_LITERAL = -7, ERR_STRING = -8, ERR_PARSER = -9, - ERR_MEMORY = -10, + ERR_OUT_OF_MEMORY = -10, ERR_SYSCALL = -11, ERR_UNHANDLED_EXCEPTION = -12, ERR_UNIMPLEMENTED_CASE = -118, diff --git a/src/libcoreint/opcodes-native-call.c b/src/libcoreint/opcodes-native-call.c index 81e8bd89d..7ee07cc43 100644 --- a/src/libcoreint/opcodes-native-call.c +++ b/src/libcoreint/opcodes-native-call.c @@ -133,7 +133,7 @@ opfunc_native_call (opcode_t opdata, /**< operation data */ MEM_HEAP_ALLOC_SHORT_TERM); if (zt_str_p == NULL) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } ecma_string_to_zt_string (str_p, zt_str_p, zt_str_size); diff --git a/src/libecmaobjects/ecma-helpers-string.c b/src/libecmaobjects/ecma-helpers-string.c index 8be1c2270..333a3b5ec 100644 --- a/src/libecmaobjects/ecma-helpers-string.c +++ b/src/libecmaobjects/ecma-helpers-string.c @@ -253,7 +253,7 @@ ecma_concat_ecma_strings (ecma_string_t *string1_p, /**< first ecma-string */ if (length > ECMA_STRING_MAX_CONCATENATION_LENGTH) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } if ((int64_t) ((ecma_length_t) length) != length) @@ -421,7 +421,7 @@ ecma_string_to_number (const ecma_string_t *str_p) /**< ecma-string */ ecma_char_t *heap_buffer_p = mem_heap_alloc_block ((size_t) -bytes_copied, MEM_HEAP_ALLOC_SHORT_TERM); if (heap_buffer_p == NULL) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } bytes_copied = ecma_string_to_zt_string (str_p, @@ -717,7 +717,7 @@ ecma_compare_ecma_strings_longpath (const ecma_string_t *string1_p, /* ecma-stri ecma_char_t *heap_buffer_p = mem_heap_alloc_block ((size_t) -req_size, MEM_HEAP_ALLOC_SHORT_TERM); if (heap_buffer_p == NULL) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } ssize_t bytes_copied = ecma_string_to_zt_string (string1_p, @@ -763,7 +763,7 @@ ecma_compare_ecma_strings_longpath (const ecma_string_t *string1_p, /* ecma-stri ecma_char_t *heap_buffer_p = mem_heap_alloc_block ((size_t) -req_size, MEM_HEAP_ALLOC_SHORT_TERM); if (heap_buffer_p == NULL) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } ssize_t bytes_copied = ecma_string_to_zt_string (string2_p, @@ -918,7 +918,7 @@ ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p, /**< ecma- ecma_char_t *heap_buffer_p = mem_heap_alloc_block ((size_t) -req_size, MEM_HEAP_ALLOC_SHORT_TERM); if (heap_buffer_p == NULL) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } ssize_t bytes_copied = ecma_string_to_zt_string (string1_p, @@ -952,7 +952,7 @@ ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p, /**< ecma- ecma_char_t *heap_buffer_p = mem_heap_alloc_block ((size_t) -req_size, MEM_HEAP_ALLOC_SHORT_TERM); if (heap_buffer_p == NULL) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } ssize_t bytes_copied = ecma_string_to_zt_string (string2_p, @@ -1032,7 +1032,7 @@ ecma_string_get_char_at_pos (const ecma_string_t *string_p, /**< ecma-string */ if (zt_str_p == NULL) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } ecma_string_to_zt_string (string_p, zt_str_p, (ssize_t) buffer_size); diff --git a/src/libruntime/jerry-exit.c b/src/libruntime/jerry-exit.c index deebf80e2..02174bf28 100644 --- a/src/libruntime/jerry-exit.c +++ b/src/libruntime/jerry-exit.c @@ -86,9 +86,9 @@ jerry_exit (jerry_status_t code) /**< status code */ __printf ("ERR_PARSER\n"); break; } - case ERR_MEMORY: + case ERR_OUT_OF_MEMORY: { - __printf ("ERR_MEMORY\n"); + __printf ("ERR_OUT_OF_MEMORY\n"); break; } case ERR_SYSCALL: diff --git a/src/main.c b/src/main.c index 7dae33b7b..80ad55828 100644 --- a/src/main.c +++ b/src/main.c @@ -112,7 +112,7 @@ read_sources (const char *script_file_names[], if (source_buffer_tail + current_source_size >= source_buffer + sizeof (source_buffer)) { - jerry_exit (ERR_MEMORY); + jerry_exit (ERR_OUT_OF_MEMORY); } size_t bytes_read = __fread (source_buffer, 1, current_source_size, file);