public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Don't use struct buffer in event-top.c
@ 2023-02-24 19:05 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2023-02-24 19:05 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=356628ee2a1ac34e705697967105dfbbcd7fd033
commit 356628ee2a1ac34e705697967105dfbbcd7fd033
Author: Tom Tromey <tom@tromey.com>
Date: Fri Dec 16 12:45:40 2022 -0700
Don't use struct buffer in event-top.c
This changes event-top.c to use std::string rather than struct buffer.
This isn't completely ideal, in that it requires a copy of the string
to be made.
Diff:
---
gdb/event-top.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 14984707df1..f0a3f0d418c 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -36,7 +36,6 @@
#include "gdbcmd.h" /* for dont_repeat() */
#include "annotate.h"
#include "maint.h"
-#include "gdbsupport/buffer.h"
#include "ser-event.h"
#include "gdbsupport/gdb_select.h"
#include "gdbsupport/gdb-sigmask.h"
@@ -868,12 +867,9 @@ void
gdb_readline_no_editing_callback (gdb_client_data client_data)
{
int c;
- char *result;
- struct buffer line_buffer;
+ std::string line_buffer;
struct ui *ui = current_ui;
- buffer_init (&line_buffer);
-
FILE *stream = ui->instream != nullptr ? ui->instream : ui->stdin_stream;
gdb_assert (stream != nullptr);
@@ -893,32 +889,28 @@ gdb_readline_no_editing_callback (gdb_client_data client_data)
if (c == EOF)
{
- if (line_buffer.used_size > 0)
+ if (!line_buffer.empty ())
{
/* The last line does not end with a newline. Return it, and
if we are called again fgetc will still return EOF and
we'll return NULL then. */
break;
}
- xfree (buffer_finish (&line_buffer));
ui->input_handler (NULL);
return;
}
if (c == '\n')
{
- if (line_buffer.used_size > 0
- && line_buffer.buffer[line_buffer.used_size - 1] == '\r')
- line_buffer.used_size--;
+ if (!line_buffer.empty () && line_buffer.back () == '\r')
+ line_buffer.pop_back ();
break;
}
- buffer_grow_char (&line_buffer, c);
+ line_buffer += c;
}
- buffer_grow_char (&line_buffer, '\0');
- result = buffer_finish (&line_buffer);
- ui->input_handler (gdb::unique_xmalloc_ptr<char> (result));
+ ui->input_handler (make_unique_xstrdup (line_buffer.c_str ()));
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-24 19:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-24 19:05 [binutils-gdb] Don't use struct buffer in event-top.c Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).