[PATCH] Unconditionally use REG_EXTENDED

Tom Tromey tromey@adacore.com
Fri Oct 2 16:26:47 GMT 2020


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.

gdb/ChangeLog
2020-10-02  Tom Tromey  <tromey@adacore.com>

	* 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/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.26.2



More information about the Gdb-patches mailing list