diff options
| author | Paul Eggert | 2011-05-30 09:09:29 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-30 09:09:29 -0700 |
| commit | 3687c2efb7e7a5b6afbf87588a248431ccc8dd65 (patch) | |
| tree | cf4fa238fafdd7a4087ac6f2febe1ccf2c63dd16 /src/alloc.c | |
| parent | 5ab33f2b8a7184d062c33bc43b1bfd3fe990e3b5 (diff) | |
| download | emacs-3687c2efb7e7a5b6afbf87588a248431ccc8dd65.tar.gz emacs-3687c2efb7e7a5b6afbf87588a248431ccc8dd65.zip | |
* alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c index 3f7bed571c7..8215cc53cd3 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -993,13 +993,11 @@ lisp_align_malloc (size_t nbytes, enum mem_type type) | |||
| 993 | free_ablock = free_ablock->x.next_free; | 993 | free_ablock = free_ablock->x.next_free; |
| 994 | 994 | ||
| 995 | #if GC_MARK_STACK && !defined GC_MALLOC_CHECK | 995 | #if GC_MARK_STACK && !defined GC_MALLOC_CHECK |
| 996 | if (val && type != MEM_TYPE_NON_LISP) | 996 | if (type != MEM_TYPE_NON_LISP) |
| 997 | mem_insert (val, (char *) val + nbytes, type); | 997 | mem_insert (val, (char *) val + nbytes, type); |
| 998 | #endif | 998 | #endif |
| 999 | 999 | ||
| 1000 | MALLOC_UNBLOCK_INPUT; | 1000 | MALLOC_UNBLOCK_INPUT; |
| 1001 | if (!val && nbytes) | ||
| 1002 | memory_full (); | ||
| 1003 | 1001 | ||
| 1004 | eassert (0 == ((uintptr_t) val) % BLOCK_ALIGN); | 1002 | eassert (0 == ((uintptr_t) val) % BLOCK_ALIGN); |
| 1005 | return val; | 1003 | return val; |