* Removed the CtdlRedirectOutput() API, as we are no longer using it.

  (Oh happy day; no more temp files!)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index f62b4184141f9e0be51a9bef8faae18765dc7326..f7a4799acd9dc912df0ddd038b6b9aabb89bad95 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 645.13  2005/04/29 16:26:00  ajc
+ * Removed the CtdlRedirectOutput() API, as we are no longer using it.
+   (Oh happy day; no more temp files!)
+
  Revision 645.12  2005/04/27 19:22:57  ajc
  * .ASG command: made better use of memory to avoid crashes
 
@@ -6633,4 +6637,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/server.h b/citadel/server.h
index b6fba598e0e5d71d9fb1f8dd3a41eba380f11f6d..8dbedcf7bbe189f3cd7344139be35f2e61350dc4 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -96,8 +96,7 @@ struct CitContext {
        /* Beginning of cryptography - session nonce */
        char cs_nonce[NONCE_SIZE];      /* The nonce for this session's next auth transaction */
 
-       /* Redirect this session's output to somewhere else? */
-       FILE *redirect_fp;              /* a file instead (will go away) */
+       /* Redirect this session's output to a memory buffer? */
        char *redirect_buffer;          /* the buffer */
        size_t redirect_len;            /* length of data in buffer */
        size_t redirect_alloc;          /* length of allocated buffer */

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 4783f7e1d89339fd651907433b6fb4d37be945ca..30247b9618c0bd701f7cde4bf807d09d78a32dc2 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -535,11 +535,6 @@ void client_write(char *buf, int nbytes)
                return;
        }
 
-       if (CC->redirect_fp != NULL) {
-               fwrite(buf, (size_t)nbytes, (size_t)1, CC->redirect_fp);
-               return;
-       }
-
 #ifndef HAVE_TCP_BUFFERING
        /* If we're buffering for later, do that now. */
        if (CC->buffering) {
@@ -889,18 +884,6 @@ void dead_session_purge(int force) {
 
 
 
-/*
- * Redirect a session's output to a file.
- * This function may be called with a file handle.
- * Call with NULL to return output to its normal client socket.
- */
-void CtdlRedirectOutput(FILE *fp)
-{
-       if (fp != NULL) CC->redirect_fp = fp;
-       else CC->redirect_fp = NULL;
-}
-
-
 /*
  * masterCC is the context we use when not attached to a session.  This
  * function initializes it.

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index d80a1baf6556cbcec932958a70f95c64af7e575e..a4d574435705e4a722e054132e31a1b457973664 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -66,7 +66,6 @@ void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
 void *worker_thread (void *arg);
 void become_session(struct CitContext *which_con);
-void CtdlRedirectOutput(FILE *fp);
 void InitializeMasterCC(void);
 void init_master_fdset(void);
 void create_worker(void);