OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new function perror_string extracted out of throw_perror_with_name.

Browse Source 
The main purpose of this patch is to extract the part of
throw_perror_with_name that computes a string providing the system
error message combined with a prefix string.  This will become useful
later on to provide a routine which prints a warning using that
perror_string, rather than throwing an error.

gdb/ChangeLog:

        * utils.c (perror_string): New function, extracted out of
        throw_perror_with_name.
        (throw_perror_with_name): Rework to use perror_string.
This commit is contained in:
Joel Brobecker 2013-10-11 08:20:10 +00:00
parent bb66bd5176
commit 0cf4063e29
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2013-11-11 Joel Brobecker <brobecker@adacore.com>
* utils.c (perror_string): New function, extracted out of
throw_perror_with_name.
(throw_perror_with_name): Rework to use perror_string.
2013-10-11 Yao Qi <yao@codesourcery.com>
* remote.c (discard_pending_stop_replies_in_queue): Update

28
gdb/utils.c
View File

@ -957,6 +957,26 @@ add_internal_problem_command (struct internal_problem *problem)
xfree (show_doc);
}
/* Return a newly allocated string, containing the PREFIX followed
by the system error message for errno (separated by a colon).
The result must be deallocated after use. */
static char *
perror_string (const char *prefix)
{
char *err;
char *combined;
err = safe_strerror (errno);
combined = (char *) xmalloc (strlen (err) + strlen (prefix) + 3);
strcpy (combined, prefix);
strcat (combined, ": ");
strcat (combined, err);
return combined;
}
/* Print the system error message for errno, and also mention STRING
as the file name for which the error was encountered. Use ERRCODE
for the thrown exception. Then return to command level. */
@ -964,14 +984,10 @@ add_internal_problem_command (struct internal_problem *problem)
void
throw_perror_with_name (enum errors errcode, const char *string)
{
char *err;
char *combined;
err = safe_strerror (errno);
combined = (char *) alloca (strlen (err) + strlen (string) + 3);
strcpy (combined, string);
strcat (combined, ": ");
strcat (combined, err);
combined = perror_string (string);
make_cleanup (xfree, combined);
/* I understand setting these is a matter of taste. Still, some people
may clear errno but not know about bfd_error. Doing this here is not