2012-12-18 Hui Zhu <hui_zhu@mentor.com>

	* ui-file.c (set_ui_file_flush): Change flush to flush_ptr.
	(set_ui_file_isatty): Change isatty to isatty_ptr.
	(set_ui_file_rewind): Change rewind to rewind_ptr.
	(set_ui_file_put): Change put to put_ptr.
	(set_ui_file_write): Change write to write_ptr.
	(set_ui_file_write_async_safe): Change write_async_safe to
	write_async_safe_ptr.
	(set_ui_file_read): Change read to read_ptr.
	(set_ui_file_fputs): Change fputs to fputs_ptr.
	(set_ui_file_data): Change delete to delete_ptr.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7558559b5df1509773225b7001247c1be1573e4c..b1dcaf151084e7616411a8a69073fc7274d55ed6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2012-12-18  Hui Zhu  <hui_zhu@mentor.com>
+
+       * ui-file.c (set_ui_file_flush): Change flush to flush_ptr.
+       (set_ui_file_isatty): Change isatty to isatty_ptr.
+       (set_ui_file_rewind): Change rewind to rewind_ptr.
+       (set_ui_file_put): Change put to put_ptr.
+       (set_ui_file_write): Change write to write_ptr.
+       (set_ui_file_write_async_safe): Change write_async_safe to
+       write_async_safe_ptr.
+       (set_ui_file_read): Change read to read_ptr.
+       (set_ui_file_fputs): Change fputs to fputs_ptr.
+       (set_ui_file_data): Change delete to delete_ptr.
+
 2012-12-18  Joel Brobecker  <brobecker@adacore.com>
 
        * solib-darwin.c (darwin_current_sos): Fix indentation.

diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index 68089e60dab82f2c1716e95e0a69746d353eac5a..657a3fc3fe990bc580a2aeb9663eea2348d6cd66 100644 (file)
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -234,61 +234,61 @@ fputs_unfiltered (const char *buf, struct ui_file *file)
 }
 
 void
-set_ui_file_flush (struct ui_file *file, ui_file_flush_ftype *flush)
+set_ui_file_flush (struct ui_file *file, ui_file_flush_ftype *flush_ptr)
 {
-  file->to_flush = flush;
+  file->to_flush = flush_ptr;
 }
 
 void
-set_ui_file_isatty (struct ui_file *file, ui_file_isatty_ftype *isatty)
+set_ui_file_isatty (struct ui_file *file, ui_file_isatty_ftype *isatty_ptr)
 {
-  file->to_isatty = isatty;
+  file->to_isatty = isatty_ptr;
 }
 
 void
-set_ui_file_rewind (struct ui_file *file, ui_file_rewind_ftype *rewind)
+set_ui_file_rewind (struct ui_file *file, ui_file_rewind_ftype *rewind_ptr)
 {
-  file->to_rewind = rewind;
+  file->to_rewind = rewind_ptr;
 }
 
 void
-set_ui_file_put (struct ui_file *file, ui_file_put_ftype *put)
+set_ui_file_put (struct ui_file *file, ui_file_put_ftype *put_ptr)
 {
-  file->to_put = put;
+  file->to_put = put_ptr;
 }
 
 void
 set_ui_file_write (struct ui_file *file,
-                   ui_file_write_ftype *write)
+                   ui_file_write_ftype *write_ptr)
 {
-  file->to_write = write;
+  file->to_write = write_ptr;
 }
 
 void
 set_ui_file_write_async_safe (struct ui_file *file,
-                             ui_file_write_async_safe_ftype *write_async_safe)
+                             ui_file_write_async_safe_ftype *write_async_safe_ptr)
 {
-  file->to_write_async_safe = write_async_safe;
+  file->to_write_async_safe = write_async_safe_ptr;
 }
 
 void
-set_ui_file_read (struct ui_file *file, ui_file_read_ftype *read)
+set_ui_file_read (struct ui_file *file, ui_file_read_ftype *read_ptr)
 {
-  file->to_read = read;
+  file->to_read = read_ptr;
 }
 
 void
-set_ui_file_fputs (struct ui_file *file, ui_file_fputs_ftype *fputs)
+set_ui_file_fputs (struct ui_file *file, ui_file_fputs_ftype *fputs_ptr)
 {
-  file->to_fputs = fputs;
+  file->to_fputs = fputs_ptr;
 }
 
 void
 set_ui_file_data (struct ui_file *file, void *data,
-                 ui_file_delete_ftype *delete)
+                 ui_file_delete_ftype *delete_ptr)
 {
   file->to_data = data;
-  file->to_delete = delete;
+  file->to_delete = delete_ptr;
 }
 
 /* ui_file utility function for converting a ``struct ui_file'' into