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 /gdb/linux-nat.c | |
parent | 5c831a3c7f3ca98d6aba1200353311e1a1f84c70 (diff) | |
download | gdb-f34652de0b68c4ee3050828b43a2839b852b5821.zip gdb-f34652de0b68c4ee3050828b43a2839b852b5821.tar.gz gdb-f34652de0b68c4ee3050828b43a2839b852b5821.tar.bz2 |
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 'gdb/linux-nat.c')
-rw-r--r-- | gdb/linux-nat.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index d463976..f4f7aa8 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -1116,8 +1116,7 @@ linux_nat_target::attach (const char *args, int from_tty) gdb_signal_to_string (signo)); } - internal_error (__FILE__, __LINE__, - _("unexpected status %d for PID %ld"), + internal_error (_("unexpected status %d for PID %ld"), status, (long) ptid.lwp ()); } @@ -1844,11 +1843,9 @@ linux_handle_extended_wait (struct lwp_info *lp, int status) if (ret == -1) perror_with_name (_("waiting for new child")); else if (ret != new_pid) - internal_error (__FILE__, __LINE__, - _("wait returned unexpected PID %d"), ret); + internal_error (_("wait returned unexpected PID %d"), ret); else if (!WIFSTOPPED (status)) - internal_error (__FILE__, __LINE__, - _("wait returned unexpected status 0x%x"), status); + internal_error (_("wait returned unexpected status 0x%x"), status); } ptid_t child_ptid (new_pid, new_pid); @@ -1989,8 +1986,7 @@ linux_handle_extended_wait (struct lwp_info *lp, int status) return 0; } - internal_error (__FILE__, __LINE__, - _("unknown ptrace event %d"), event); + internal_error (_("unknown ptrace event %d"), event); } /* Suspend waiting for a signal. We're mostly interested in @@ -4231,7 +4227,7 @@ linux_nat_target::async (bool enable) if (enable) { if (!async_file_open ()) - internal_error (__FILE__, __LINE__, "creating event pipe failed."); + internal_error ("creating event pipe failed."); add_file_handler (async_wait_fd (), handle_target_event, NULL, "linux-nat"); |