diff options
| author | Paul Eggert | 2011-05-30 09:47:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-30 09:47:35 -0700 |
| commit | 531b01656f89e093b9fa35959fa41e534b025320 (patch) | |
| tree | 190b5a279e0e8e0130b6ba070fa217ce1282e2f3 /src/lisp.h | |
| parent | de677ace77fa48962be80b668662a7009498e5d6 (diff) | |
| download | emacs-531b01656f89e093b9fa35959fa41e534b025320.tar.gz emacs-531b01656f89e093b9fa35959fa41e534b025320.zip | |
[ChangeLog]
Malloc failure behavior now depends on size of allocation.
* lib/allocator.h (struct allocator.die): New size arg.
* lib/careadlinkat.c (careadlinkat): Pass size to 'die' function.
If the actual problem is an ssize_t limitation, not a size_t or
malloc failure, fail with errno == ENAMETOOLONG instead of calling 'die'.
[src/ChangeLog]
Malloc failure behavior now depends on size of allocation.
* alloc.c (buffer_memory_full, memory_full): New arg NBYTES.
* lisp.h: Change signatures accordingly.
* alloc.c, buffer.c, editfns.c, menu.c, minibuf.c, xterm.c:
All callers changed.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h index 26d09c6d555..ceaf7f49eb2 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2685,8 +2685,8 @@ extern void allocate_string_data (struct Lisp_String *, EMACS_INT, EMACS_INT); | |||
| 2685 | extern void reset_malloc_hooks (void); | 2685 | extern void reset_malloc_hooks (void); |
| 2686 | extern void uninterrupt_malloc (void); | 2686 | extern void uninterrupt_malloc (void); |
| 2687 | extern void malloc_warning (const char *); | 2687 | extern void malloc_warning (const char *); |
| 2688 | extern void memory_full (void) NO_RETURN; | 2688 | extern void memory_full (size_t) NO_RETURN; |
| 2689 | extern void buffer_memory_full (void) NO_RETURN; | 2689 | extern void buffer_memory_full (EMACS_INT) NO_RETURN; |
| 2690 | extern int survives_gc_p (Lisp_Object); | 2690 | extern int survives_gc_p (Lisp_Object); |
| 2691 | extern void mark_object (Lisp_Object); | 2691 | extern void mark_object (Lisp_Object); |
| 2692 | #if defined REL_ALLOC && !defined SYSTEM_MALLOC | 2692 | #if defined REL_ALLOC && !defined SYSTEM_MALLOC |