Skip to content

Commit

Permalink
Resolve integer-truncation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@wjk
wjk committed Apr 5, 2014
1 parent 1dce80b commit 6bfc0f9
Show file tree
Hide file tree
Showing 13 changed files with 75 additions and 73 deletions.
2 changes: 2 additions & 0 deletions framework/CocoaOniguruma.xcodeproj/project.pbxproj
View file
Expand Up @@ -491,6 +491,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
Expand All @@ -503,6 +504,7 @@
buildSettings = { buildSettings = {
DEPLOYMENT_LOCATION = NO; DEPLOYMENT_LOCATION = NO;
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
INSTALL_PATH = ""; INSTALL_PATH = "";
Expand Down
10 changes: 5 additions & 5 deletions framework/core/OnigRegexp.m
View file
Expand Up @@ -167,7 +167,7 @@ - (OnigResult*)search:(NSString*)target start:(int)start
- (OnigResult*)search:(NSString*)target start:(int)start end:(int)end - (OnigResult*)search:(NSString*)target start:(int)start end:(int)end
{ {
if (!target) return nil; if (!target) return nil;
if (end < 0) end = [target length]; if (end < 0) end = (int) [target length];


OnigRegion* region = onig_region_new(); OnigRegion* region = onig_region_new();
const UChar* str = (const UChar*)[target cStringUsingEncoding:STRING_ENCODING]; const UChar* str = (const UChar*)[target cStringUsingEncoding:STRING_ENCODING];
Expand Down Expand Up @@ -195,7 +195,7 @@ - (OnigResult*)search:(NSString*)target start:(int)start end:(int)end


- (OnigResult*)search:(NSString*)target range:(NSRange)range - (OnigResult*)search:(NSString*)target range:(NSRange)range
{ {
return [self search:target start:range.location end:NSMaxRange(range)]; return [self search:target start:(int) range.location end:(int) NSMaxRange(range)];
} }


- (OnigResult*)match:(NSString*)target - (OnigResult*)match:(NSString*)target
Expand Down Expand Up @@ -287,7 +287,7 @@ - (NSString*)target


- (int)size - (int)size
{ {
return [self count]; return (int) [self count];
} }


- (NSUInteger)count - (NSUInteger)count
Expand All @@ -304,7 +304,7 @@ - (NSArray*)strings
{ {
NSMutableArray* array = [NSMutableArray array]; NSMutableArray* array = [NSMutableArray array];
int i, count; int i, count;
for (i=0, count=[self count]; i<count; i++) { for (i=0, count=(int) [self count]; i<count; i++) {
[array addObject:[self stringAt:i]]; [array addObject:[self stringAt:i]];
} }
return array; return array;
Expand Down Expand Up @@ -386,7 +386,7 @@ - (NSIndexSet*)indexesForName:(NSString*)name


- (NSString*)stringForName:(NSString*)name - (NSString*)stringForName:(NSString*)name
{ {
int n = [self indexForName:name]; int n = (int) [self indexForName:name];
return n < 0 ? nil : [self stringAt:n]; return n < 0 ? nil : [self stringAt:n];
} }


Expand Down
8 changes: 4 additions & 4 deletions framework/core/OnigRegexpUtility.m
View file
Expand Up @@ -114,8 +114,8 @@ - (NSArray*)split:(id)pattern limit:(NSNumber*)limitNum
OnigResult* res; OnigResult* res;
while ((res = [pattern search:target start:start])) { while ((res = [pattern search:target start:start])) {
NSRange range = [res bodyRange]; NSRange range = [res bodyRange];
int end = range.location; int end = (int) range.location;
int right = NSMaxRange(range); int right = (int) NSMaxRange(range);


if (start == end && range.length == 0) { if (start == end && range.length == 0) {
if ([target length] == 0) { if ([target length] == 0) {
Expand Down Expand Up @@ -218,11 +218,11 @@ - (NSString*)replaceAllByRegexp:(id)pattern withCallback:(OnigReplaceCallback)ca


do { do {
NSRange range = [res bodyRange]; NSRange range = [res bodyRange];
int len = range.location-offset; int len = (int) range.location-offset;
if (len > 0) [s appendString:[self substringWithRange:NSMakeRange(offset, len)]]; if (len > 0) [s appendString:[self substringWithRange:NSMakeRange(offset, len)]];
[s appendString:callback(res, data, sel)]; [s appendString:callback(res, data, sel)];


offset = NSMaxRange(range); offset = (int) NSMaxRange(range);
if (range.length == 0) { if (range.length == 0) {
// consume 1 character at least // consume 1 character at least
if ([self length] <= offset) break; if ([self length] <= offset) break;
Expand Down
2 changes: 1 addition & 1 deletion framework/core/oniguruma/enc/utf16_le.c
View file
Expand Up @@ -106,7 +106,7 @@ utf16le_code_to_mbc(OnigCodePoint code, UChar *buf)
if (code > 0xffff) { if (code > 0xffff) {
unsigned int plane, high; unsigned int plane, high;


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


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


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


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


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


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


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


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


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


end = sn->end; end = sn->end;
sbuf_size = (end - sn->s) * 2; sbuf_size = (int) (end - sn->s) * 2;
sbuf = (UChar* )xmalloc(sbuf_size); sbuf = (UChar* )xmalloc(sbuf_size);
CHECK_NULL_RETURN_MEMERR(sbuf); CHECK_NULL_RETURN_MEMERR(sbuf);
ebuf = sbuf + sbuf_size; ebuf = sbuf + sbuf_size;
Expand Down Expand Up @@ -3905,7 +3905,7 @@ set_bm_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED,
{ {
int i, len; int i, len;


len = end - s; len = (int) (end - s);
if (len < ONIG_CHAR_TABLE_SIZE) { if (len < ONIG_CHAR_TABLE_SIZE) {
for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) skip[i] = len; 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: case NT_STR:
{ {
StrNode* sn = NSTR(node); StrNode* sn = NSTR(node);
int slen = sn->end - sn->s; int slen = (int) (sn->end - sn->s);
int is_raw = NSTRING_IS_RAW(node); int is_raw = NSTRING_IS_RAW(node);


if (! NSTRING_IS_AMBIG(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; reg->dmax = e->mmd.max;


if (reg->dmin != ONIG_INFINITE_DISTANCE) { 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; return 0;
Expand Down Expand Up @@ -5281,7 +5281,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
#endif #endif


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


extern int 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)) if (enclen(enc, buf) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE; return ONIGERR_INVALID_CODE_POINT_VALUE;
#endif #endif
return p - buf; return (int) (p - buf);
} }


extern int extern int
Expand Down
6 changes: 3 additions & 3 deletions framework/core/oniguruma/regerror.c
View file
Expand Up @@ -232,7 +232,7 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end,
*is_over = ((p < end) ? 1 : 0); *is_over = ((p < end) ? 1 : 0);
} }
else { else {
len = MIN((end - s), buf_size); len = (int) MIN((end - s), buf_size);
xmemcpy(buf, s, (size_t )len); xmemcpy(buf, s, (size_t )len);
*is_over = ((buf_size < (end - s)) ? 1 : 0); *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'; *p = '\0';
len = p - s; len = (int) (p - s);
break; break;


default: 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); n = xvsnprintf((char* )buf, bufsize, (const char* )fmt, args);
va_end(args); va_end(args);


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


if (n + need < bufsize) { if (n + need < bufsize) {
strcat((char* )buf, ": /"); strcat((char* )buf, ": /");
Expand Down

0 comments on commit 6bfc0f9

Please sign in to comment.