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 99aa185ad8599f06a134b5745f67a0c57fb7f7df..3e3bed2f861b0d92b810b9f5019596aad8237f78 100644 (file)
--- 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;