Skip to content

Commit

Permalink
Make a bunch of long->int casts explicit in oniguruma.
Browse files Browse the repository at this point in the history 
This eliminates a huge chunk of the remaining compilation
warnings.
  • Loading branch information
@Shadowfiend
Shadowfiend committed Nov 6, 2013
1 parent 5597d39 commit 9843743
Show file tree
Hide file tree
Showing 12 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion oniguruma/enc/utf16_be.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ utf16be_code_to_mbc(OnigCodePoint code, UChar *buf)
if (code > 0xffff) {
unsigned int plane, high;

plane = (code >> 16) - 1;
plane = (unsigned int)((code >> 16) - 1);
*p++ = (plane >> 2) + 0xd8;
high = (code & 0xff00) >> 8;
*p++ = ((plane & 0x03) << 6) + (high >> 2);
Expand Down
2 changes: 1 addition & 1 deletion oniguruma/enc/utf16_le.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ utf16le_code_to_mbc(OnigCodePoint code, UChar *buf)
if (code > 0xffff) {
unsigned int plane, high;

plane = (code >> 16) - 1;
plane = (unsigned int)((code >> 16) - 1);
high = (code & 0xff00) >> 8;

*p++ = ((plane & 0x03) << 6) + (high >> 2);
Expand Down
30 changes: 15 additions & 15 deletions oniguruma/regcomp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static unsigned char PadBuf[WORD_ALIGNMENT_SIZE];
static UChar*
str_dup(UChar* s, UChar* end)
{
int len = end - s;
int len = (int)(end - s);

if (len > 0) {
UChar* r = (UChar* )xmalloc(len + 1);
Expand All @@ -73,7 +73,7 @@ swap_node(Node* a, Node* b)
if (NTYPE(a) == NT_STR) {
StrNode* sn = NSTR(a);
if (sn->capa == 0) {
int len = sn->end - sn->s;
int len = (int)(sn->end - sn->s);
sn->s = sn->buf;
sn->end = sn->s + len;
}
Expand All @@ -82,7 +82,7 @@ swap_node(Node* a, Node* b)
if (NTYPE(b) == NT_STR) {
StrNode* sn = NSTR(b);
if (sn->capa == 0) {
int len = sn->end - sn->s;
int len = (int)(sn->end - sn->s);
sn->s = sn->buf;
sn->end = sn->s + len;
}
Expand Down Expand Up @@ -499,7 +499,7 @@ compile_length_string_raw_node(StrNode* sn, regex_t* reg)
if (sn->end <= sn->s)
return 0;

return add_compile_string_length(sn->s, 1 /* sb */, sn->end - sn->s, reg, 0);
return add_compile_string_length(sn->s, 1 /* sb */, (int)(sn->end - sn->s), reg, 0);
}

static int
Expand Down Expand Up @@ -547,7 +547,7 @@ compile_string_raw_node(StrNode* sn, regex_t* reg)
if (sn->end <= sn->s)
return 0;

return add_compile_string(sn->s, 1 /* sb */, sn->end - sn->s, reg, 0);
return add_compile_string(sn->s, 1 /* sb */, (int)(sn->end - sn->s), reg, 0);
}

static int
Expand Down Expand Up @@ -2085,7 +2085,7 @@ get_min_match_length(Node* node, OnigDistance *min, ScanEnv* env)
case NT_STR:
{
StrNode* sn = NSTR(node);
*min = sn->end - sn->s;
*min = (int)(sn->end - sn->s);
}
break;

Expand Down Expand Up @@ -2169,7 +2169,7 @@ get_max_match_length(Node* node, OnigDistance *max, ScanEnv* env)
case NT_STR:
{
StrNode* sn = NSTR(node);
*max = sn->end - sn->s;
*max = (int)(sn->end - sn->s);
}
break;

Expand Down Expand Up @@ -2542,8 +2542,8 @@ is_not_included(Node* x, Node* y, regex_t* reg)
{
UChar *q;
StrNode* ys = NSTR(y);
len = NSTRING_LEN(x);
if (len > NSTRING_LEN(y)) len = NSTRING_LEN(y);
len = (int)NSTRING_LEN(x);
if (len > NSTRING_LEN(y)) len = (int)NSTRING_LEN(y);
if (NSTRING_IS_AMBIG(x) || NSTRING_IS_AMBIG(y)) {
/* tiny version */
return 0;
Expand Down Expand Up @@ -3195,7 +3195,7 @@ update_string_node_case_fold(regex_t* reg, Node *node)
StrNode* sn = NSTR(node);

end = sn->end;
sbuf_size = (end - sn->s) * 2;
sbuf_size = (int)((end - sn->s) * 2);
sbuf = (UChar* )xmalloc(sbuf_size);
CHECK_NULL_RETURN_MEMERR(sbuf);
ebuf = sbuf + sbuf_size;
Expand Down Expand Up @@ -3765,7 +3765,7 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env)
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);
int len = (int)(NSTRING_LEN(target));
StrNode* sn = NSTR(target);

if (len * qn->lower <= EXPAND_STRING_MAX_LENGTH) {
Expand Down Expand Up @@ -3905,7 +3905,7 @@ set_bm_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED,
{
int i, len;

len = end - s;
len = (int)(end - s);
if (len < ONIG_CHAR_TABLE_SIZE) {
for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) skip[i] = len;

Expand Down Expand Up @@ -4581,7 +4581,7 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
case NT_STR:
{
StrNode* sn = NSTR(node);
int slen = sn->end - sn->s;
int slen = (int)(sn->end - sn->s);
int is_raw = NSTRING_IS_RAW(node);

if (! NSTRING_IS_AMBIG(node)) {
Expand Down Expand Up @@ -4920,7 +4920,7 @@ set_optimize_exact_info(regex_t* reg, OptExactInfo* e)
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;
Expand Down Expand Up @@ -5281,7 +5281,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
#endif

if (reg->alloc == 0) {
init_size = (pattern_end - pattern) * 2;
init_size = (int)((pattern_end - pattern) * 2);
if (init_size <= 0) init_size = COMPILE_INIT_SIZE;
r = BBUF_INIT(reg, init_size);
if (r != 0) goto end;
Expand Down
4 changes: 2 additions & 2 deletions oniguruma/regenc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ onigenc_mb2_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf)
if (enclen(enc, buf) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE;
#endif
return p - buf;
return (int)(p - buf);
}

extern int
Expand All @@ -751,7 +751,7 @@ onigenc_mb4_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf)
if (enclen(enc, buf) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE;
#endif
return p - buf;
return (int)(p - buf);
}

extern int
Expand Down
6 changes: 3 additions & 3 deletions oniguruma/regerror.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end,
*is_over = ((p < end) ? 1 : 0);
}
else {
len = MIN((end - s), buf_size);
len = (int)(MIN((end - s), buf_size));
xmemcpy(buf, s, (size_t )len);
*is_over = ((buf_size < (end - s)) ? 1 : 0);
}
Expand Down Expand Up @@ -296,7 +296,7 @@ onig_error_code_to_str(s, code, va_alist)
}
}
*p = '\0';
len = p - s;
len = (int)(p - s);
break;

default:
Expand Down Expand Up @@ -336,7 +336,7 @@ onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
n = xvsnprintf((char* )buf, bufsize, (const char* )fmt, args);
va_end(args);

need = (pat_end - pat) * 4 + 4;
need = (int)((pat_end - pat) * 4 + 4);

if (n + need < bufsize) {
strcat((char* )buf, ": /");
Expand Down
48 changes: 24 additions & 24 deletions oniguruma/regexec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
#define STACK_SAVE do{\
if (stk_base != stk_alloc) {\
msa->stack_p = stk_base;\
msa->stack_n = stk_end - stk_base;\
msa->stack_n = (int)(stk_end - stk_base);\
};\
} while(0)

Expand Down Expand Up @@ -435,7 +435,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
stk_end = *arg_stk_end;
stk = *arg_stk;

n = stk_end - stk_base;
n = (int)(stk_end - stk_base);
if (stk_base == stk_alloc && IS_NULL(msa->stack_p)) {
x = (OnigStackType* )xmalloc(sizeof(OnigStackType) * n * 2);
if (IS_NULL(x)) {
Expand Down Expand Up @@ -1314,7 +1314,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
sbegin = s;
switch (*p++) {
case OP_END: MOP_IN(OP_END);
n = s - sstart;
n = (int)(s - sstart);
if (n > best_len) {
OnigRegion* region;
#ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
Expand All @@ -1334,18 +1334,18 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (IS_POSIX_REGION(msa->options)) {
posix_regmatch_t* rmt = (posix_regmatch_t* )region;

rmt[0].rm_so = sstart - str;
rmt[0].rm_eo = s - str;
rmt[0].rm_so = (int)(sstart - str);
rmt[0].rm_eo = (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))
rmt[i].rm_so = STACK_AT(mem_start_stk[i])->u.mem.pstr - str;
rmt[i].rm_so = (int)(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);
else
rmt[i].rm_so = (UChar* )((void* )(mem_start_stk[i])) - str;
rmt[i].rm_so = (int)((UChar* )((void* )(mem_start_stk[i])) - str);

rmt[i].rm_eo = (BIT_STATUS_AT(reg->bt_mem_end, i)
rmt[i].rm_eo = (int)((BIT_STATUS_AT(reg->bt_mem_end, i)
? STACK_AT(mem_end_stk[i])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[i])) - str;
: (UChar* )((void* )mem_end_stk[i])) - str);
}
else {
rmt[i].rm_so = rmt[i].rm_eo = ONIG_REGION_NOTPOS;
Expand All @@ -1354,18 +1354,18 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
}
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;
region->beg[i] = (int)(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);
else
region->beg[i] = (UChar* )((void* )mem_start_stk[i]) - str;
region->beg[i] = (int)((UChar* )((void* )mem_start_stk[i]) - str);

region->end[i] = (BIT_STATUS_AT(reg->bt_mem_end, i)
region->end[i] = (int)((BIT_STATUS_AT(reg->bt_mem_end, i)
? STACK_AT(mem_end_stk[i])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[i])) - str;
: (UChar* )((void* )mem_end_stk[i])) - str);
}
else {
region->beg[i] = region->end[i] = ONIG_REGION_NOTPOS;
Expand All @@ -1387,8 +1387,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
}

node->group = 0;
node->beg = sstart - str;
node->end = s - str;
node->beg = (int)(sstart - str);
node->end = (int)(s - str);

stkp = stk_base;
r = make_capture_history_tree(region->history_root, &stkp,
Expand Down Expand Up @@ -2155,7 +2155,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)
? STACK_AT(mem_end_stk[mem])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[mem]));
n = pend - pstart;
n = (int)(pend - pstart);
DATA_ENSURE(n);
sprev = s;
STRING_CMP(pstart, s, n);
Expand Down Expand Up @@ -2187,7 +2187,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)
? STACK_AT(mem_end_stk[mem])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[mem]));
n = pend - pstart;
n = (int)(pend - pstart);
DATA_ENSURE(n);
sprev = s;
STRING_CMP_IC(case_fold_flag, pstart, &s, n);
Expand Down Expand Up @@ -2219,7 +2219,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)
? STACK_AT(mem_end_stk[mem])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[mem]));
n = pend - pstart;
n = (int)(pend - pstart);
DATA_ENSURE(n);
sprev = s;
swork = s;
Expand Down Expand Up @@ -2258,7 +2258,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)
? STACK_AT(mem_end_stk[mem])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[mem]));
n = pend - pstart;
n = (int)(pend - pstart);
DATA_ENSURE(n);
sprev = s;
swork = s;
Expand Down Expand Up @@ -2886,7 +2886,7 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
#endif

