From 65e2f7407ad73ad4089ba9f7793b7e30e924a789 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 9 Jul 2001 14:38:49 +0000 Subject: [PATCH] s/struct _serial_t/struct serial/ --- gdb/ChangeLog | 7 +++++++ gdb/serial.c | 7 +++++-- gdb/serial.h | 8 ++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e361e6e0df2..bb8f62b58ec 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2001-07-09 Andrew Cagney + + * serial.h (struct serial): Rename `struct _serial_t'. + * serial.c (XMALLOC): Define. + (serial_open): Update. Use XMALLOC. + (serial_fdopen): Ditto. + 2001-07-07 Andrew Cagney * gdbtypes.h (builtin_type_void_data_ptr): Rename diff --git a/gdb/serial.c b/gdb/serial.c index 1719f7d6c88..4dd66fc7f35 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -58,6 +58,9 @@ static const char logbase_ascii[] = "ascii"; static const char *logbase_enums[] = {logbase_hex, logbase_octal, logbase_ascii, NULL}; static const char *serial_logbase = logbase_ascii; + +#undef XMALLOC +#define XMALLOC(TYPE) ((TYPE*) xmalloc (sizeof (TYPE))) @@ -202,7 +205,7 @@ serial_open (const char *name) if (!ops) return NULL; - scb = (serial_t) xmalloc (sizeof (struct _serial_t)); + scb = XMALLOC (struct serial); scb->ops = ops; @@ -254,7 +257,7 @@ serial_fdopen (const int fd) if (!ops) return NULL; - scb = (serial_t) xmalloc (sizeof (struct _serial_t)); + scb = XMALLOC (struct serial); scb->ops = ops; diff --git a/gdb/serial.h b/gdb/serial.h index fcc4da7178c..0a8df3cfb75 100644 --- a/gdb/serial.h +++ b/gdb/serial.h @@ -29,8 +29,8 @@ interface. */ typedef void *serial_ttystate; -struct _serial_t; -typedef struct _serial_t *serial_t; +struct serial; +typedef struct serial *serial_t; /* Try to open NAME. Returns a new serial_t on success, NULL on failure. */ @@ -199,7 +199,7 @@ extern int serial_debug_p (serial_t scb); /* Details of an instance of a serial object */ -struct _serial_t +struct serial { int fd; /* File descriptor */ struct serial_ops *ops; /* Function vector */ @@ -215,7 +215,7 @@ struct _serial_t still need to wait for this many more seconds. */ char *name; /* The name of the device or host */ - struct _serial_t *next; /* Pointer to the next serial_t */ + struct serial *next; /* Pointer to the next serial_t */ int refcnt; /* Number of pointers to this block */ int debug_p; /* Trace this serial devices operation. */ int async_state; /* Async internal state. */ -- 2.30.2