summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/ports.c30
-rw-r--r--libguile/ports.h6
2 files changed, 18 insertions, 18 deletions
diff --git a/libguile/ports.c b/libguile/ports.c
index 70fdcc0f2..45085e887 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -444,7 +444,7 @@ swap_port (SCM scm_data)
}
static void
-scm_with_current_foo_port (SCM port,
+scm_frame_current_foo_port (SCM port,
SCM (*getter) (void), SCM (*setter) (SCM))
{
SCM scm_data = scm_malloc_obj (sizeof (swap_data));
@@ -453,32 +453,32 @@ scm_with_current_foo_port (SCM port,
data->getter = getter;
data->setter = setter;
- scm_on_rewind_with_scm (swap_port, scm_data, SCM_F_WIND_EXPLICITLY);
- scm_on_unwind_with_scm (swap_port, scm_data, SCM_F_WIND_EXPLICITLY);
+ scm_frame_rewind_with_scm (swap_port, scm_data, SCM_F_WIND_EXPLICITLY);
+ scm_frame_unwind_with_scm (swap_port, scm_data, SCM_F_WIND_EXPLICITLY);
}
void
-scm_with_current_input_port (SCM port)
+scm_frame_current_input_port (SCM port)
{
- scm_with_current_foo_port (port,
- scm_current_input_port,
- scm_set_current_input_port);
+ scm_frame_current_foo_port (port,
+ scm_current_input_port,
+ scm_set_current_input_port);
}
void
-scm_with_current_output_port (SCM port)
+scm_frame_current_output_port (SCM port)
{
- scm_with_current_foo_port (port,
- scm_current_output_port,
- scm_set_current_output_port);
+ scm_frame_current_foo_port (port,
+ scm_current_output_port,
+ scm_set_current_output_port);
}
void
-scm_with_current_error_port (SCM port)
+scm_frame_current_error_port (SCM port)
{
- scm_with_current_foo_port (port,
- scm_current_error_port,
- scm_set_current_error_port);
+ scm_frame_current_foo_port (port,
+ scm_current_error_port,
+ scm_set_current_error_port);
}
diff --git a/libguile/ports.h b/libguile/ports.h
index 796ccf87e..8dffade07 100644
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -235,9 +235,9 @@ SCM_API SCM scm_current_load_port (void);
SCM_API SCM scm_set_current_input_port (SCM port);
SCM_API SCM scm_set_current_output_port (SCM port);
SCM_API SCM scm_set_current_error_port (SCM port);
-SCM_API void scm_with_current_input_port (SCM port);
-SCM_API void scm_with_current_output_port (SCM port);
-SCM_API void scm_with_current_error_port (SCM port);
+SCM_API void scm_frame_current_input_port (SCM port);
+SCM_API void scm_frame_current_output_port (SCM port);
+SCM_API void scm_frame_current_error_port (SCM port);
SCM_API SCM scm_new_port_table_entry (scm_t_bits tag);
SCM_API void scm_remove_from_port_table (SCM port);
SCM_API void scm_grow_port_cbuf (SCM port, size_t requested);