summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/ChangeLog10
-rw-r--r--libguile/init.c9
-rw-r--r--libguile/root.c6
-rw-r--r--libguile/root.h3
4 files changed, 13 insertions, 15 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index af1374da2..e36b42275 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-20 Gary Houston <ghouston@arglist.com>
+
+ * removal of unused fields in root state (thanks to Christopher
+ Cramer for pointing out the disuse.)
+ * root.h (scm_root_state): removed def_inp, def_outp, def_errp.
+ * root.c (root_mark): don't mark them.
+ (scm_make_root): don't set them to #f.
+ * init.c (scm_init_standard_ports): don't initialise with the
+ default ports.
+
2002-04-17 Marius Vollmer <mvo@zagadka.ping.de>
* Makefile.am (EXTRA_DIST): Added cpp_err_symbols.c and
diff --git a/libguile/init.c b/libguile/init.c
index 71d737e45..e4567600c 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -311,20 +311,17 @@ scm_init_standard_ports ()
buffered input on stdin can reset \ex{(current-input-port)} to
block buffering for higher performance. */
- scm_def_inp
+ scm_cur_inp
= scm_standard_stream_to_port (0,
isatty (0) ? "r0" : "r",
"standard input");
- scm_def_outp = scm_standard_stream_to_port (1,
+ scm_cur_outp = scm_standard_stream_to_port (1,
isatty (1) ? "w0" : "w",
"standard output");
- scm_def_errp = scm_standard_stream_to_port (2,
+ scm_cur_errp = scm_standard_stream_to_port (2,
isatty (2) ? "w0" : "w",
"standard error");
- scm_cur_inp = scm_def_inp;
- scm_cur_outp = scm_def_outp;
- scm_cur_errp = scm_def_errp;
scm_cur_loadp = SCM_BOOL_F;
}
diff --git a/libguile/root.c b/libguile/root.c
index f26843ea3..dd174db5b 100644
--- a/libguile/root.c
+++ b/libguile/root.c
@@ -78,9 +78,6 @@ root_mark (SCM root)
scm_gc_mark (s->cur_inp);
scm_gc_mark (s->cur_outp);
scm_gc_mark (s->cur_errp);
- scm_gc_mark (s->def_inp);
- scm_gc_mark (s->def_outp);
- scm_gc_mark (s->def_errp);
/* No need to gc mark def_loadp */
scm_gc_mark (s->fluids);
return SCM_ROOT_STATE (root) -> parent;
@@ -125,9 +122,6 @@ scm_make_root (SCM parent)
= root_state->cur_inp
= root_state->cur_outp
= root_state->cur_errp
- = root_state->def_inp
- = root_state->def_outp
- = root_state->def_errp
= root_state->cur_loadp
= root_state->fluids
= root_state->handle
diff --git a/libguile/root.h b/libguile/root.h
index ca4a7ef62..bc474039f 100644
--- a/libguile/root.h
+++ b/libguile/root.h
@@ -100,9 +100,6 @@ typedef struct scm_root_state
SCM cur_inp;
SCM cur_outp;
SCM cur_errp;
- SCM def_inp;
- SCM def_outp;
- SCM def_errp;
SCM cur_loadp;
SCM fluids;