summaryrefslogtreecommitdiff
path: root/libguile/strorder.c
diff options
context:
space:
mode:
authorDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2000-11-22 11:20:03 +0000
committerDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2000-11-22 11:20:03 +0000
commit34f0f2b8af3585c4057cf076739151accde02147 (patch)
tree64492a270ab934f362e5725cef4581377eaefa29 /libguile/strorder.c
parent395d8627b90c1b90b48f562436d189e037ff05a6 (diff)
downloadguile-34f0f2b8af3585c4057cf076739151accde02147.tar.gz
* Deprecated macros SCM_ROCHARS and SCM_ROUCHARS.
Diffstat (limited to 'libguile/strorder.c')
-rw-r--r--libguile/strorder.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libguile/strorder.c b/libguile/strorder.c
index ddb83a19d..815488a92 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -71,8 +71,8 @@ SCM_DEFINE1 (scm_string_equal_p, "string=?", scm_tc7_rpsubr,
length = SCM_STRING_LENGTH (s2);
if (SCM_STRING_LENGTH (s1) == length)
{
- unsigned char *c1 = SCM_ROUCHARS (s1) + length - 1;
- unsigned char *c2 = SCM_ROUCHARS (s2) + length - 1;
+ unsigned char *c1 = SCM_STRING_UCHARS (s1) + length - 1;
+ unsigned char *c2 = SCM_STRING_UCHARS (s2) + length - 1;
scm_sizet i;
/* comparing from back to front typically finds mismatches faster */
@@ -105,8 +105,8 @@ SCM_DEFINE1 (scm_string_ci_equal_p, "string-ci=?", scm_tc7_rpsubr,
length = SCM_STRING_LENGTH (s2);
if (SCM_STRING_LENGTH (s1) == length)
{
- unsigned char *c1 = SCM_ROUCHARS (s1) + length - 1;
- unsigned char *c2 = SCM_ROUCHARS (s2) + length - 1;
+ unsigned char *c1 = SCM_STRING_UCHARS (s1) + length - 1;
+ unsigned char *c2 = SCM_STRING_UCHARS (s2) + length - 1;
scm_sizet i;
/* comparing from back to front typically finds mismatches faster */
@@ -139,8 +139,8 @@ SCM_DEFINE1 (scm_string_less_p, "string<?", scm_tc7_rpsubr,
length1 = SCM_STRING_LENGTH (s1);
length2 = SCM_STRING_LENGTH (s2);
lengthm = min (length1, length2);
- c1 = SCM_ROUCHARS (s1);
- c2 = SCM_ROUCHARS (s2);
+ c1 = SCM_STRING_UCHARS (s1);
+ c2 = SCM_STRING_UCHARS (s2);
for (i = 0; i != lengthm; ++i, ++c1, ++c2) {
int c = *c1 - *c2;
@@ -202,8 +202,8 @@ SCM_DEFINE1 (scm_string_ci_less_p, "string-ci<?", scm_tc7_rpsubr,
length1 = SCM_STRING_LENGTH (s1);
length2 = SCM_STRING_LENGTH (s2);
lengthm = min (length1, length2);
- c1 = SCM_ROUCHARS (s1);
- c2 = SCM_ROUCHARS (s2);
+ c1 = SCM_STRING_UCHARS (s1);
+ c2 = SCM_STRING_UCHARS (s2);
for (i = 0; i != lengthm; ++i, ++c1, ++c2) {
int c = scm_upcase (*c1) - scm_upcase (*c2);