From 4f83758119ddf0f114477760d79bdde7bbc76835 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 10 Jan 2020 20:06:11 +0000 Subject: [PATCH] Revert 'Remove unused struct serial::name field' This commit reverts: commit 5f5219fc34f7557296272230123a3837960a6f09 Author: Pedro Alves AuthorDate: Tue Apr 12 16:49:30 2016 +0100 Remove unused struct serial::name field The following patches will add uses for the field. gdb/ChangeLog: 2020-01-10 Pedro Alves Revert: 2016-04-12 Pedro Alves * serial.c (serial_open, serial_fdopen_ops, do_serial_close): Remove references to name. * serial.h (struct serial) : Delete. --- gdb/ChangeLog | 8 ++++++++ gdb/serial.c | 4 ++++ gdb/serial.h | 1 + 3 files changed, 13 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d6769667dc..7d15993f92 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2020-01-10 Pedro Alves + + Revert: + 2016-04-12 Pedro Alves + * serial.c (serial_open, serial_fdopen_ops, do_serial_close): + Remove references to name. + * serial.h (struct serial) : Delete. + 2020-01-10 Pedro Alves * gdbarch-selftests.c (register_to_value_test): Remove "target diff --git a/gdb/serial.c b/gdb/serial.c index 804ef18267..a1c3b91c7c 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -247,6 +247,7 @@ serial_open_ops_1 (const struct serial_ops *ops, const char *open_name) return NULL; } + scb->name = open_name != NULL ? xstrdup (open_name) : NULL; scb->next = scb_base; scb_base = scb; @@ -291,6 +292,7 @@ serial_fdopen_ops (const int fd, const struct serial_ops *ops) scb = new_serial (ops); + scb->name = NULL; scb->next = scb_base; scb_base = scb; @@ -330,6 +332,8 @@ do_serial_close (struct serial *scb, int really_close) if (really_close) scb->ops->close (scb); + xfree (scb->name); + /* For serial_is_open. */ scb->bufp = NULL; diff --git a/gdb/serial.h b/gdb/serial.h index 446b896345..8d67c4bf53 100644 --- a/gdb/serial.h +++ b/gdb/serial.h @@ -240,6 +240,7 @@ struct serial buffer. -ve for sticky errors. */ unsigned char *bufp; /* Current byte */ unsigned char buf[BUFSIZ]; /* Da buffer itself */ + char *name; /* The name of the device or host */ struct serial *next; /* Pointer to the next `struct serial *' */ int debug_p; /* Trace this serial devices operation. */ int async_state; /* Async internal state. */ -- 2.34.1