summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Gran <spk121@yahoo.com>2009-08-10 05:51:05 -0700
committerMichael Gran <spk121@yahoo.com>2009-08-10 05:51:05 -0700
commit32be5735cd89931048f12283f3977c72cd292f77 (patch)
tree3e2050a23465a04f7be5016c38ffc25b46caa6fb
parent6ce6923b6826db2f2ddc8a5f787ab57d7072f0e8 (diff)
downloadguile-32be5735cd89931048f12283f3977c72cd292f77.tar.gz
Make scm_charprint and scm_i_string_wide_chars SCM_INTERNAL.
Also, scm_charprint is renamed to scm_i_charprint. * libguile/strings.h: make scm_i_string_wide_chars internal. * libguile/print.h: rename scm_charprint to scm_i_charprint. Make internal. * libguile/print.c (scm_i_charprint): renamed from scm_charprint (scm_charprint): renamed to scm_i_charprint. All callers changed.
-rw-r--r--libguile/print.c4
-rw-r--r--libguile/print.h2
-rw-r--r--libguile/strings.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/libguile/print.c b/libguile/print.c
index 6f31fcf4a..85f030e36 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -582,7 +582,7 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate)
else if (ch == '"' || ch == '\\')
{
scm_putc ('\\', port);
- scm_charprint (ch, port);
+ scm_i_charprint (ch, port);
printed = 1;
}
else
@@ -824,7 +824,7 @@ scm_prin1 (SCM exp, SCM port, int writingp)
/* Print a character.
*/
void
-scm_charprint (scm_t_uint32 ch, SCM port)
+scm_i_charprint (scm_t_uint32 ch, SCM port)
{
scm_t_wchar *wbuf;
SCM wstr = scm_i_make_wide_string (1, &wbuf);
diff --git a/libguile/print.h b/libguile/print.h
index 1df29522c..00648efc1 100644
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -77,7 +77,7 @@ SCM_API SCM scm_print_options (SCM setting);
SCM_API SCM scm_make_print_state (void);
SCM_API void scm_free_print_state (SCM print_state);
SCM_INTERNAL SCM scm_i_port_with_print_state (SCM port, SCM print_state);
-SCM_API void scm_charprint (scm_t_uint32 c, SCM port);
+SCM_INTERNAL void scm_i_charprint (scm_t_uint32 c, SCM port);
SCM_API void scm_intprint (scm_t_intmax n, int radix, SCM port);
SCM_API void scm_uintprint (scm_t_uintmax n, int radix, SCM port);
SCM_API void scm_ipruk (char *hdr, SCM ptr, SCM port);
diff --git a/libguile/strings.h b/libguile/strings.h
index 2bbab3a16..8c06e4725 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -137,8 +137,8 @@ SCM_INTERNAL SCM scm_i_substring_shared (SCM str, size_t start, size_t end);
SCM_INTERNAL SCM scm_i_substring_copy (SCM str, size_t start, size_t end);
SCM_INTERNAL size_t scm_i_string_length (SCM str);
SCM_API /* FIXME: not internal */ const char *scm_i_string_chars (SCM str);
-SCM_API const scm_t_wchar *scm_i_string_wide_chars (SCM str);
SCM_API /* FIXME: not internal */ char *scm_i_string_writable_chars (SCM str);
+SCM_INTERNAL const scm_t_wchar *scm_i_string_wide_chars (SCM str);
SCM_INTERNAL SCM scm_i_string_start_writing (SCM str);
SCM_INTERNAL void scm_i_string_stop_writing (void);
SCM_INTERNAL int scm_i_is_narrow_string (SCM str);