diff options
Diffstat (limited to 'ext/psych')
| -rw-r--r-- | ext/psych/psych.c | 6 | ||||
| -rw-r--r-- | ext/psych/psych_parser.c | 34 |
2 files changed, 20 insertions, 20 deletions
diff --git a/ext/psych/psych.c b/ext/psych/psych.c index 3bb59bfc11..0afd7318b5 100644 --- a/ext/psych/psych.c +++ b/ext/psych/psych.c @@ -11,9 +11,9 @@ static VALUE libyaml_version(VALUE module) yaml_get_version(&major, &minor, &patch); - list[0] = INT2NUM((long)major); - list[1] = INT2NUM((long)minor); - list[2] = INT2NUM((long)patch); + list[0] = INT2NUM(major); + list[1] = INT2NUM(minor); + list[2] = INT2NUM(patch); return rb_ary_new4((long)3, list); } diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c index fb1a917bb2..fd550b671a 100644 --- a/ext/psych/psych_parser.c +++ b/ext/psych/psych_parser.c @@ -27,7 +27,7 @@ static ID id_event_location; static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read) { VALUE io = (VALUE)data; - VALUE string = rb_funcall(io, id_read, 1, INT2NUM(size)); + VALUE string = rb_funcall(io, id_read, 1, SIZET2NUM(size)); *read = 0; @@ -89,9 +89,9 @@ static VALUE make_exception(yaml_parser_t * parser, VALUE path) return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6, path, - INT2NUM(line), - INT2NUM(column), - INT2NUM(parser->problem_offset), + SIZET2NUM(line), + SIZET2NUM(column), + SIZET2NUM(parser->problem_offset), parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil, parser->context ? rb_usascii_str_new2(parser->context) : Qnil); } @@ -303,10 +303,10 @@ static VALUE parse(int argc, VALUE *argv, VALUE self) rb_exc_raise(exception); } - start_line = INT2NUM((long)event.start_mark.line); - start_column = INT2NUM((long)event.start_mark.column); - end_line = INT2NUM((long)event.end_mark.line); - end_column = INT2NUM((long)event.end_mark.column); + start_line = SIZET2NUM(event.start_mark.line); + start_column = SIZET2NUM(event.start_mark.column); + end_line = SIZET2NUM(event.end_mark.line); + end_column = SIZET2NUM(event.end_mark.column); event_args[0] = handler; event_args[1] = start_line; @@ -321,7 +321,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self) VALUE args[2]; args[0] = handler; - args[1] = INT2NUM((long)event.data.stream_start.encoding); + args[1] = INT2NUM(event.data.stream_start.encoding); rb_protect(protected_start_stream, (VALUE)args, &state); } break; @@ -334,8 +334,8 @@ static VALUE parse(int argc, VALUE *argv, VALUE self) VALUE version = event.data.document_start.version_directive ? rb_ary_new3( (long)2, - INT2NUM((long)event.data.document_start.version_directive->major), - INT2NUM((long)event.data.document_start.version_directive->minor) + INT2NUM(event.data.document_start.version_directive->major), + INT2NUM(event.data.document_start.version_directive->minor) ) : rb_ary_new(); if(event.data.document_start.tag_directives.start) { @@ -418,7 +418,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self) quoted_implicit = event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue; - style = INT2NUM((long)event.data.scalar.style); + style = INT2NUM(event.data.scalar.style); args[0] = handler; args[1] = val; @@ -450,7 +450,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self) implicit = event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue; - style = INT2NUM((long)event.data.sequence_start.style); + style = INT2NUM(event.data.sequence_start.style); args[0] = handler; args[1] = anchor; @@ -483,7 +483,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self) implicit = event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue; - style = INT2NUM((long)event.data.mapping_start.style); + style = INT2NUM(event.data.mapping_start.style); args[0] = handler; args[1] = anchor; @@ -527,9 +527,9 @@ static VALUE mark(VALUE self) TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser); mark_klass = rb_const_get_at(cPsychParser, rb_intern("Mark")); - args[0] = INT2NUM(parser->mark.index); - args[1] = INT2NUM(parser->mark.line); - args[2] = INT2NUM(parser->mark.column); + args[0] = SIZET2NUM(parser->mark.index); + args[1] = SIZET2NUM(parser->mark.line); + args[2] = SIZET2NUM(parser->mark.column); return rb_class_new_instance(3, args, mark_klass); } |