Prefer xpalloc to doubling buffers by hand

* src/lread.c (grow_read_buffer): New function, which uses xpalloc.
(read1): Use it for simplicity.
* src/macros.c (store_kbd_macro_char):
* src/minibuf.c (read_minibuf_noninteractive):
* src/term.c (encode_terminal_code):
* src/xrdb.c (magic_db):
Prefer xpalloc to growing buffers by hand.
This doesn’t fix any bugs, but simplifies the code a bit.

1 files changed, 5 insertions, 10 deletions

diff --git a/src/macros.c b/src/macros.c
index d963838069b..7c6ab2efc30 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -184,16 +184,11 @@ store_kbd_macro_char (Lisp_Object c)
     {
       if (kb->kbd_macro_ptr - kb->kbd_macro_buffer == kb->kbd_macro_bufsize)
         {
-          ptrdiff_t ptr_offset, end_offset, nbytes;
-
-          ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer;
-          end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer;
-          if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *kb->kbd_macro_buffer / 2
-              < kb->kbd_macro_bufsize)
-            memory_full (SIZE_MAX);
-          nbytes = kb->kbd_macro_bufsize * (2 * sizeof *kb->kbd_macro_buffer);
-          kb->kbd_macro_buffer = xrealloc (kb->kbd_macro_buffer, nbytes);
-          kb->kbd_macro_bufsize *= 2;
+          ptrdiff_t ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer;
+          ptrdiff_t end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer;
+          kb->kbd_macro_buffer = xpalloc (kb->kbd_macro_buffer,
+                                          &kb->kbd_macro_bufsize,
+                                          1, -1, sizeof *kb->kbd_macro_buffer);
           kb->kbd_macro_ptr = kb->kbd_macro_buffer + ptr_offset;
           kb->kbd_macro_end = kb->kbd_macro_buffer + end_offset;
         }