From 4311246bb1f94ca323b0cf74e917d2b8d3a87565 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Fri, 1 Apr 2022 19:04:48 -0600
Subject: [PATCH] Return void from gdb_putc

I don't think it's very useful to return the character from gdb_putc,
so this patch changes it to return void.
---
 gdb/ui-file.c | 3 +--
 gdb/ui-file.h | 2 +-
 gdb/utils.c   | 7 ++-----
 gdb/utils.h   | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index afb12b408f5..47044e42a67 100644
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -60,12 +60,11 @@ ui_file::putstrn (const char *str, int n, int quoter, bool async_safe)
     printchar (str[i], quoter, async_safe);
 }
 
-int
+void
 ui_file::putc (int c)
 {
   char copy = (char) c;
   write (&copy, 1);
-  return c;
 }
 
 void
diff --git a/gdb/ui-file.h b/gdb/ui-file.h
index 4c9ce1aaa0c..e33ae79e753 100644
--- a/gdb/ui-file.h
+++ b/gdb/ui-file.h
@@ -51,7 +51,7 @@ public:
      write_async_safe method.  */
   void putstrn (const char *str, int n, int quoter, bool async_safe = false);
 
-  int putc (int c);
+  void putc (int c);
 
   void vprintf (const char *, va_list) ATTRIBUTE_PRINTF (2, 0);
 
diff --git a/gdb/utils.c b/gdb/utils.c
index 2465bf3a3ed..f9dc4f23431 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1838,16 +1838,13 @@ fputs_highlighted (const char *str, const compiled_regex &highlight,
     gdb_puts (str, stream);
 }
 
-/* Write character C to gdb_stdout using GDB's paging mechanism and return C.
-   May return nonlocally.  */
-
-int
+void
 gdb_putc (int c)
 {
   return gdb_stdout->putc (c);
 }
 
-int
+void
 gdb_putc (int c, struct ui_file *stream)
 {
   return stream->putc (c);
diff --git a/gdb/utils.h b/gdb/utils.h
index c1ac85497bf..7e2028580bf 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -224,9 +224,9 @@ extern void set_screen_width_and_height (int width, int height);
 
 extern void gdb_puts (const char *, struct ui_file *);
 
-extern int gdb_putc (int c, struct ui_file *);
+extern void gdb_putc (int c, struct ui_file *);
 
-extern int gdb_putc (int c);
+extern void gdb_putc (int c);
 
 extern void gdb_puts (const char *);
 
-- 
2.30.2