commit 785e5700ce4bda469e323d1dc7eeae9d86980c79
author Tom Tromey <tom@tromey.com> Sun Jun 27 11:06:04 2021 -0600
committer Tom Tromey <tom@tromey.com> Fri Jul 30 08:42:39 2021 -0600
tree a16c1cce4eec5f386703f3587a2c26a020c5a494
parent fb6262e8534e0148a4a424e9e5138159af19faf1

Replace exception_print_same with operator!=

I noticed that exception_print_same is only used in a single spot, and
it seemed to be better as an operator!= method attached to
gdb_exception.

Regression tested on x86-64 Fedora 34.

gdb/exceptions.c

diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index 32db6fe..5245b7c 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -133,17 +133,3 @@
       print_exception (file, e);
     }
 }
-
-/* See exceptions.h.  */
-
-int
-exception_print_same (const struct gdb_exception &e1,
-		      const struct gdb_exception &e2)
-{
-  const char *msg1 = e1.message == nullptr ? "" : e1.what ();
-  const char *msg2 = e2.message == nullptr ? "" : e2.what ();
-
-  return (e1.reason == e2.reason
-	  && e1.error == e2.error
-	  && strcmp (msg1, msg2) == 0);
-}

gdb/exceptions.h

diff --git a/gdb/exceptions.h b/gdb/exceptions.h
index b0416d4..8bd2dcc 100644
--- a/gdb/exceptions.h
+++ b/gdb/exceptions.h
@@ -31,7 +31,4 @@
 			       const char *prefix,
 			       ...) ATTRIBUTE_PRINTF (3, 4);
 
-/* Compare two exception objects for print equality.  */
-extern int exception_print_same (const struct gdb_exception &e1,
-				 const struct gdb_exception &e2);
 #endif

gdb/exec.c

diff --git a/gdb/exec.c b/gdb/exec.c
index 35bf7bd..a28336b 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -201,7 +201,7 @@
 	}
       catch (const gdb_exception_error &err)
 	{
-	  if (!exception_print_same (prev_err, err))
+	  if (prev_err != err)
 	    warning ("%s", err.what ());
 	}
     }

gdbsupport/common-exceptions.h

diff --git a/gdbsupport/common-exceptions.h b/gdbsupport/common-exceptions.h
index 92f43d2..5933c73 100644
--- a/gdbsupport/common-exceptions.h
+++ b/gdbsupport/common-exceptions.h
@@ -165,6 +165,23 @@
     return message->c_str ();
   }
 
+  /* Compare two exceptions.  */
+  bool operator== (const gdb_exception &other) const
+  {
+    const char *msg1 = message == nullptr ? "" : what ();
+    const char *msg2 = other.message == nullptr ? "" : other.what ();
+
+    return (reason == other.reason
+	    && error == other.error
+	    && strcmp (msg1, msg2) == 0);
+  }
+
+  /* Compare two exceptions.  */
+  bool operator!= (const gdb_exception &other) const
+  {
+    return !(*this == other);
+  }
+
   enum return_reason reason;
   enum errors error;
   std::shared_ptr<std::string> message;