diff options
author | Pedro Alves <pedro@palves.net> | 2022-10-17 17:12:20 +0100 |
---|---|---|
committer | Pedro Alves <pedro@palves.net> | 2022-10-19 15:32:36 +0100 |
commit | f34652de0b68c4ee3050828b43a2839b852b5821 (patch) | |
tree | 851720f14f2ac022c3e82428254edf161d619e91 /gdbsupport/common-exceptions.cc | |
parent | 5c831a3c7f3ca98d6aba1200353311e1a1f84c70 (diff) | |
download | binutils-gdb-f34652de0b68c4ee3050828b43a2839b852b5821.tar.gz |
internal_error: remove need to pass __FILE__/__LINE__
Currently, every internal_error call must be passed __FILE__/__LINE__
explicitly, like:
internal_error (__FILE__, __LINE__, "foo %d", var);
The need to pass in explicit __FILE__/__LINE__ is there probably
because the function predates widespread and portable variadic macros
availability. We can use variadic macros nowadays, and in fact, we
already use them in several places, including the related
gdb_assert_not_reached.
So this patch renames the internal_error function to something else,
and then reimplements internal_error as a variadic macro that expands
__FILE__/__LINE__ itself.
The result is that we now should call internal_error like so:
internal_error ("foo %d", var);
Likewise for internal_warning.
The patch adjusts all calls sites. 99% of the adjustments were done
with a perl/sed script.
The non-mechanical changes are in gdbsupport/errors.h,
gdbsupport/gdb_assert.h, and gdb/gdbarch.py.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
Change-Id: Ia6f372c11550ca876829e8fd85048f4502bdcf06
Diffstat (limited to 'gdbsupport/common-exceptions.cc')
-rw-r--r-- | gdbsupport/common-exceptions.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdbsupport/common-exceptions.cc b/gdbsupport/common-exceptions.cc index 2d686c4ee65..a9bda756d49 100644 --- a/gdbsupport/common-exceptions.cc +++ b/gdbsupport/common-exceptions.cc @@ -74,7 +74,7 @@ exceptions_state_mc (enum catcher_action action) catchers.front ().state = CATCHER_RUNNING; return 1; default: - internal_error (__FILE__, __LINE__, _("bad state")); + internal_error (_("bad state")); } case CATCHER_RUNNING: switch (action) @@ -90,7 +90,7 @@ exceptions_state_mc (enum catcher_action action) /* See also throw_exception. */ return 1; default: - internal_error (__FILE__, __LINE__, _("bad switch")); + internal_error (_("bad switch")); } case CATCHER_RUNNING_1: switch (action) @@ -106,7 +106,7 @@ exceptions_state_mc (enum catcher_action action) /* See also throw_exception. */ return 1; default: - internal_error (__FILE__, __LINE__, _("bad switch")); + internal_error (_("bad switch")); } case CATCHER_ABORTING: switch (action) @@ -119,10 +119,10 @@ exceptions_state_mc (enum catcher_action action) return 0; } default: - internal_error (__FILE__, __LINE__, _("bad state")); + internal_error (_("bad state")); } default: - internal_error (__FILE__, __LINE__, _("bad switch")); + internal_error (_("bad switch")); } } |