tail = target_end - 1;
tlen1 = tail - target;
tlen1 = (int)(tail - target);
end = text_range;
if (end + tlen1 > text_end)
end = text_end - tlen1;
Expand Down Expand Up @@ -2977,7 +2977,7 @@ set_bm_backward_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED,
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;

Expand Down Expand Up @@ -3745,7 +3745,7 @@ onig_search(regex_t* reg, const UChar* str, const UChar* end,
match:
ONIG_STATE_DEC_THREAD(reg);
MATCH_ARG_FREE(msa);
return s - str;
return (int)(s - str);
}

extern OnigEncoding
Expand Down
2 changes: 1 addition & 1 deletion oniguruma/regext.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static int
conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* end,
UChar** conv, UChar** conv_end)
{
int len = end - s;
int len = (int)(end - s);

if (to == ONIG_ENCODING_UTF16_BE) {
if (from == ONIG_ENCODING_ASCII || from == ONIG_ENCODING_ISO_8859_1) {
Expand Down
2 changes: 1 addition & 1 deletion oniguruma/reggnu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ re_adjust_startpos(regex_t* reg, const char* string, int size,
else {
p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, (UChar* )string, s);
}
return p - (UChar* )string;
return (int)(p - (UChar* )string);
}

return startpos;
Expand Down
6 changes: 3 additions & 3 deletions oniguruma/regint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,11 @@ typedef unsigned int BitStatusType;

#define INT_MAX_LIMIT ((1UL << (SIZEOF_INT * 8 - 1)) - 1)

#define DIGITVAL(code) ((code) - '0')
#define DIGITVAL(code) (int)((code) - '0')
#define ODIGITVAL(code) DIGITVAL(code)
#define XDIGITVAL(enc,code) \
(ONIGENC_IS_CODE_DIGIT(enc,code) ? DIGITVAL(code) \
: (ONIGENC_IS_CODE_UPPER(enc,code) ? (code) - 'A' + 10 : (code) - 'a' + 10))
: (ONIGENC_IS_CODE_UPPER(enc,code) ? (int)((code) - 'A' + 10) : (int)((code) - 'a' + 10)))

#define IS_SINGLELINE(option) ((option) & ONIG_OPTION_SINGLELINE)
#define IS_MULTILINE(option) ((option) & ONIG_OPTION_MULTILINE)
Expand Down Expand Up @@ -576,7 +576,7 @@ typedef void* PointerType;
#define GET_STATE_CHECK_NUM_INC(num,p) PLATFORM_GET_INC(num, p, StateCheckNumType)

/* code point's address must be aligned address. */
#define GET_CODE_POINT(code,p) code = *((OnigCodePoint* )(p))
#define GET_CODE_POINT(code,p) code = (int)*((OnigCodePoint* )(p))
#define GET_BYTE_INC(byte,p) do{\
byte = *(p);\
(p)++;\
Expand Down
Loading

0 comments on commit 9843743

Please sign in to comment.