From 52f0a8cf5efb97e5024c50dda90fd7f10550dcbf Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 3 Dec 2010 20:26:26 -0700 Subject: [PATCH] fix some integer-type mismatches --- src/racket/src/error.c | 25 ++++++------ src/racket/src/list.c | 6 +-- src/racket/src/print.c | 8 ++-- src/racket/src/ratfloat.inc | 2 +- src/racket/src/schemef.h | 2 +- src/racket/src/schemex.h | 80 ++++++++++++++++++------------------- src/racket/src/string.c | 6 +-- src/racket/src/vector.c | 2 +- 8 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/racket/src/error.c b/src/racket/src/error.c index 746a99a302..8a3f34e291 100644 --- a/src/racket/src/error.c +++ b/src/racket/src/error.c @@ -307,7 +307,7 @@ static intptr_t sch_vsprintf(char *s, intptr_t maxlen, const char *msg, va_list s[i++] = '%'; else { const char *t; - int tlen; + intptr_t tlen; int dots = 0; switch (type) { @@ -448,7 +448,7 @@ static intptr_t sch_vsprintf(char *s, intptr_t maxlen, const char *msg, va_list { Scheme_Object *sym; sym = (Scheme_Object *)ptrs[pp++]; - t = scheme_symbol_name_and_size(sym, (unsigned int *)&tlen, 0); + t = scheme_symbol_name_and_size(sym, (uintptr_t *)&tlen, 0); } break; case 'V': @@ -895,7 +895,7 @@ int scheme_log_level_p(Scheme_Logger *logger, int level) return (logger->want_level >= level); } -static char *error_write_to_string_w_max(Scheme_Object *v, int len, int *lenout) +static char *error_write_to_string_w_max(Scheme_Object *v, int len, intptr_t *lenout) { Scheme_Object *o, *args[2]; @@ -1085,7 +1085,7 @@ static char *make_arity_expect_string(const char *name, int namelen, pos++; for (i = (is_method ? 1 : 0); i < argc; i++) { - int l; + intptr_t l; char *o; o = error_write_to_string_w_max(argv[i], len, &l); memcpy(s + pos, " ", 1); @@ -1306,7 +1306,7 @@ char *scheme_make_args_string(char *s, int which, int argc, Scheme_Object **argv pos = strlen(other); for (i = 0; i < argc; i++) { if (i != which) { - int l; + intptr_t l; char *o; o = error_write_to_string_w_max(argv[i], len, &l); memcpy(other + pos, " ", 1); @@ -1346,7 +1346,7 @@ void scheme_wrong_type(const char *name, const char *expected, { Scheme_Object *o; char *s; - int slen; + intptr_t slen; int isres = 0; GC_CAN_IGNORE char *isress = "argument"; @@ -1403,7 +1403,7 @@ void scheme_wrong_field_type(Scheme_Object *c_name, void scheme_arg_mismatch(const char *name, const char *msg, Scheme_Object *o) { char *s; - int slen; + intptr_t slen; if (o) s = scheme_make_provided_string(o, 1, &slen); @@ -1776,8 +1776,7 @@ void scheme_wrong_syntax_with_more_sources(const char *where, void scheme_wrong_rator(Scheme_Object *rator, int argc, Scheme_Object **argv) { - intptr_t len, slen; - int rlen; + intptr_t len, slen, rlen; char *s, *r; s = init_buf(&len, NULL); @@ -1795,7 +1794,7 @@ void scheme_wrong_rator(Scheme_Object *rator, int argc, Scheme_Object **argv) slen = 17; for (i = 0; i < argc; i++) { char *o; - int olen; + intptr_t olen; o = error_write_to_string_w_max(argv[i], len, &olen); memcpy(s + slen, " ", 1); @@ -1869,7 +1868,7 @@ void scheme_wrong_return_arity(const char *where, vlen = 1; for (i = 0; i < maxpos; i++) { char *o; - int olen; + intptr_t olen; o = error_write_to_string_w_max(array[i], len, &olen); memcpy(v + vlen, " ", 1); @@ -1968,7 +1967,7 @@ void scheme_unbound_global(Scheme_Bucket *b) } } -char *scheme_make_provided_string(Scheme_Object *o, int count, int *lenout) +char *scheme_make_provided_string(Scheme_Object *o, int count, intptr_t *lenout) { intptr_t len; @@ -3144,7 +3143,7 @@ static Scheme_Object * def_exn_handler(int argc, Scheme_Object *argv[]) { char *s; - int len = -1; + intptr_t len = -1; if (SCHEME_CHAPERONE_STRUCTP(argv[0]) && scheme_is_struct_instance(exn_table[MZEXN].type, argv[0])) { diff --git a/src/racket/src/list.c b/src/racket/src/list.c index 909b365b93..13a2394149 100644 --- a/src/racket/src/list.c +++ b/src/racket/src/list.c @@ -1305,7 +1305,7 @@ do_list_ref(char *name, int takecar, int argc, Scheme_Object *argv[]) for (i = 0; i < k; i++) { if (!SCHEME_PAIRP(lst)) { char *lstr; - int llen; + intptr_t llen; lstr = scheme_make_provided_string(argv[0], 2, &llen); scheme_raise_exn(MZEXN_FAIL_CONTRACT, @@ -1324,7 +1324,7 @@ do_list_ref(char *name, int takecar, int argc, Scheme_Object *argv[]) if (takecar) { if (!SCHEME_PAIRP(lst)) { char *lstr; - int llen; + intptr_t llen; lstr = scheme_make_provided_string(argv[0], 2, &llen); scheme_raise_exn(MZEXN_FAIL_CONTRACT, @@ -1400,7 +1400,7 @@ name (int argc, Scheme_Object *argv[]) \ pair = SCHEME_CAR (list); \ if (!SCHEME_PAIRP (pair)) {\ char *npstr, *lstr; \ - int nplen, llen; \ + intptr_t nplen, llen; \ npstr = scheme_make_provided_string(pair, 2, &nplen); \ lstr = scheme_make_provided_string(argv[1], 2, &llen); \ scheme_raise_exn(MZEXN_FAIL_CONTRACT, \ diff --git a/src/racket/src/print.c b/src/racket/src/print.c index be2eb346f7..e5ec274e6f 100644 --- a/src/racket/src/print.c +++ b/src/racket/src/print.c @@ -1861,7 +1861,7 @@ print(Scheme_Object *obj, int notdisplay, int compact, Scheme_Hash_Table *ht, if (SCHEME_SYMBOLP(obj) || SCHEME_KEYWORDP(obj)) { - int l; + intptr_t l; Scheme_Object *idx; int is_kw; @@ -1938,7 +1938,7 @@ print(Scheme_Object *obj, int notdisplay, int compact, Scheme_Hash_Table *ht, if (is_kw) print_utf8_string(pp, "#:", 0, 2); - s = scheme_symbol_name_and_size(obj, (unsigned int *)&l, + s = scheme_symbol_name_and_size(obj, (uintptr_t *)&l, ((pp->can_read_pipe_quote ? SCHEME_SNF_PIPE_QUOTE : SCHEME_SNF_NO_PIPE_QUOTE) @@ -2314,7 +2314,7 @@ print(Scheme_Object *obj, int notdisplay, int compact, Scheme_Hash_Table *ht, src = obj; if (SAME_OBJ(src, obj)) { - int l; + intptr_t l; const char *s; Scheme_Object *name; @@ -2331,7 +2331,7 @@ print(Scheme_Object *obj, int notdisplay, int compact, Scheme_Hash_Table *ht, name = SCHEME_STRUCT_NAME_SYM(obj); } - s = scheme_symbol_name_and_size(name, (unsigned int *)&l, + s = scheme_symbol_name_and_size(name, (uintptr_t *)&l, (pp->print_struct ? SCHEME_SNF_FOR_TS : (pp->can_read_pipe_quote diff --git a/src/racket/src/ratfloat.inc b/src/racket/src/ratfloat.inc index 8b97344623..d860e3d771 100644 --- a/src/racket/src/ratfloat.inc +++ b/src/racket/src/ratfloat.inc @@ -14,7 +14,7 @@ FP_TYPE SCHEME_RATIONAL_TO_FLOAT(const Scheme_Object *o) { Scheme_Rational *r = (Scheme_Rational *)o; FP_TYPE n, d; - int ns, ds; + intptr_t ns, ds; if (SCHEME_INTP(r->num)) { n = (FP_TYPE)SCHEME_INT_VAL(r->num); diff --git a/src/racket/src/schemef.h b/src/racket/src/schemef.h index 4c749a0ee6..381316f477 100644 --- a/src/racket/src/schemef.h +++ b/src/racket/src/schemef.h @@ -1123,7 +1123,7 @@ MZ_EXTERN int scheme_check_proc_arity2(const char *where, int a, int which, int argc, Scheme_Object **argv, int false_ok); -MZ_EXTERN char *scheme_make_provided_string(Scheme_Object *o, int count, int *len); +MZ_EXTERN char *scheme_make_provided_string(Scheme_Object *o, int count, intptr_t *len); MZ_EXTERN char *scheme_make_args_string(char *s, int which, int argc, Scheme_Object **argv, intptr_t *len); MZ_EXTERN const char *scheme_system_library_subpath(); diff --git a/src/racket/src/schemex.h b/src/racket/src/schemex.h index c2e6159535..9db6d434b2 100644 --- a/src/racket/src/schemex.h +++ b/src/racket/src/schemex.h @@ -361,7 +361,7 @@ void (*scheme_remove_gc_callback)(Scheme_Object *key); /*========================================================================*/ /* hash tables */ /*========================================================================*/ -Scheme_Bucket_Table *(*scheme_make_bucket_table)(int size_hint, int type); +Scheme_Bucket_Table *(*scheme_make_bucket_table)(intptr_t size_hint, int type); void (*scheme_add_to_table)(Scheme_Bucket_Table *table, const char *key, void *val, int); void (*scheme_change_in_table)(Scheme_Bucket_Table *table, const char *key, void *new_val); void *(*scheme_lookup_in_table)(Scheme_Bucket_Table *table, const char *key); @@ -500,36 +500,36 @@ const char *(*scheme_get_proc_name)(Scheme_Object *p, int *len, int for_error); /*========================================================================*/ /* strings */ /*========================================================================*/ -int (*scheme_utf8_decode)(const unsigned char *s, int start, int end, - unsigned int *us, int dstart, int dend, - intptr_t *ipos, char utf16, int permissive); -int (*scheme_utf8_decode_as_prefix)(const unsigned char *s, int start, int end, - unsigned int *us, int dstart, int dend, - intptr_t *ipos, char utf16, int permissive); -int (*scheme_utf8_decode_all)(const unsigned char *s, int len, unsigned int *us, - int permissive); -int (*scheme_utf8_decode_prefix)(const unsigned char *s, int len, unsigned int *us, - int permissive); -mzchar *(*scheme_utf8_decode_to_buffer)(const unsigned char *s, int len, - mzchar *buf, int blen); -mzchar *(*scheme_utf8_decode_to_buffer_len)(const unsigned char *s, int len, - mzchar *buf, int blen, intptr_t *rlen); -int (*scheme_utf8_decode_count)(const unsigned char *s, int start, int end, - int *_state, int might_continue, int permissive); -int (*scheme_utf8_encode)(const unsigned int *us, int start, int end, - unsigned char *s, int dstart, - char utf16); -int (*scheme_utf8_encode_all)(const unsigned int *us, int len, unsigned char *s); -char *(*scheme_utf8_encode_to_buffer)(const mzchar *s, int len, - char *buf, int blen); -char *(*scheme_utf8_encode_to_buffer_len)(const mzchar *s, int len, - char *buf, int blen, intptr_t *rlen); -unsigned short *(*scheme_ucs4_to_utf16)(const mzchar *text, int start, int end, - unsigned short *buf, int bufsize, - intptr_t *ulen, int term_size); -mzchar *(*scheme_utf16_to_ucs4)(const unsigned short *text, int start, int end, - mzchar *buf, int bufsize, - intptr_t *ulen, int term_size); +intptr_t (*scheme_utf8_decode)(const unsigned char *s, intptr_t start, intptr_t end, + unsigned int *us, intptr_t dstart, intptr_t dend, + intptr_t *ipos, char utf16, int permissive); +intptr_t (*scheme_utf8_decode_as_prefix)(const unsigned char *s, intptr_t start, intptr_t end, + unsigned int *us, intptr_t dstart, intptr_t dend, + intptr_t *ipos, char utf16, int permissive); +intptr_t (*scheme_utf8_decode_all)(const unsigned char *s, intptr_t len, unsigned int *us, + int permissive); +intptr_t (*scheme_utf8_decode_prefix)(const unsigned char *s, intptr_t len, unsigned int *us, + int permissive); +mzchar *(*scheme_utf8_decode_to_buffer)(const unsigned char *s, intptr_t len, + mzchar *buf, intptr_t blen); +mzchar *(*scheme_utf8_decode_to_buffer_len)(const unsigned char *s, intptr_t len, + mzchar *buf, intptr_t blen, intptr_t *rlen); +intptr_t (*scheme_utf8_decode_count)(const unsigned char *s, intptr_t start, intptr_t end, + int *_state, int might_continue, int permissive); +intptr_t (*scheme_utf8_encode)(const unsigned int *us, intptr_t start, intptr_t end, + unsigned char *s, intptr_t dstart, + char utf16); +intptr_t (*scheme_utf8_encode_all)(const unsigned int *us, intptr_t len, unsigned char *s); +char *(*scheme_utf8_encode_to_buffer)(const mzchar *s, intptr_t len, + char *buf, intptr_t blen); +char *(*scheme_utf8_encode_to_buffer_len)(const mzchar *s, intptr_t len, + char *buf, intptr_t blen, intptr_t *rlen); +unsigned short *(*scheme_ucs4_to_utf16)(const mzchar *text, intptr_t start, intptr_t end, + unsigned short *buf, intptr_t bufsize, + intptr_t *ulen, intptr_t term_size); +mzchar *(*scheme_utf16_to_ucs4)(const unsigned short *text, intptr_t start, intptr_t end, + mzchar *buf, intptr_t bufsize, + intptr_t *ulen, intptr_t term_size); Scheme_Object *(*scheme_open_converter)(const char *from_e, const char *to_e); void (*scheme_close_converter)(Scheme_Object *conv); /*========================================================================*/ @@ -813,16 +813,16 @@ Scheme_Object *(*scheme_datum_to_kernel_stx)(Scheme_Object *e); /* symbols */ /*========================================================================*/ Scheme_Object *(*scheme_intern_symbol)(const char *name); -Scheme_Object *(*scheme_intern_exact_symbol)(const char *name, unsigned int len); -Scheme_Object *(*scheme_intern_exact_char_symbol)(const mzchar *name, unsigned int len); +Scheme_Object *(*scheme_intern_exact_symbol)(const char *name, uintptr_t len); +Scheme_Object *(*scheme_intern_exact_char_symbol)(const mzchar *name, uintptr_t len); Scheme_Object *(*scheme_make_symbol)(const char *name); /* Make uninterned */ -Scheme_Object *(*scheme_make_exact_symbol)(const char *name, unsigned int len); /* Exact case */ -Scheme_Object *(*scheme_make_exact_char_symbol)(const mzchar *name, unsigned int len); /* Exact case */ +Scheme_Object *(*scheme_make_exact_symbol)(const char *name, uintptr_t len); /* Exact case */ +Scheme_Object *(*scheme_make_exact_char_symbol)(const mzchar *name, uintptr_t len); /* Exact case */ const char *(*scheme_symbol_name)(Scheme_Object *sym); -const char *(*scheme_symbol_name_and_size)(Scheme_Object *sym, unsigned int *l, int flags); +const char *(*scheme_symbol_name_and_size)(Scheme_Object *sym, uintptr_t *l, int flags); char *(*scheme_symbol_val)(Scheme_Object *sym); -Scheme_Object *(*scheme_intern_exact_keyword)(const char *name, unsigned int len); -Scheme_Object *(*scheme_intern_exact_char_keyword)(const mzchar *name, unsigned int len); +Scheme_Object *(*scheme_intern_exact_keyword)(const char *name, uintptr_t len); +Scheme_Object *(*scheme_intern_exact_char_keyword)(const mzchar *name, uintptr_t len); /*========================================================================*/ /* structs */ /*========================================================================*/ @@ -928,13 +928,13 @@ int (*scheme_check_proc_arity)(const char *where, int a, int (*scheme_check_proc_arity2)(const char *where, int a, int which, int argc, Scheme_Object **argv, int false_ok); -char *(*scheme_make_provided_string)(Scheme_Object *o, int count, int *len); +char *(*scheme_make_provided_string)(Scheme_Object *o, int count, intptr_t *len); char *(*scheme_make_args_string)(char *s, int which, int argc, Scheme_Object **argv, intptr_t *len); const char *(*scheme_system_library_subpath)(); void (*scheme_signal_received)(void); void (*scheme_signal_received_at)(void *); void *(*scheme_get_signal_handle)(); -int (*scheme_char_strlen)(const mzchar *s); +intptr_t (*scheme_char_strlen)(const mzchar *s); Scheme_Object *(*scheme_stx_extract_marks)(Scheme_Object *stx); Scheme_Object *(*scheme_get_place_table)(void); void *(*scheme_register_process_global)(const char *key, void *val); diff --git a/src/racket/src/string.c b/src/racket/src/string.c index c7c57de7ae..f57699fae7 100644 --- a/src/racket/src/string.c +++ b/src/racket/src/string.c @@ -949,7 +949,7 @@ void scheme_out_of_string_range(const char *name, const char *which, if (len) { char *sstr; - int slen; + intptr_t slen; sstr = scheme_make_provided_string(s, 2, &slen); scheme_raise_exn(MZEXN_FAIL_CONTRACT, @@ -1754,7 +1754,7 @@ void scheme_do_format(const char *procname, Scheme_Object *port, int pos = (num_err ? num_err : char_err) - 1; char *args, *bstr; intptr_t alen; - int blen; + intptr_t blen; char *type = (num_err ? "exact-number" : "character"); Scheme_Object *bad = argv[pos]; @@ -1823,7 +1823,7 @@ void scheme_do_format(const char *procname, Scheme_Object *port, case 'e': case 'E': { - int len; + intptr_t len; char *s; s = scheme_make_provided_string(argv[used++], 0, &len); scheme_write_byte_string(s, len, port); diff --git a/src/racket/src/vector.c b/src/racket/src/vector.c index b1e730dfc8..229fc07371 100644 --- a/src/racket/src/vector.c +++ b/src/racket/src/vector.c @@ -350,7 +350,7 @@ void scheme_bad_vec_index(char *name, Scheme_Object *i, const char *what, Scheme if (len) { intptr_t n = len - 1; char *vstr; - int vlen; + intptr_t vlen; vstr = scheme_make_provided_string(vec, 2, &vlen); scheme_raise_exn(MZEXN_FAIL_CONTRACT, "%s: index %s out of range [%ld, %ld] for %s: %t",