fix some allocation sizes that used 'int' instead of 'long' (merge to 4.2)

svn: r14967
This commit is contained in:
Matthew Flatt 2009-05-24 11:05:12 +00:00
parent 68a13eacc8
commit 8218da6070
4 changed files with 11 additions and 11 deletions

View File

@ -516,7 +516,7 @@ MZ_EXTERN Scheme_Object *scheme_make_sized_byte_string(char *chars, long len, in
MZ_EXTERN Scheme_Object *scheme_make_sized_offset_byte_string(char *chars, long d, long len, int copy); MZ_EXTERN Scheme_Object *scheme_make_sized_offset_byte_string(char *chars, long d, long len, int copy);
MZ_EXTERN Scheme_Object *scheme_make_immutable_sized_byte_string(char *chars, long len, int copy); MZ_EXTERN Scheme_Object *scheme_make_immutable_sized_byte_string(char *chars, long len, int copy);
MZ_EXTERN Scheme_Object *scheme_make_byte_string_without_copying(char *chars); MZ_EXTERN Scheme_Object *scheme_make_byte_string_without_copying(char *chars);
MZ_EXTERN Scheme_Object *scheme_alloc_byte_string(int size, char fill); MZ_EXTERN Scheme_Object *scheme_alloc_byte_string(long size, char fill);
MZ_EXTERN Scheme_Object *scheme_append_byte_string(Scheme_Object *, Scheme_Object *); MZ_EXTERN Scheme_Object *scheme_append_byte_string(Scheme_Object *, Scheme_Object *);
MZ_EXTERN Scheme_Object *scheme_make_utf8_string(const char *chars); MZ_EXTERN Scheme_Object *scheme_make_utf8_string(const char *chars);
@ -538,12 +538,12 @@ MZ_EXTERN Scheme_Object *scheme_make_sized_char_string(mzchar *chars, long len,
MZ_EXTERN Scheme_Object *scheme_make_sized_offset_char_string(mzchar *chars, long d, long len, int copy); MZ_EXTERN Scheme_Object *scheme_make_sized_offset_char_string(mzchar *chars, long d, long len, int copy);
MZ_EXTERN Scheme_Object *scheme_make_immutable_sized_char_string(mzchar *chars, long len, int copy); MZ_EXTERN Scheme_Object *scheme_make_immutable_sized_char_string(mzchar *chars, long len, int copy);
MZ_EXTERN Scheme_Object *scheme_make_char_string_without_copying(mzchar *chars); MZ_EXTERN Scheme_Object *scheme_make_char_string_without_copying(mzchar *chars);
MZ_EXTERN Scheme_Object *scheme_alloc_char_string(int size, mzchar fill); MZ_EXTERN Scheme_Object *scheme_alloc_char_string(long size, mzchar fill);
MZ_EXTERN Scheme_Object *scheme_append_char_string(Scheme_Object *, Scheme_Object *); MZ_EXTERN Scheme_Object *scheme_append_char_string(Scheme_Object *, Scheme_Object *);
MZ_EXTERN mzchar *scheme_string_recase(mzchar *s, int d, int len, int mode, int inplace, int *_len); MZ_EXTERN mzchar *scheme_string_recase(mzchar *s, int d, int len, int mode, int inplace, int *_len);
MZ_EXTERN Scheme_Object *scheme_make_vector(int size, Scheme_Object *fill); MZ_EXTERN Scheme_Object *scheme_make_vector(long size, Scheme_Object *fill);
MZ_EXTERN Scheme_Object *scheme_make_integer_value(long i); MZ_EXTERN Scheme_Object *scheme_make_integer_value(long i);
MZ_EXTERN Scheme_Object *scheme_make_integer_value_from_unsigned(unsigned long i); MZ_EXTERN Scheme_Object *scheme_make_integer_value_from_unsigned(unsigned long i);
MZ_EXTERN Scheme_Object *scheme_make_integer_value_from_long_long(mzlonglong i); MZ_EXTERN Scheme_Object *scheme_make_integer_value_from_long_long(mzlonglong i);

View File

@ -425,7 +425,7 @@ Scheme_Object *(*scheme_make_sized_byte_string)(char *chars, long len, int copy)
Scheme_Object *(*scheme_make_sized_offset_byte_string)(char *chars, long d, long len, int copy); Scheme_Object *(*scheme_make_sized_offset_byte_string)(char *chars, long d, long len, int copy);
Scheme_Object *(*scheme_make_immutable_sized_byte_string)(char *chars, long len, int copy); Scheme_Object *(*scheme_make_immutable_sized_byte_string)(char *chars, long len, int copy);
Scheme_Object *(*scheme_make_byte_string_without_copying)(char *chars); Scheme_Object *(*scheme_make_byte_string_without_copying)(char *chars);
Scheme_Object *(*scheme_alloc_byte_string)(int size, char fill); Scheme_Object *(*scheme_alloc_byte_string)(long size, char fill);
Scheme_Object *(*scheme_append_byte_string)(Scheme_Object *, Scheme_Object *); Scheme_Object *(*scheme_append_byte_string)(Scheme_Object *, Scheme_Object *);
Scheme_Object *(*scheme_make_utf8_string)(const char *chars); Scheme_Object *(*scheme_make_utf8_string)(const char *chars);
Scheme_Object *(*scheme_make_sized_utf8_string)(char *chars, long len); Scheme_Object *(*scheme_make_sized_utf8_string)(char *chars, long len);
@ -443,10 +443,10 @@ Scheme_Object *(*scheme_make_sized_char_string)(mzchar *chars, long len, int cop
Scheme_Object *(*scheme_make_sized_offset_char_string)(mzchar *chars, long d, long len, int copy); Scheme_Object *(*scheme_make_sized_offset_char_string)(mzchar *chars, long d, long len, int copy);
Scheme_Object *(*scheme_make_immutable_sized_char_string)(mzchar *chars, long len, int copy); Scheme_Object *(*scheme_make_immutable_sized_char_string)(mzchar *chars, long len, int copy);
Scheme_Object *(*scheme_make_char_string_without_copying)(mzchar *chars); Scheme_Object *(*scheme_make_char_string_without_copying)(mzchar *chars);
Scheme_Object *(*scheme_alloc_char_string)(int size, mzchar fill); Scheme_Object *(*scheme_alloc_char_string)(long size, mzchar fill);
Scheme_Object *(*scheme_append_char_string)(Scheme_Object *, Scheme_Object *); Scheme_Object *(*scheme_append_char_string)(Scheme_Object *, Scheme_Object *);
mzchar *(*scheme_string_recase)(mzchar *s, int d, int len, int mode, int inplace, int *_len); mzchar *(*scheme_string_recase)(mzchar *s, int d, int len, int mode, int inplace, int *_len);
Scheme_Object *(*scheme_make_vector)(int size, Scheme_Object *fill); Scheme_Object *(*scheme_make_vector)(long size, Scheme_Object *fill);
Scheme_Object *(*scheme_make_integer_value)(long i); Scheme_Object *(*scheme_make_integer_value)(long i);
Scheme_Object *(*scheme_make_integer_value_from_unsigned)(unsigned long i); Scheme_Object *(*scheme_make_integer_value_from_unsigned)(unsigned long i);
Scheme_Object *(*scheme_make_integer_value_from_long_long)(mzlonglong i); Scheme_Object *(*scheme_make_integer_value_from_long_long)(mzlonglong i);

View File

@ -59,11 +59,11 @@ X(scheme_make, _string)(const Xchar *chars)
} }
Scheme_Object * Scheme_Object *
X(scheme_alloc, _string)(int size, Xchar fill) X(scheme_alloc, _string)(long size, Xchar fill)
{ {
Scheme_Object *str; Scheme_Object *str;
Xchar *s; Xchar *s;
int i; long i;
if (size < 0) { if (size < 0) {
str = scheme_make_integer(size); str = scheme_make_integer(size);

View File

@ -123,10 +123,10 @@ scheme_init_vector (Scheme_Env *env)
} }
Scheme_Object * Scheme_Object *
scheme_make_vector (int size, Scheme_Object *fill) scheme_make_vector (long size, Scheme_Object *fill)
{ {
Scheme_Object *vec; Scheme_Object *vec;
int i; long i;
if (size < 0) { if (size < 0) {
vec = scheme_make_integer(size); vec = scheme_make_integer(size);
@ -331,7 +331,7 @@ list_to_vector (int argc, Scheme_Object *argv[])
Scheme_Object * Scheme_Object *
scheme_list_to_vector (Scheme_Object *list) scheme_list_to_vector (Scheme_Object *list)
{ {
int len, i; long len, i;
Scheme_Object *vec, *orig = list; Scheme_Object *vec, *orig = list;
len = scheme_proper_list_length(list); len = scheme_proper_list_length(list);