From 63283d4a2983eaefd5d0860ddffcf946f0fe92db Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 23 Apr 2017 11:07:26 -0600 Subject: [PATCH] Remove EXT_LANG_BT_COMPLETED While looking at the frame filter code, I noticed that EXT_LANG_BT_COMPLETED is not really needed. Semantically there is no difference between the "completed" and "ok" results. So, this patch removes this constant. gdb/ChangeLog 2018-03-26 Tom Tromey * python/py-framefilter.c (py_print_frame): Return EXT_LANG_BT_OK. (gdbpy_apply_frame_filter): Update comment. * extension.h (enum ext_lang_bt_status) : Remove. : Change value. --- gdb/ChangeLog | 9 +++++++++ gdb/extension.h | 6 +----- gdb/python/py-framefilter.c | 8 ++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8f8059335c..ed5d5bedcb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2018-03-26 Tom Tromey + + * python/py-framefilter.c (py_print_frame): Return + EXT_LANG_BT_OK. + (gdbpy_apply_frame_filter): Update comment. + * extension.h (enum ext_lang_bt_status) : + Remove. + : Change value. + 2018-03-26 Tom Tromey PR backtrace/15582: diff --git a/gdb/extension.h b/gdb/extension.h index a97292875a..c675ae2446 100644 --- a/gdb/extension.h +++ b/gdb/extension.h @@ -76,13 +76,9 @@ enum ext_lang_bt_status succeeded. */ EXT_LANG_BT_OK = 1, - /* Return when the frame filter process is complete, and all - operations have succeeded. */ - EXT_LANG_BT_COMPLETED = 2, - /* Return when the frame filter process is complete, but there were no filter registered and enabled to process. */ - EXT_LANG_BT_NO_FILTERS = 3 + EXT_LANG_BT_NO_FILTERS = 2 }; /* Flags to pass to apply_extlang_frame_filter. */ diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index aae8d5decf..1dc15ae14e 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -916,7 +916,7 @@ py_print_args (PyObject *filter, containing all the frames level that have already been printed. If a frame level has been printed, do not print it again (in the case of elided frames). Returns EXT_LANG_BT_ERROR on error, with any - GDB exceptions converted to a Python exception, or EXT_LANG_BT_COMPLETED + GDB exceptions converted to a Python exception, or EXT_LANG_BT_OK on success. It can also throw an exception RETURN_QUIT. */ static enum ext_lang_bt_status @@ -969,7 +969,7 @@ py_print_frame (PyObject *filter, frame_filter_flags flags, if (py_mi_print_variables (filter, out, &opts, args_type, frame) == EXT_LANG_BT_ERROR) return EXT_LANG_BT_ERROR; - return EXT_LANG_BT_COMPLETED; + return EXT_LANG_BT_OK; } gdb::optional tuple; @@ -1270,7 +1270,7 @@ py_print_frame (PyObject *filter, frame_filter_flags flags, } } - return EXT_LANG_BT_COMPLETED; + return EXT_LANG_BT_OK; } /* Helper function to initiate frame filter invocation at starting @@ -1328,7 +1328,7 @@ bootstrap_python_frame_filters (struct frame_info *frame, format, OUT is the output stream to print. FRAME_LOW is the beginning of the slice of frames to print, and FRAME_HIGH is the upper limit of the frames to count. Returns EXT_LANG_BT_ERROR on error, - or EXT_LANG_BT_COMPLETED on success. */ + or EXT_LANG_BT_OK on success. */ enum ext_lang_bt_status gdbpy_apply_frame_filter (const struct extension_language_defn *extlang, -- 2.34.1