From 8218da607035e5ee0551a7ddea289adb0d84a1d3 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 24 May 2009 11:05:12 +0000 Subject: [PATCH] fix some allocation sizes that used 'int' instead of 'long' (merge to 4.2) svn: r14967 --- src/mzscheme/src/schemef.h | 6 +++--- src/mzscheme/src/schemex.h | 6 +++--- src/mzscheme/src/strops.inc | 4 ++-- src/mzscheme/src/vector.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mzscheme/src/schemef.h b/src/mzscheme/src/schemef.h index 8438b2b22b..1ac10b46c8 100644 --- a/src/mzscheme/src/schemef.h +++ b/src/mzscheme/src/schemef.h @@ -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_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_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_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_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_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 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_from_unsigned(unsigned long i); MZ_EXTERN Scheme_Object *scheme_make_integer_value_from_long_long(mzlonglong i); diff --git a/src/mzscheme/src/schemex.h b/src/mzscheme/src/schemex.h index 8a9341128d..8c0244f4bd 100644 --- a/src/mzscheme/src/schemex.h +++ b/src/mzscheme/src/schemex.h @@ -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_immutable_sized_byte_string)(char *chars, long len, int copy); 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_make_utf8_string)(const char *chars); 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_immutable_sized_char_string)(mzchar *chars, long len, int copy); 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 *); 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_from_unsigned)(unsigned long i); Scheme_Object *(*scheme_make_integer_value_from_long_long)(mzlonglong i); diff --git a/src/mzscheme/src/strops.inc b/src/mzscheme/src/strops.inc index a04eb5fb38..1a252ae5f5 100644 --- a/src/mzscheme/src/strops.inc +++ b/src/mzscheme/src/strops.inc @@ -59,11 +59,11 @@ X(scheme_make, _string)(const Xchar *chars) } Scheme_Object * -X(scheme_alloc, _string)(int size, Xchar fill) +X(scheme_alloc, _string)(long size, Xchar fill) { Scheme_Object *str; Xchar *s; - int i; + long i; if (size < 0) { str = scheme_make_integer(size); diff --git a/src/mzscheme/src/vector.c b/src/mzscheme/src/vector.c index cc5e5e0432..faf8982094 100644 --- a/src/mzscheme/src/vector.c +++ b/src/mzscheme/src/vector.c @@ -123,10 +123,10 @@ scheme_init_vector (Scheme_Env *env) } Scheme_Object * -scheme_make_vector (int size, Scheme_Object *fill) +scheme_make_vector (long size, Scheme_Object *fill) { Scheme_Object *vec; - int i; + long i; if (size < 0) { vec = scheme_make_integer(size); @@ -331,7 +331,7 @@ list_to_vector (int argc, Scheme_Object *argv[]) Scheme_Object * scheme_list_to_vector (Scheme_Object *list) { - int len, i; + long len, i; Scheme_Object *vec, *orig = list; len = scheme_proper_list_length(list);