aboutsummaryrefslogtreecommitdiff
path: root/gdbserver
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2022-12-16 07:59:52 -0700
committerTom Tromey <tom@tromey.com>2023-02-24 11:52:48 -0700
commit71a64d8ba873b5618e357e85d6536d6fdd466aa6 (patch)
treef2fe0dd18337ddb3d1184155526eb9e37dc4b779 /gdbserver
parent873a185be258ad2552b9579005852815b4da5baf (diff)
downloadgdb-71a64d8ba873b5618e357e85d6536d6fdd466aa6.zip
gdb-71a64d8ba873b5618e357e85d6536d6fdd466aa6.tar.gz
gdb-71a64d8ba873b5618e357e85d6536d6fdd466aa6.tar.bz2
Don't use struct buffer in handle_qxfer_threads
This changes handle_qxfer_threads, in gdbserver, to use std::string rather than struct buffer.
Diffstat (limited to 'gdbserver')
-rw-r--r--gdbserver/server.cc45
1 files changed, 17 insertions, 28 deletions
diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index 1505aca..949849b 100644
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -1639,7 +1639,7 @@ handle_qxfer_statictrace (const char *annex,
Emit the XML to describe the thread of INF. */
static void
-handle_qxfer_threads_worker (thread_info *thread, struct buffer *buffer)
+handle_qxfer_threads_worker (thread_info *thread, std::string *buffer)
{
ptid_t ptid = ptid_of (thread);
char ptid_s[100];
@@ -1658,34 +1658,34 @@ handle_qxfer_threads_worker (thread_info *thread, struct buffer *buffer)
write_ptid (ptid_s, ptid);
- buffer_xml_printf (buffer, "<thread id=\"%s\"", ptid_s);
+ string_xml_appendf (*buffer, "<thread id=\"%s\"", ptid_s);
if (core != -1)
{
sprintf (core_s, "%d", core);
- buffer_xml_printf (buffer, " core=\"%s\"", core_s);
+ string_xml_appendf (*buffer, " core=\"%s\"", core_s);
}
if (name != NULL)
- buffer_xml_printf (buffer, " name=\"%s\"", name);
+ string_xml_appendf (*buffer, " name=\"%s\"", name);
if (handle_status)
{
char *handle_s = (char *) alloca (handle_len * 2 + 1);
bin2hex (handle, handle_s, handle_len);
- buffer_xml_printf (buffer, " handle=\"%s\"", handle_s);
+ string_xml_appendf (*buffer, " handle=\"%s\"", handle_s);
}
- buffer_xml_printf (buffer, "/>\n");
+ string_xml_appendf (*buffer, "/>\n");
}
/* Helper for handle_qxfer_threads. Return true on success, false
otherwise. */
static bool
-handle_qxfer_threads_proper (struct buffer *buffer)
+handle_qxfer_threads_proper (std::string *buffer)
{
- buffer_grow_str (buffer, "<threads>\n");
+ *buffer += "<threads>\n";
/* The target may need to access memory and registers (e.g. via
libthread_db) to fetch thread properties. Even if don't need to
@@ -1705,7 +1705,7 @@ handle_qxfer_threads_proper (struct buffer *buffer)
if (non_stop)
target_unpause_all (true);
- buffer_grow_str0 (buffer, "</threads>\n");
+ *buffer += "</threads>\n";
return true;
}
@@ -1716,8 +1716,7 @@ handle_qxfer_threads (const char *annex,
gdb_byte *readbuf, const gdb_byte *writebuf,
ULONGEST offset, LONGEST len)
{
- static char *result = 0;
- static unsigned int result_length = 0;
+ static std::string result;
if (writebuf != NULL)
return -2;
@@ -1727,37 +1726,27 @@ handle_qxfer_threads (const char *annex,
if (offset == 0)
{
- struct buffer buffer;
/* When asked for data at offset 0, generate everything and store into
'result'. Successive reads will be served off 'result'. */
- if (result)
- free (result);
-
- buffer_init (&buffer);
-
- bool res = handle_qxfer_threads_proper (&buffer);
+ result.clear ();
- result = buffer_finish (&buffer);
- result_length = strlen (result);
- buffer_free (&buffer);
+ bool res = handle_qxfer_threads_proper (&result);
if (!res)
return -1;
}
- if (offset >= result_length)
+ if (offset >= result.length ())
{
/* We're out of data. */
- free (result);
- result = NULL;
- result_length = 0;
+ result.clear ();
return 0;
}
- if (len > result_length - offset)
- len = result_length - offset;
+ if (len > result.length () - offset)
+ len = result.length () - offset;
- memcpy (readbuf, result + offset, len);
+ memcpy (readbuf, result.c_str () + offset, len);
return len;
}