diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:44:31 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:44:31 +0200 |
commit | e9b8556ec92039396e740620238d56a3748f2a99 (patch) | |
tree | 385b7948c18d92d69e21935d3071db7393cea2fa /libguile/gdbint.c | |
parent | ea4f8ea13f1e9b9d25330251f69d6e9a49e107b4 (diff) | |
parent | 7337d56d5714227865aeca2b40b6bd97cce296d2 (diff) | |
download | guile-e9b8556ec92039396e740620238d56a3748f2a99.tar.gz |
Merge commit '7337d56d5714227865aeca2b40b6bd97cce296d2' into boehm-demers-weiser-gc
Conflicts:
libguile/struct.c
Diffstat (limited to 'libguile/gdbint.c')
-rw-r--r-- | libguile/gdbint.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libguile/gdbint.c b/libguile/gdbint.c index 1062b9915..b1ec99d2e 100644 --- a/libguile/gdbint.c +++ b/libguile/gdbint.c @@ -103,9 +103,6 @@ int scm_print_carefully_p; static SCM gdb_input_port; static int port_mark_p, stream_mark_p, string_mark_p; -static SCM tok_buf; -static int tok_buf_mark_p; - static SCM gdb_output_port; @@ -194,10 +191,9 @@ gdb_read (char *str) scm_puts (str, gdb_input_port); scm_truncate_file (gdb_input_port, SCM_UNDEFINED); scm_seek (gdb_input_port, SCM_INUM0, scm_from_int (SEEK_SET)); + /* Read one object */ - tok_buf_mark_p = SCM_GC_MARK_P (tok_buf); - SCM_CLEAR_GC_MARK (tok_buf); - ans = scm_lreadr (&tok_buf, gdb_input_port, &ans); + ans = scm_read (gdb_input_port); if (SCM_GC_P) { if (SCM_NIMP (ans)) @@ -212,8 +208,6 @@ gdb_read (char *str) if (SCM_NIMP (ans)) scm_permanent_object (ans); exit: - if (tok_buf_mark_p) - SCM_SET_GC_MARK (tok_buf); remark_port (gdb_input_port); SCM_END_FOREIGN_BLOCK; return status; @@ -305,8 +299,6 @@ scm_init_gdbint () SCM_OPN | SCM_RDNG | SCM_WRTNG, s); gdb_input_port = scm_permanent_object (port); - - tok_buf = scm_permanent_object (scm_c_make_string (30, SCM_UNDEFINED)); } /* |