diff options
| author | Damien George <damien.p.george@gmail.com> | 2017-08-31 17:00:14 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-08-31 17:00:14 +1000 |
| commit | ca21aed0a11903db04fc96056f8a08e452aaf504 (patch) | |
| tree | e413e96931940e7ca0736de4c62ac109f4435fe0 /py/malloc.c | |
| parent | 6c9fca2aa911e31f6c1b48d3b950b4dc058473d4 (diff) | |
py: Make m_malloc_fail() have void return type, since it doesn't return.
Diffstat (limited to 'py/malloc.c')
| -rw-r--r-- | py/malloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/py/malloc.c b/py/malloc.c index af4ccf2e8..ea1d4c4b9 100644 --- a/py/malloc.c +++ b/py/malloc.c @@ -74,7 +74,7 @@ STATIC void *realloc_ext(void *ptr, size_t n_bytes, bool allow_move) { void *m_malloc(size_t num_bytes) { void *ptr = malloc(num_bytes); if (ptr == NULL && num_bytes != 0) { - return m_malloc_fail(num_bytes); + m_malloc_fail(num_bytes); } #if MICROPY_MEM_STATS MP_STATE_MEM(total_bytes_allocated) += num_bytes; @@ -100,7 +100,7 @@ void *m_malloc_maybe(size_t num_bytes) { void *m_malloc_with_finaliser(size_t num_bytes) { void *ptr = malloc_with_finaliser(num_bytes); if (ptr == NULL && num_bytes != 0) { - return m_malloc_fail(num_bytes); + m_malloc_fail(num_bytes); } #if MICROPY_MEM_STATS MP_STATE_MEM(total_bytes_allocated) += num_bytes; @@ -115,7 +115,7 @@ void *m_malloc_with_finaliser(size_t num_bytes) { void *m_malloc0(size_t num_bytes) { void *ptr = m_malloc(num_bytes); if (ptr == NULL && num_bytes != 0) { - return m_malloc_fail(num_bytes); + m_malloc_fail(num_bytes); } // If this config is set then the GC clears all memory, so we don't need to. #if !MICROPY_GC_CONSERVATIVE_CLEAR @@ -131,7 +131,7 @@ void *m_realloc(void *ptr, size_t new_num_bytes) { #endif void *new_ptr = realloc(ptr, new_num_bytes); if (new_ptr == NULL && new_num_bytes != 0) { - return m_malloc_fail(new_num_bytes); + m_malloc_fail(new_num_bytes); } #if MICROPY_MEM_STATS // At first thought, "Total bytes allocated" should only grow, |