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.

diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index afb12b408f5f154eb71ca872971e84bf2f484ebd..47044e42a676c60fd02e11436281909b234dbed1 100644 (file)
--- 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 4c9ce1aaa0cbbb139913f9031ed9bb5850ad073d..e33ae79e75341c37c86d8d40290d67084e599abc 100644 (file)
--- 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 2465bf3a3edc12cb49ab61ce46b1583950b5920a..f9dc4f234310c6bda1807a27507ee56f05472e13 100644 (file)
--- 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 c1ac85497bfbb0b7d28a3a479fc450db41242ece..7e2028580bf72c202eec248283ea992167ab4073 100644 (file)
--- 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 *);