aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/cli/cli-utils.c8
-rw-r--r--gdb/cli/cli-utils.h5
-rw-r--r--gdb/defs.h5
-rw-r--r--gdb/utils.c9
5 files changed, 20 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f0e6130..30caec4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 30 15:43:08 2001 Andrew Cagney <cagney@cygnus.com>
+
+ * cli/cli-utils.c (putchar_filtered): Move function from here.
+ * utils.c (putchar_filtered): To here.
+ * cli/cli-utils.h (putchar_filtered): Move declaration from here.
+ * defs.h (putchar_filtered): To here.
+
Tue Jan 30 17:27:11 2001 Andrew Cagney <cagney@redhat.com>
* configure.in (AC_CHECK_FUNCS): Replace vfork test with
diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c
index 29019ec..396d6ea 100644
--- a/gdb/cli/cli-utils.c
+++ b/gdb/cli/cli-utils.c
@@ -19,11 +19,3 @@
#include "defs.h"
#include "cli/cli-utils.h"
-/* Write character C to gdb_stdout using GDB's paging mechanism and return C.
- May return nonlocally. */
-
-int
-putchar_filtered (int c)
-{
- return fputc_filtered (c, gdb_stdout);
-}
diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h
index 313caf4..115af8b 100644
--- a/gdb/cli/cli-utils.h
+++ b/gdb/cli/cli-utils.h
@@ -19,9 +19,4 @@
#if !defined (CLI_UTILS_H)
# define CLI_UTILS_H 1
-/* Write character C to gdb_stdout using GDB's paging mechanism and return C.
- May return nonlocally. */
-
-extern int putchar_filtered (int c);
-
#endif /* !defined (CLI_UTILS_H) */
diff --git a/gdb/defs.h b/gdb/defs.h
index b061280..092f21c 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -435,7 +435,8 @@ extern struct ui_file *gdb_stdtarg;
#include "ui-file.h"
-/* More generic printf like operations */
+/* More generic printf like operations. Filtered versions may return
+ non-locally on error. */
extern void fputs_filtered (const char *, struct ui_file *);
@@ -445,6 +446,8 @@ extern int fputc_filtered (int c, struct ui_file *);
extern int fputc_unfiltered (int c, struct ui_file *);
+extern int putchar_filtered (int c);
+
extern int putchar_unfiltered (int c);
extern void puts_filtered (const char *);
diff --git a/gdb/utils.c b/gdb/utils.c
index 9cfdd3f..98bee73 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1857,6 +1857,15 @@ putchar_unfiltered (int c)
return c;
}
+/* Write character C to gdb_stdout using GDB's paging mechanism and return C.
+ May return nonlocally. */
+
+int
+putchar_filtered (int c)
+{
+ return fputc_filtered (c, gdb_stdout);
+}
+
int
fputc_unfiltered (int c, struct ui_file *stream)
{