aboutsummaryrefslogtreecommitdiff
path: root/gdb/procfs.c
diff options
context:
space:
mode:
authorAndrew Burgess <aburgess@redhat.com>2023-09-24 13:37:06 +0100
committerAndrew Burgess <aburgess@redhat.com>2023-10-05 12:21:46 +0100
commitb09dba5a5fcf061bf93c1e5a5c9fd56928c6340c (patch)
tree77d9fcd92c4e4662ad6ae6a7b0e6a601fdf32989 /gdb/procfs.c
parent95cb8bf72b6f75e5b672131389ff7496bfa47ebe (diff)
downloadbinutils-b09dba5a5fcf061bf93c1e5a5c9fd56928c6340c.zip
binutils-b09dba5a5fcf061bf93c1e5a5c9fd56928c6340c.tar.gz
binutils-b09dba5a5fcf061bf93c1e5a5c9fd56928c6340c.tar.bz2
gdb: remove use of a static buffer for building error strings
I noticed in procfs.c that we use a static buffer for building error strings when we could easily use std::string and string_printf to achieve the same result, this commit does that. I ran into this while performing a further refactor/cleanup that will be presented in a later patch in this series, and thought this was worth splitting out into its own patch. As far as I can tell, only Solaris uses procfs.c, so I did a test build on a Solaris machine, and I don't believe that I've broken anything. There should be no user visible changes after this commit. Approved-By: Tom Tromey <tom@tromey.com>
Diffstat (limited to 'gdb/procfs.c')
-rw-r--r--gdb/procfs.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 9443b07..706ccf0 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -255,8 +255,6 @@ typedef struct procinfo {
int threads_valid: 1;
} procinfo;
-static char errmsg[128]; /* shared error msg buffer */
-
/* Function prototypes for procinfo module: */
static procinfo *find_procinfo_or_die (int pid, int tid);
@@ -595,17 +593,19 @@ static void proc_resume (procinfo *pi, ptid_t scope_ptid,
static void
proc_warn (procinfo *pi, const char *func, int line)
{
- xsnprintf (errmsg, sizeof (errmsg), "procfs: %s line %d, %s",
- func, line, pi->pathname);
- print_sys_errmsg (errmsg, errno);
+ int saved_errno = errno;
+ std::string errmsg
+ = string_printf ("procfs: %s line %d, %s", func, line, pi->pathname);
+ print_sys_errmsg (errmsg.c_str (), saved_errno);
}
static void
proc_error (procinfo *pi, const char *func, int line)
{
- xsnprintf (errmsg, sizeof (errmsg), "procfs: %s line %d, %s",
- func, line, pi->pathname);
- perror_with_name (errmsg);
+ int saved_errno = errno;
+ std::string errmsg
+ = string_printf ("procfs: %s line %d, %s", func, line, pi->pathname);
+ perror_with_name (errmsg.c_str (), saved_errno);
}
/* Updates the status struct in the procinfo. There is a 'valid'
@@ -1805,11 +1805,12 @@ do_attach (ptid_t ptid)
if (!open_procinfo_files (pi, FD_CTL))
{
- gdb_printf (gdb_stderr, "procfs:%d -- ", __LINE__);
- xsnprintf (errmsg, sizeof (errmsg),
- "do_attach: couldn't open /proc file for process %d",
- ptid.pid ());
- dead_procinfo (pi, errmsg, NOKILL);
+ int saved_errno = errno;
+ std::string errmsg
+ = string_printf ("procfs:%d -- do_attach: couldn't open /proc "
+ "file for process %d", __LINE__, ptid.pid ());
+ errno = saved_errno;
+ dead_procinfo (pi, errmsg.c_str (), NOKILL);
}
/* Stop the process (if it isn't already stopped). */