ruby-changes:18714
From: naruse <ko1@a...>
Date: Mon, 31 Jan 2011 12:45:08 +0900 (JST)
Subject: [ruby-changes:18714] Ruby:r30740 (trunk): * addr2line.c: suppressed shorten-64-to-32 warnings.
naruse 2011-01-31 12:44:57 +0900 (Mon, 31 Jan 2011) New Revision: 30740 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30740 Log: * addr2line.c: suppressed shorten-64-to-32 warnings. * regcomp.c: ditto. * regexec.c: ditto. * regint.h: ditto. * regparse.c: ditto. * regparse.h: ditto. * time.c: ditto. * variable.c: ditto. Modified files: trunk/ChangeLog trunk/addr2line.c trunk/regcomp.c trunk/regexec.c trunk/regint.h trunk/regparse.c trunk/regparse.h trunk/time.c trunk/variable.c Index: regparse.c =================================================================== --- regparse.c (revision 30739) +++ regparse.c (revision 30740) @@ -276,7 +276,7 @@ static UChar* strcat_capa(UChar* dest, UChar* dest_end, const UChar* src, const UChar* src_end, - int capa) + size_t capa) { UChar* r; @@ -293,7 +293,7 @@ /* dest on static area */ static UChar* strcat_capa_from_static(UChar* dest, UChar* dest_end, - const UChar* src, const UChar* src_end, int capa) + const UChar* src, const UChar* src_end, size_t capa) { UChar* r; @@ -1450,7 +1450,7 @@ CHECK_NULL_RETURN_MEMERR(p); NSTR(node)->s = p; - NSTR(node)->capa = capa; + NSTR(node)->capa = (int)capa; } } else { Index: regparse.h =================================================================== --- regparse.h (revision 30739) +++ regparse.h (revision 30740) @@ -100,7 +100,7 @@ #define NSTR_AMBIG (1<<1) #define NSTR_DONT_GET_OPT_INFO (1<<2) -#define NSTRING_LEN(node) ((node)->u.str.end - (node)->u.str.s) +#define NSTRING_LEN(node) (OnigDistance)((node)->u.str.end - (node)->u.str.s) #define NSTRING_SET_RAW(node) (node)->u.str.flag |= NSTR_RAW #define NSTRING_CLEAR_RAW(node) (node)->u.str.flag &= ~NSTR_RAW #define NSTRING_SET_AMBIG(node) (node)->u.str.flag |= NSTR_AMBIG Index: regcomp.c =================================================================== --- regcomp.c (revision 30739) +++ regcomp.c (revision 30740) @@ -44,7 +44,6 @@ return 0; } - #ifndef PLATFORM_UNALIGNED_WORD_ACCESS static unsigned char PadBuf[WORD_ALIGNMENT_SIZE]; #endif @@ -142,7 +141,7 @@ #endif extern int -onig_bbuf_init(BBuf* buf, int size) +onig_bbuf_init(BBuf* buf, OnigDistance size) { if (size <= 0) { size = 0; @@ -153,7 +152,7 @@ if (IS_NULL(buf->p)) return(ONIGERR_MEMORY); } - buf->alloc = size; + buf->alloc = (unsigned int)size; buf->used = 0; return 0; } @@ -240,7 +239,7 @@ } static int -add_length(regex_t* reg, int len) +add_length(regex_t* reg, OnigDistance len) { LengthType l = (LengthType )len; @@ -285,7 +284,7 @@ } static int -add_bytes(regex_t* reg, UChar* bytes, int len) +add_bytes(regex_t* reg, UChar* bytes, OnigDistance len) { BBUF_ADD(reg, bytes, len); return 0; @@ -318,7 +317,7 @@ (op) == OP_EXACTMB3N || (op) == OP_EXACTMBN || (op) == OP_EXACTN_IC) static int -select_str_opcode(int mb_len, int str_len, int ignore_case) +select_str_opcode(int mb_len, OnigDistance str_len, int ignore_case) { int op; @@ -439,7 +438,7 @@ } static int -add_compile_string(UChar* s, int mb_len, int str_len, +add_compile_string(UChar* s, int mb_len, OnigDistance str_len, regex_t* reg, int ignore_case) { int op = select_str_opcode(mb_len, str_len, ignore_case); @@ -2311,7 +2310,7 @@ do { r = get_char_length_tree1(NCAR(node), reg, &tlen, level); if (r == 0) - *len = distance_add(*len, tlen); + *len = (int)distance_add(*len, tlen); } while (r == 0 && IS_NOT_NULL(node = NCDR(node))); break; @@ -2358,7 +2357,7 @@ if (qn->lower == qn->upper) { r = get_char_length_tree1(qn->target, reg, &tlen, level); if (r == 0) - *len = distance_multiply(tlen, qn->lower); + *len = (int)distance_multiply(tlen, qn->lower); } else r = GET_CHAR_LEN_VARLEN; @@ -2431,7 +2430,8 @@ static int is_not_included(Node* x, Node* y, regex_t* reg) { - int i, len; + int i; + OnigDistance len; OnigCodePoint code; UChar *p, c; int ytype; @@ -2583,7 +2583,7 @@ return 0; } else { - for (i = 0, p = ys->s, q = xs->s; i < len; i++, p++, q++) { + for (i = 0, p = ys->s, q = xs->s; (OnigDistance)i < len; i++, p++, q++) { if (*p != *q) return 1; } } @@ -3225,7 +3225,8 @@ { UChar *p, *q, *end, buf[ONIGENC_MBC_CASE_FOLD_MAXLEN]; UChar *sbuf, *ebuf, *sp; - int r, i, len, sbuf_size; + int r, i, len; + OnigDistance sbuf_size; StrNode* sn = NSTR(node); end = sn->end; @@ -3800,7 +3801,7 @@ if (NTYPE(target) == NT_STR) { if (!IS_REPEAT_INFINITE(qn->lower) && qn->lower == qn->upper && qn->lower > 1 && qn->lower <= EXPAND_STRING_MAX_LENGTH) { - int len = NSTRING_LEN(target); + OnigDistance len = NSTRING_LEN(target); StrNode* sn = NSTR(target); if (len * qn->lower <= EXPAND_STRING_MAX_LENGTH) { @@ -3940,7 +3941,7 @@ set_bm_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED, UChar skip[], int** int_skip) { - int i, len; + OnigDistance i, len; len = end - s; if (len < ONIG_CHAR_TABLE_SIZE) { @@ -3954,10 +3955,10 @@ *int_skip = (int* )xmalloc(sizeof(int) * ONIG_CHAR_TABLE_SIZE); if (IS_NULL(*int_skip)) return ONIGERR_MEMORY; } - for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) (*int_skip)[i] = len; + for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) (*int_skip)[i] = (int)len; for (i = 0; i < len - 1; i++) - (*int_skip)[s[i]] = len - 1 - i; + (*int_skip)[s[i]] = (int)(len - 1 - i); } return 0; } @@ -4053,12 +4054,12 @@ 11, 11, 11, 11, 11, 10, 10, 10, 10, 10 }; - int d; + OnigDistance d; if (mm->max == ONIG_INFINITE_DISTANCE) return 0; d = mm->max - mm->min; - if (d < (int )(sizeof(dist_vals)/sizeof(dist_vals[0]))) + if (d < sizeof(dist_vals)/sizeof(dist_vals[0])) /* return dist_vals[d] * 16 / (mm->min + 12); */ return (int )dist_vals[d]; else @@ -4540,7 +4541,7 @@ if (to->expr.len > 0) { if (add->len.max > 0) { if (to->expr.len > (int )add->len.max) - to->expr.len = add->len.max; + to->expr.len = (int)add->len.max; if (to->expr.mmd.max == 0) select_opt_exact_info(enc, &to->exb, &to->expr); @@ -4618,7 +4619,7 @@ case NT_STR: { StrNode* sn = NSTR(node); - int slen = sn->end - sn->s; + OnigDistance slen = sn->end - sn->s; int is_raw = NSTRING_IS_RAW(node); if (! NSTRING_IS_AMBIG(node)) { @@ -4630,7 +4631,7 @@ set_mml(&opt->len, slen, slen); } else { - int max; + OnigDistance max; if (NSTRING_IS_DONT_GET_OPT_INFO(node)) { int n = onigenc_strlen(env->enc, sn->s, sn->end); @@ -4653,7 +4654,7 @@ set_mml(&opt->len, slen, max); } - if (opt->exb.len == slen) + if ((OnigDistance)opt->exb.len == slen) opt->exb.reach_end = 1; } break; @@ -4957,7 +4958,7 @@ reg->dmax = e->mmd.max; if (reg->dmin != ONIG_INFINITE_DISTANCE) { - reg->threshold_len = reg->dmin + (reg->exact_end - reg->exact); + reg->threshold_len = (int)(reg->dmin + (reg->exact_end - reg->exact)); } return 0; @@ -4976,7 +4977,7 @@ reg->dmax = m->mmd.max; if (reg->dmin != ONIG_INFINITE_DISTANCE) { - reg->threshold_len = reg->dmin + 1; + reg->threshold_len = (int)(reg->dmin + 1); } } @@ -5316,7 +5317,8 @@ { #define COMPILE_INIT_SIZE 20 - int r, init_size; + int r; + OnigDistance init_size; Node* root; ScanEnv scan_env = {0}; #ifdef USE_SUBEXP_CALL Index: time.c =================================================================== --- time.c (revision 30739) +++ time.c (revision 30740) @@ -885,8 +885,8 @@ result = rb_localtime_r(t, result); #if defined(HAVE_MKTIME) && defined(LOCALTIME_OVERFLOW_PROBLEM) if (result) { - int gmtoff1 = 0; - int gmtoff2 = 0; + long gmtoff1 = 0; + long gmtoff2 = 0; struct tm tmp = *result; time_t t2; # if defined(HAVE_STRUCT_TM_TM_GMTOFF) Index: ChangeLog =================================================================== --- ChangeLog (revision 30739) +++ ChangeLog (revision 30740) @@ -1,3 +1,14 @@ +Mon Jan 31 12:26:14 2011 NARUSE, Yui <naruse@r...> + + * addr2line.c: suppressed shorten-64-to-32 warnings. + * regcomp.c: ditto. + * regexec.c: ditto. + * regint.h: ditto. + * regparse.c: ditto. + * regparse.h: ditto. + * time.c: ditto. + * variable.c: ditto. + Mon Jan 31 04:45:12 2011 NARUSE, Yui <naruse@r...> * array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before Index: variable.c =================================================================== --- variable.c (revision 30739) +++ variable.c (revision 30740) @@ -1906,7 +1906,7 @@ rb_vm_change_state(); ce = ALLOC(rb_const_entry_t); - ce->flag = visibility; + ce->flag = (rb_const_flag_t)visibility; ce->value = val; st_insert(RCLASS_CONST_TBL(klass), (st_data_t)id, (st_data_t)ce); Index: addr2line.c =================================================================== --- addr2line.c (revision 30739) +++ addr2line.c (revision 30740) @@ -116,7 +116,7 @@ } static const char * -get_nth_dirname(int dir, char *p) +get_nth_dirname(unsigned long dir, char *p) { if (!dir--) { return ""; @@ -125,7 +125,7 @@ while (*p) p++; p++; if (!*p) { - fprintf(stderr, "Unexpected directory number %d in %s\n", + fprintf(stderr, "Unexpected directory number %lu in %s\n", dir, binary_filename); return ""; } @@ -298,10 +298,10 @@ break; } case DW_LNS_set_file: - file = uleb128(&p); + file = (unsigned int)uleb128(&p); break; case DW_LNS_set_column: - column = uleb128(&p); + column = (unsigned int)uleb128(&p); break; case DW_LNS_negate_stmt: is_stmt = !is_stmt; @@ -325,7 +325,7 @@ epilogue_begin = 1; break; case DW_LNS_set_isa: - isa = uleb128(&p); + isa = (unsigned int)uleb128(&p); break; case 0: a = *(unsigned char *)p++; @@ -360,13 +360,13 @@ } break; default: { - unsigned int addr_incr; - int line_incr; + unsigned long addr_incr; + unsigned long line_incr; a = op - opcode_base; addr_incr = (a / line_range) * minimum_instruction_length; line_incr = line_base + (a % line_range); - addr += addr_incr; - line += line_incr; + addr += (unsigned int)addr_incr; + line += (unsigned int)line_incr; FILL_LINE(); } } Index: regint.h =================================================================== --- regint.h (revision 30739) +++ regint.h (revision 30740) @@ -403,7 +403,7 @@ } while (0) #define BBUF_WRITE(buf,pos,bytes,n) do{\ - int used = (pos) + (n);\ + int used = (pos) + (int)(n);\ if ((buf)->alloc < (unsigned int )used) BBUF_EXPAND((buf),used);\ xmemcpy((buf)->p + (pos), (bytes), (n));\ if ((buf)->used < (unsigned int )used) (buf)->used = used;\ @@ -802,7 +802,7 @@ extern UChar* onig_error_code_to_format P_((int code)); extern void onig_snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...)); -extern int onig_bbuf_init P_((BBuf* buf, int size)); +extern int onig_bbuf_init P_((BBuf* buf, OnigDistance size)); extern int onig_compile P_((regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo, const char *sourcefile, int sourceline)); extern void onig_chain_reduce P_((regex_t* reg)); extern void onig_chain_link_add P_((regex_t* to, regex_t* add)); Index: regexec.c =================================================================== --- regexec.c (revision 30739) +++ regexec.c (revision 30740) @@ -1254,7 +1254,8 @@ { static const UChar FinishCode[] = { OP_FINISH }; - int i, n, num_mem, best_len, pop_level; + int i, num_mem, best_len, pop_level; + ptrdiff_t n; LengthType tlen, tlen2; MemNumType mem; RelAddrType addr; @@ -1331,14 +1332,14 @@ #ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE if (IS_FIND_LONGEST(option)) { if (n > msa->best_len) { - msa->best_len = n; + msa->best_len = (int)n; msa->best_s = (UChar* )sstart; } else goto end_best_len; } #endif - best_len = n; + best_len = (int)n; region = msa->region; if (region) { #ifdef USE_POSIX_API_REGION_OPTION @@ -1365,18 +1366,16 @@ } else { #endif /* USE_POSIX_API_REGION_OPTION */ - region->beg[0] = sstart - str; - region->end[0] = s - str; + region->beg[0] = (int)(sstart - str); + region->end[0] = (int)(s - str); for (i = 1; i <= num_mem; i++) { if (mem_end_stk[i] != INVALID_STACK_INDEX) { - if (BIT_STATUS_AT(reg->bt_mem_start, i)) - region->beg[i] = STACK_AT(mem_start_stk[i])->u.mem.pstr - str; - else - region->beg[i] = (UChar* )((void* )mem_start_stk[i]) - str; - - region->end[i] = (BIT_STATUS_AT(reg->bt_mem_end, i) - ? STACK_AT(mem_end_stk[i])->u.mem.pstr - : (UChar* )((void* )mem_end_stk[i])) - str; + region->beg[i] = (int)((BIT_STATUS_AT(reg->bt_mem_start, i)) + ? STACK_AT(mem_start_stk[i])->u.mem.pstr - str + : (UChar* )((void* )mem_start_stk[i]) - str); + region->end[i] = (int)(BIT_STATUS_AT(reg->bt_mem_end, i) + ? STACK_AT(mem_end_stk[i])->u.mem.pstr - str + : (UChar* )((void* )mem_end_stk[i]) - str); } else { region->beg[i] = region->end[i] = ONIG_REGION_NOTPOS; @@ -2201,7 +2200,7 @@ n = pend - pstart; DATA_ENSURE(n); sprev = s; - STRING_CMP_IC(case_fold_flag, pstart, &s, n, end); + STRING_CMP_IC(case_fold_flag, pstart, &s, (int)n, end); while (sprev + (len = enclen(encode, sprev, end)) < s) sprev += len; @@ -2273,7 +2272,7 @@ DATA_ENSURE(n); sprev = s; swork = s; - STRING_CMP_VALUE_IC(case_fold_flag, pstart, &swork, n, end, is_fail); + STRING_CMP_VALUE_IC(case_fold_flag, pstart, &swork, (int)n, end, is_fail); if (is_fail) continue; s = swork; while (sprev + (len = enclen(encode, sprev, end)) < s) @@ -2898,7 +2897,7 @@ { const UChar *s, *se, *t, *p, *end; const UChar *tail; - int skip, tlen1; + ptrdiff_t skip, tlen1; #ifdef ONIG_DEBUG_SEARCH fprintf(stderr, "bm_search_notrev: text: %d, text_end: %d, text_range: %d\n", @@ -2997,7 +2996,7 @@ if (IS_NULL(*skip)) return ONIGERR_MEMORY; } - len = end - s; + len = (int)(end - s); for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) (*skip)[i] = len; @@ -3370,7 +3369,7 @@ onig_search(regex_t* reg, const UChar* str, const UChar* end, const UChar* start, const UChar* range, OnigRegion* region, OnigOptionType option) { - int r; + long r; UChar *s, *prev; OnigMatchArg msa; const UChar *orig_start = start; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/