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

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

diff --git a/citadel/textclient/rooms.c b/citadel/textclient/rooms.c
index 5fbc76c7f78c210fd8b7657d2c26fd8eddf2aa9a..34f1fea19a2f30029af5432af09d5be0d7955455 100644 (file)
--- a/citadel/textclient/rooms.c
+++ b/citadel/textclient/rooms.c
@@ -1,9 +1,21 @@
 /*
- * $Id$
- *
- * 
  * Client-side functions which perform room operations
  *
+ * Copyright (c) 1987-2010 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -776,7 +788,7 @@ int save_buffer(void *file, size_t filelen, const char *pathname)
 
        fp = fopen(pathname, "w");
        if (!fp) {
-               err_printf("Cannot open '%s': %s\n", pathname, strerror(errno));
+               scr_printf("Cannot open '%s': %s\n", pathname, strerror(errno));
                return 0;
        }
        do {
@@ -787,7 +799,7 @@ int save_buffer(void *file, size_t filelen, const char *pathname)
        fclose(fp);
 
        if (bytes_written < filelen) {
-               err_printf("Trouble saving '%s': %s\n", pathname,
+               scr_printf("Trouble saving '%s': %s\n", pathname,
                                strerror(errno));
                return 0;
        }
@@ -1242,10 +1254,9 @@ void do_edit(CtdlIPC *ipc,
                stty_ctdl(0);
                screen_set();
        } else {
-               scr_printf("Entering %s.  "
-                       "Press return twice when finished.\n", desc);
+               scr_printf("Entering %s.  Press return twice when finished.\n", desc);
                fp = fopen(temp, "r+");
-               citedit(ipc, fp);
+               citedit(fp);
                fclose(fp);
        }