summaryrefslogtreecommitdiff
path: root/libguile/strop.c
diff options
context:
space:
mode:
authorMichael Livshin <mlivshin@bigfoot.com>2001-05-26 20:51:22 +0000
committerMichael Livshin <mlivshin@bigfoot.com>2001-05-26 20:51:22 +0000
commitc014a02eec7b99c54d8a156ce491ae8d1e341f97 (patch)
treefa7a113564c23215b83e44a1498616a6bf16c853 /libguile/strop.c
parentf3f70257a3befb6495760923d167e52d5cdfddae (diff)
downloadguile-c014a02eec7b99c54d8a156ce491ae8d1e341f97.tar.gz
revert the ill-considered part of the 2001-05-24 changes
Diffstat (limited to 'libguile/strop.c')
-rw-r--r--libguile/strop.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libguile/strop.c b/libguile/strop.c
index 4efb95599..ff2698fb3 100644
--- a/libguile/strop.c
+++ b/libguile/strop.c
@@ -48,14 +48,14 @@ xSCM_DEFINE (scm_i_index, "i-index", 2, 2, 0,
"@code{rindex} function, depending on the value of @var{direction}."
*/
/* implements index if direction > 0 otherwise rindex. */
-static scm_bits_t
+static long
scm_i_index (SCM *str, SCM chr, int direction, SCM sub_start,
SCM sub_end, const char *why)
{
unsigned char * p;
- scm_bits_t x;
- scm_bits_t lower;
- scm_bits_t upper;
+ long x;
+ long lower;
+ long upper;
int ch;
SCM_ASSERT (SCM_STRINGP (*str), *str, SCM_ARG1, why);
@@ -116,7 +116,7 @@ SCM_DEFINE (scm_string_index, "string-index", 2, 2, 0,
"@end lisp")
#define FUNC_NAME s_scm_string_index
{
- scm_bits_t pos;
+ long pos;
if (SCM_UNBNDP (frm))
frm = SCM_BOOL_F;
@@ -146,7 +146,7 @@ SCM_DEFINE (scm_string_rindex, "string-rindex", 2, 2, 0,
"@end lisp")
#define FUNC_NAME s_scm_string_rindex
{
- scm_bits_t pos;
+ long pos;
if (SCM_UNBNDP (frm))
frm = SCM_BOOL_F;
@@ -238,7 +238,7 @@ SCM_DEFINE (scm_substring_move_x, "substring-move!", 5, 0, 0,
"are different strings, it does not matter which function you use.")
#define FUNC_NAME s_scm_substring_move_x
{
- scm_bits_t s1, s2, e, len;
+ long s1, s2, e, len;
SCM_VALIDATE_STRING (1,str1);
SCM_VALIDATE_INUM_COPY (2,start1,s1);
@@ -274,7 +274,7 @@ SCM_DEFINE (scm_substring_fill_x, "substring-fill!", 4, 0, 0,
"@end lisp")
#define FUNC_NAME s_scm_substring_fill_x
{
- scm_bits_t i, e;
+ long i, e;
char c;
SCM_VALIDATE_STRING (1,str);
SCM_VALIDATE_INUM_COPY (2,start,i);
@@ -313,7 +313,7 @@ SCM_DEFINE (scm_string_to_list, "string->list", 1, 0, 0,
"concerned.")
#define FUNC_NAME s_scm_string_to_list
{
- scm_bits_t i;
+ long i;
SCM res = SCM_EOL;
unsigned char *src;
SCM_VALIDATE_STRING (1,str);
@@ -352,7 +352,7 @@ SCM_DEFINE (scm_string_fill_x, "string-fill!", 2, 0, 0,
#define FUNC_NAME s_scm_string_fill_x
{
register char *dst, c;
- register scm_bits_t k;
+ register long k;
SCM_VALIDATE_STRING_COPY (1,str,dst);
SCM_VALIDATE_CHAR_COPY (2,chr,c);
for (k = SCM_STRING_LENGTH (str)-1;k >= 0;k--) dst[k] = c;
@@ -366,7 +366,7 @@ SCM_DEFINE (scm_string_fill_x, "string-fill!", 2, 0, 0,
static SCM
string_upcase_x (SCM v)
{
- scm_bits_t k;
+ unsigned long k;
for (k = 0; k < SCM_STRING_LENGTH (v); ++k)
SCM_STRING_UCHARS (v) [k] = scm_upcase (SCM_STRING_UCHARS (v) [k]);
@@ -411,7 +411,7 @@ SCM_DEFINE (scm_string_upcase, "string-upcase", 1, 0, 0,
static SCM
string_downcase_x (SCM v)
{
- scm_bits_t k;
+ unsigned long k;
for (k = 0; k < SCM_STRING_LENGTH (v); ++k)
SCM_STRING_UCHARS (v) [k] = scm_downcase (SCM_STRING_UCHARS (v) [k]);
@@ -457,7 +457,7 @@ static SCM
string_capitalize_x (SCM str)
{
char *sz;
- scm_bits_t i, len;
+ long i, len;
int in_word=0;
len = SCM_STRING_LENGTH(str);
@@ -532,7 +532,7 @@ SCM_DEFINE (scm_string_split, "string-split", 2, 0, 0,
"@end lisp")
#define FUNC_NAME s_scm_string_split
{
- scm_bits_t idx, last_idx;
+ long idx, last_idx;
char * p;
int ch;
SCM res = SCM_EOL;