Removed err_* and sln_* functions; replaced all calls with scr_* functions.

[citadel.git] / citadel / textclient / screen.c

diff --git a/citadel/textclient/screen.c b/citadel/textclient/screen.c
index 44fa8dfa6037e92b688778bb42b3482e3582b75a..dfc38a4ab943fb12c386aaa26f93f70633a3db84 100644 (file)
--- a/citadel/textclient/screen.c
+++ b/citadel/textclient/screen.c
@@ -85,36 +85,6 @@ int screen_reset(void)
  * scr_printf() outputs to the terminal
  */
 int scr_printf(char *fmt, ...)
-{
-       va_list ap;
-       register int retval;
-
-       va_start(ap, fmt);
-       retval = vprintf(fmt, ap);
-       va_end(ap);
-       return retval;
-}
-
-
-/*
- * err_printf() outputs to error status window (or stderr if not in curses)
- */
-int err_printf(char *fmt, ...)
-{
-       va_list ap;
-       register int retval;
-
-       va_start(ap, fmt);
-       retval = vfprintf(stderr, fmt, ap);
-       va_end(ap);
-       return retval;
-}
-
-
-/*
- * sln_printf() outputs to error status window (or stderr if not in curses)
- */
-int sln_printf(char *fmt, ...)
 {
        va_list ap;
        register int retval;
@@ -126,15 +96,8 @@ int sln_printf(char *fmt, ...)
 
 
 /*
- * sln_printf_if() outputs to status window, no output if not in curses
+ * Read one character from the terminal
  */
-int sln_printf_if(char *fmt, ...)
-{
-       register int retval = 1;
-       return retval;
-}
-
-
 int scr_getc(int delay)
 {
        unsigned char buf;
@@ -145,7 +108,7 @@ int scr_getc(int delay)
 }
 
 /*
- * scr_putc() outputs a single character
+ * Output one character to the terminal
  */
 int scr_putc(int c)
 {
@@ -155,18 +118,6 @@ int scr_putc(int c)
 }
 
 
-int sln_putc(int c)
-{
-       return putc(c, stdout);
-}
-
-
-int sln_putc_if(int c)
-{
-       return 1;
-}
-
-
 /*
  * scr_color() sets the window color for mainwindow
  */
@@ -182,17 +133,6 @@ void scr_flush(void)
 }
 
 
-void err_flush(void)
-{
-               fflush(stderr);
-}
-
-
-void sln_flush(void)
-{
-       fflush(stdout);
-}
-
 static volatile int caught_sigwinch = 0;
 
 /*