From d55199131070963cc61871d2cac5384eb100a6c0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 2 Oct 2020 10:23:25 -0600 Subject: [PATCH] Unconditionally use REG_EXTENDED skip.c checks whether REG_EXTENDED is defined -- but this should always be available, and is used unconditionally in other parts of gdb. This patch removes this check, then further simplifies this code, removing a declaration and a repeated assertion. 2020-10-02 Tom Tromey * skip.c (skiplist_entry::skiplist_entry): Unconditionally use REG_EXTENDED. --- gdb/ChangeLog | 5 +++++ gdb/skip.c | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ca7a0caae5c..0e8bbe3bee4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-10-02 Tom Tromey + + * skip.c (skiplist_entry::skiplist_entry): Unconditionally use + REG_EXTENDED. + 2020-10-02 Simon Marchi * aix-thread.c (aix_thread_inferior_created): Remove parameters. diff --git a/gdb/skip.c b/gdb/skip.c index 419dd7a4682..e6499d619c7 100644 --- a/gdb/skip.c +++ b/gdb/skip.c @@ -139,14 +139,8 @@ skiplist_entry::skiplist_entry (bool file_is_glob, if (m_function_is_regexp) { gdb_assert (!m_function.empty ()); - - int flags = REG_NOSUB; -#ifdef REG_EXTENDED - flags |= REG_EXTENDED; -#endif - - gdb_assert (!m_function.empty ()); - m_compiled_function_regexp.emplace (m_function.c_str (), flags, + m_compiled_function_regexp.emplace (m_function.c_str (), + REG_NOSUB | REG_EXTENDED, _("regexp")); } } -- 2.30.2