This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [RFC] Wording of "catch syscall <number>" warning
On Friday 25 September 2009, Sérgio Durigan Júnior wrote:
> On Friday 25 September 2009, Tom Tromey wrote:
> > >>>>> "Sérgio" == Sérgio Durigan Júnior <sergiodj@linux.vnet.ibm.com>
> > >>>>> writes:
> >
> > Sérgio> + return _sysinfo == NULL ? 0 : 1;
> >
> > I hadn't noticed this in the syscall patches before, but I think
> > starting a name with "_" is mildly bad. Those names are reserved for
> > the system.
>
> I addressed all the issues. Please, take a look at this patch.
Actually, not all of them. Sorry, I forgot to remove the extra warning from
breakpoint.c. Now the patch is complete.
Thanks,
--
Sérgio Durigan Júnior
Linux on Power Toolchain - Software Engineer
Linux Technology Center - LTC
IBM Brazil
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 811cdfb..da05eb3 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7479,17 +7479,7 @@ catch_syscall_split_args (char *arg)
/* Check if the user provided a syscall name or a number. */
syscall_number = (int) strtol (cur_name, &endptr, 0);
if (*endptr == '\0')
- {
- get_syscall_by_number (syscall_number, &s);
-
- if (s.name == NULL)
- /* We can issue just a warning, but still create the catchpoint.
- This is because, even not knowing the syscall name that
- this number represents, we can still try to catch the syscall
- number. */
- warning (_("The number '%d' does not represent a known syscall."),
- syscall_number);
- }
+ get_syscall_by_number (syscall_number, &s);
else
{
/* We have a name. Let's check if it's valid and convert it
diff --git a/gdb/xml-syscall.c b/gdb/xml-syscall.c
index 15bfe6f..9ac0947 100644
--- a/gdb/xml-syscall.c
+++ b/gdb/xml-syscall.c
@@ -114,7 +114,7 @@ struct syscall_parsing_data
/* Structure used to store information about the available syscalls in
the system. */
-static const struct syscalls_info *_sysinfo = NULL;
+static const struct syscalls_info *sysinfo = NULL;
/* A flag to tell if we already initialized the structure above. */
static int have_initialized_sysinfo = 0;
@@ -275,10 +275,7 @@ xml_init_syscalls_info (const char *filename)
full_file = xml_fetch_content_from_file (filename, gdb_datadir);
if (full_file == NULL)
- {
- warning (_("Could not open \"%s\""), filename);
- return NULL;
- }
+ return NULL;
back_to = make_cleanup (xfree, full_file);
@@ -300,27 +297,23 @@ init_sysinfo (void)
/* Did we already try to initialize the structure? */
if (have_initialized_sysinfo)
return;
-/* if (xml_syscall_file == NULL)
- internal_error (__FILE__, __LINE__,
- _("This architecture has not set the XML syscall file "
- "name. This is a bug and should not happen; please "
- "report it.")); */
- _sysinfo = xml_init_syscalls_info (xml_syscall_file);
+ sysinfo = xml_init_syscalls_info (xml_syscall_file);
have_initialized_sysinfo = 1;
- if (_sysinfo == NULL)
+ if (sysinfo == NULL)
{
if (xml_syscall_file)
- /* The initialization failed. Let's show a warning
- message to the user (just this time) and leave. */
- warning (_("Could not load the syscall XML file `%s'.\n\
-GDB will not be able to display syscall names."), xml_syscall_file);
+ warning (_("\
+Could not load the syscall XML file `%s'."), xml_syscall_file);
else
- /* There's no file to open. Let's warn the user. */
- warning (_("There is no XML file to open.\n\
-GDB will not be able to display syscall names."));
+ warning (_("\
+There is no XML file to open."));
+
+ warning (_("\
+GDB will not be able to display syscall names nor to verify if\n\
+any provided syscall numbers are valid."));
}
}
@@ -408,7 +401,7 @@ get_syscall_by_number (int syscall_number,
init_sysinfo ();
s->number = syscall_number;
- s->name = xml_get_syscall_name (_sysinfo, syscall_number);
+ s->name = xml_get_syscall_name (sysinfo, syscall_number);
}
void
@@ -417,7 +410,7 @@ get_syscall_by_name (const char *syscall_name,
{
init_sysinfo ();
- s->number = xml_get_syscall_number (_sysinfo, syscall_name);
+ s->number = xml_get_syscall_number (sysinfo, syscall_name);
s->name = syscall_name;
}
@@ -426,7 +419,7 @@ get_syscall_names (void)
{
init_sysinfo ();
- return xml_list_of_syscalls (_sysinfo);
+ return xml_list_of_syscalls (sysinfo);
}
#endif /* ! HAVE_LIBEXPAT */