Rename 'scm_i_get_byte_or_eof' et al; mark them as SCM_API.

* libguile/ports.c (scm_i_get_byte_or_eof, scm_i_peek_byte_or_eof):
  Rename to 'scm_slow_get_byte_or_eof' and 'scm_slow_peek_byte_or_eof',
  respectively.

* libguile/ports.h (scm_i_get_byte_or_eof, scm_i_peek_byte_or_eof):
  Rename to 'scm_slow_get_byte_or_eof' and 'scm_slow_peek_byte_or_eof',
  respectively, and mark them as SCM_API.

* libguile/inline.h (scm_get_byte_or_eof, scm_peek_byte_or_eof): Adjust
  to use the new names.

diff --git a/libguile/inline.h b/libguile/inline.h
index 17d8a0c..0d1a634 100644 (file)
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -102,7 +102,7 @@ scm_get_byte_or_eof (SCM port)
                   && pt->read_pos < pt->read_end))
     return *pt->read_pos++;
   else
-    return scm_i_get_byte_or_eof (port);
+    return scm_slow_get_byte_or_eof (port);
 }
 
 /* Like `scm_get_byte_or_eof' but does not change PORT's `read_pos'.  */
@@ -115,7 +115,7 @@ scm_peek_byte_or_eof (SCM port)
                   && pt->read_pos < pt->read_end))
     return *pt->read_pos;
   else
-    return scm_i_peek_byte_or_eof (port);
+    return scm_slow_peek_byte_or_eof (port);
 }
 
 SCM_INLINE_IMPLEMENTATION void

diff --git a/libguile/ports.c b/libguile/ports.c
index af563c8..51145e6 100644 (file)
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -1455,7 +1455,7 @@ scm_fill_input (SCM port)
 
 /* Slow-path fallback for 'scm_get_byte_or_eof' in inline.h */
 int
-scm_i_get_byte_or_eof (SCM port)
+scm_slow_get_byte_or_eof (SCM port)
 {
   scm_t_port *pt = SCM_PTAB_ENTRY (port);
 
@@ -1476,7 +1476,7 @@ scm_i_get_byte_or_eof (SCM port)
 
 /* Slow-path fallback for 'scm_peek_byte_or_eof' in inline.h */
 int
-scm_i_peek_byte_or_eof (SCM port)
+scm_slow_peek_byte_or_eof (SCM port)
 {
   scm_t_port *pt = SCM_PTAB_ENTRY (port);
 

diff --git a/libguile/ports.h b/libguile/ports.h
index 54bf595..ca5bf2f 100644 (file)
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -328,8 +328,8 @@ scm_i_default_port_conversion_handler (void);
 /* Use HANDLER as the default conversion strategy for future ports.  */
 SCM_INTERNAL void
 scm_i_set_default_port_conversion_handler (scm_t_string_failed_conversion_handler);
-SCM_INTERNAL int scm_i_get_byte_or_eof (SCM port);
-SCM_INTERNAL int scm_i_peek_byte_or_eof (SCM port);
+SCM_API int scm_slow_get_byte_or_eof (SCM port);
+SCM_API int scm_slow_peek_byte_or_eof (SCM port);
 
 SCM_API SCM scm_port_conversion_strategy (SCM port);
 SCM_API SCM scm_set_port_conversion_strategy_x (SCM port, SCM behavior);