Update for Simon's from_backend changes.

git-svn-id: svn://svn.tartarus.org/sgt/putty@3111 cda61777-01e9-0310-a592-d414129be87e

diff --git a/mac/macevlog.c b/mac/macevlog.c
index 60283ed..5e3cf12 100644 (file)
--- a/mac/macevlog.c
+++ b/mac/macevlog.c
@@ -1,4 +1,4 @@
-/* $Id: macevlog.c,v 1.6 2003/03/29 23:07:55 ben Exp $ */
+/* $Id: macevlog.c,v 1.7 2003/04/12 21:06:34 ben Exp $ */
 /*
  * Copyright (c) 2003 Ben Harris
  * All rights reserved.
@@ -101,16 +101,9 @@ void mac_freeeventlog(Session *s)
     }
 }
 
-/*
- * FIXME: logevent() should be passed a frontend handle, but backends have to
- * have a terminal handle instead, because they pass it to from_backend(),
- * so we accept a terminal handle here as well, and hope no-one tries to call
- * us with sensible arguments.
- */
 void logevent(void *frontend, char *str)
 {
-    Terminal *term = frontend;
-    Session *s = term->frontend;
+    Session *s = frontend;
     ListBounds bounds, visible;
     Cell cell = { 0, 0 };
 

diff --git a/mac/macterm.c b/mac/macterm.c
index b9478e9..b9b3f9e 100644 (file)
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1,4 +1,4 @@
-/* $Id: macterm.c,v 1.72 2003/03/29 23:07:55 ben Exp $ */
+/* $Id: macterm.c,v 1.73 2003/04/12 21:06:34 ben Exp $ */
 /*
  * Copyright (c) 1999 Simon Tatham
  * Copyright (c) 1999, 2002 Ben Harris
@@ -157,7 +157,7 @@ void mac_startsession(Session *s)
     s->logctx = log_init(s->term, &s->cfg);
     term_provide_logctx(s->term, s->logctx);
 
-    errmsg = s->back->init(s->term, &s->backhandle, &s->cfg, s->cfg.host,
+    errmsg = s->back->init(s, &s->backhandle, &s->cfg, s->cfg.host,
                           s->cfg.port, &s->realhost, s->cfg.tcp_nodelay);
     if (errmsg != NULL)
        fatalbox("%s", errmsg);
@@ -1847,6 +1847,13 @@ int askappend(void *frontend, Filename filename)
     return 2;
 }
 
+int from_backend(void *frontend, int is_stderr, const char *data, int len)
+{
+    Session *s = frontend;
+
+    return term_data(s->term, is_stderr, data, len);
+}
+
 /*
  * Emacs magic:
  * Local Variables: