From: Tom Tromey <tom@tromey.com>
Date: Sat, 30 Apr 2022 20:19:44 +0000 (-0600)
Subject: Add constructor to solib_catchpoint
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4874f776caf053b708d7f76d6b72a8846f2ca219;p=binutils-gdb.git

Add constructor to solib_catchpoint

This adds a constructor to solib_catchpoint and simplifies the caller.
---

diff --git a/gdb/break-catch-load.c b/gdb/break-catch-load.c
index 99aa185ad85..3e3bed2f861 100644
--- a/gdb/break-catch-load.c
+++ b/gdb/break-catch-load.c
@@ -35,6 +35,15 @@
 
 struct solib_catchpoint : public breakpoint
 {
+  solib_catchpoint (bool is_load_, const char *arg)
+    : is_load (is_load_),
+      regex (arg == nullptr ? nullptr : make_unique_xstrdup (arg)),
+      compiled (arg == nullptr
+		? nullptr
+		: new compiled_regex (arg, REG_NOSUB, _("Invalid regexp")))
+  {
+  }
+
   int insert_location (struct bp_location *) override;
   int remove_location (struct bp_location *,
 		       enum remove_bp_reason reason) override;
@@ -216,17 +225,11 @@ add_solib_catchpoint (const char *arg, bool is_load, bool is_temp, bool enabled)
   if (!arg)
     arg = "";
   arg = skip_spaces (arg);
+  if (*arg == '\0')
+    arg = nullptr;
 
-  std::unique_ptr<solib_catchpoint> c (new solib_catchpoint ());
-
-  if (*arg != '\0')
-    {
-      c->compiled.reset (new compiled_regex (arg, REG_NOSUB,
-					     _("Invalid regexp")));
-      c->regex = make_unique_xstrdup (arg);
-    }
+  std::unique_ptr<solib_catchpoint> c (new solib_catchpoint (is_load, arg));
 
-  c->is_load = is_load;
   init_catchpoint (c.get (), gdbarch, is_temp, NULL);
 
   c->enable_state = enabled ? bp_enabled : bp_disabled;