Patchwork [RFA] Remove a VEC from serial.c

login
register
mail settings
Submitter Tom Tromey
Date June 8, 2018, 2:57 a.m.
Message ID <20180608025701.14713-1-tom@tromey.com>
Download mbox | patch
Permalink /patch/27706/
State New
Headers show

Comments

Tom Tromey - June 8, 2018, 2:57 a.m.
This replaces a VEC in serial.c with a std::vector.

Tested by the buildbot.

gdb/ChangeLog
2018-06-07  Tom Tromey  <tom@tromey.com>

	* serial.c (serial_ops_p): Remove typedef.  Don't declare VEC.
	(serial_ops_list): Now static, std::vector.
	(serial_interface_lookup, serial_add_interface):
---
 gdb/ChangeLog |  8 +++++++-
 gdb/serial.c  | 12 +++---------
 2 files changed, 10 insertions(+), 10 deletions(-)
Simon Marchi - June 9, 2018, 12:07 p.m.
On 2018-06-07 22:57, Tom Tromey wrote:
> This replaces a VEC in serial.c with a std::vector.
> 
> Tested by the buildbot.

LGTM.

Simon

Patch

diff --git a/gdb/serial.c b/gdb/serial.c
index 48fb02d913b..16308ab9c72 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -27,12 +27,9 @@ 
 
 static unsigned int global_serial_debug_p;
 
-typedef const struct serial_ops *serial_ops_p;
-DEF_VEC_P (serial_ops_p);
-
 /* Serial I/O handlers.  */
 
-VEC (serial_ops_p) *serial_ops_list = NULL;
+static std::vector<const struct serial_ops *> serial_ops_list;
 
 /* Pointer to list of scb's.  */
 
@@ -146,10 +143,7 @@  serial_log_command (struct target_ops *self, const char *cmd)
 static const struct serial_ops *
 serial_interface_lookup (const char *name)
 {
-  const struct serial_ops *ops;
-  int i;
-
-  for (i = 0; VEC_iterate (serial_ops_p, serial_ops_list, i, ops); ++i)
+  for (const struct serial_ops *ops : serial_ops_list)
     if (strcmp (name, ops->name) == 0)
       return ops;
 
@@ -159,7 +153,7 @@  serial_interface_lookup (const char *name)
 void
 serial_add_interface (const struct serial_ops *optable)
 {
-  VEC_safe_push (serial_ops_p, serial_ops_list, optable);
+  serial_ops_list.push_back (optable);
 }
 
 /* Return the open serial device for FD, if found, or NULL if FD is