aboutsummaryrefslogtreecommitdiff
path: root/readline
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-10-07 15:29:57 -0600
committerTom Tromey <tom@tromey.com>2019-08-12 10:57:56 -0600
commitc15a79c78cc0111296b487de3fa59365f13df3bc (patch)
tree1df2d8f7c1429c9bcf70f1e006649daec73dd399 /readline
parenta2d4e4b70945c1704e5249ad6a9be9d5875a4b0e (diff)
downloadgdb-c15a79c78cc0111296b487de3fa59365f13df3bc.zip
gdb-c15a79c78cc0111296b487de3fa59365f13df3bc.tar.gz
gdb-c15a79c78cc0111296b487de3fa59365f13df3bc.tar.bz2
Remove gdb workaround from readline/xfree.c
There is a gdb-local patch to deal with interrupts during completion. The original thread adding this patch is here: https://sourceware.org/ml/gdb-patches/2011-06/msg00147.html I believe readline now implements the approach suggested by Chet Ramey: https://sourceware.org/ml/gdb-patches/2011-06/msg00493.html So, I believe this patch can be removed. readline/ChangeLog.gdb 2018-10-07 Tom Tromey <tom@tromey.com> * Makefile.in (xfree.o): Don't depend on readline.h. * xfree.c (xfree): Remove gdb workaround. * xmalloc.h (xfree): Remove #define.
Diffstat (limited to 'readline')
-rw-r--r--readline/ChangeLog.gdb6
-rw-r--r--readline/Makefile.in2
-rw-r--r--readline/xfree.c7
-rw-r--r--readline/xmalloc.h3
4 files changed, 7 insertions, 11 deletions
diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index cecdc5e..6937880 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,5 +1,11 @@
2019-08-12 Tom Tromey <tom@tromey.com>
+ * Makefile.in (xfree.o): Don't depend on readline.h.
+ * xfree.c (xfree): Remove gdb workaround.
+ * xmalloc.h (xfree): Remove #define.
+
+2018-08-12 Tom Tromey <tom@tromey.com>
+
* emacs_keymap.c: Remove gdb workaround.
2018-08-12 Tom Tromey <tom@tromey.com>
diff --git a/readline/Makefile.in b/readline/Makefile.in
index 0916d33..1adfc28 100644
--- a/readline/Makefile.in
+++ b/readline/Makefile.in
@@ -437,7 +437,7 @@ vi_mode.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
vi_mode.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h
vi_mode.o: history.h ansi_stdlib.h rlstdc.h
xfree.o: ${BUILD_DIR}/config.h
-xfree.o: ansi_stdlib.h readline.h
+xfree.o: ansi_stdlib.h
xmalloc.o: ${BUILD_DIR}/config.h
xmalloc.o: ansi_stdlib.h
diff --git a/readline/xfree.c b/readline/xfree.c
index d3af7d9..37a81e6 100644
--- a/readline/xfree.c
+++ b/readline/xfree.c
@@ -31,10 +31,7 @@
# include "ansi_stdlib.h"
#endif /* HAVE_STDLIB_H */
-#include <stdio.h>
-
#include "xmalloc.h"
-#include "readline.h"
/* **************************************************************** */
/* */
@@ -48,10 +45,6 @@ void
xfree (string)
PTR_T string;
{
- /* Leak a bit. */
- if (RL_ISSTATE(RL_STATE_SIGHANDLER))
- return;
-
if (string)
free (string);
}
diff --git a/readline/xmalloc.h b/readline/xmalloc.h
index 0fb6a19..f40d7a5 100644
--- a/readline/xmalloc.h
+++ b/readline/xmalloc.h
@@ -38,9 +38,6 @@
#endif /* !PTR_T */
-/* xmalloc and xrealloc should be also protected from RL_STATE_SIGHANDLER. */
-#define xfree xfree_readline
-
extern PTR_T xmalloc PARAMS((size_t));
extern PTR_T xrealloc PARAMS((void *, size_t));
extern void xfree PARAMS((void *));