Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve type conversion warnings for c99 and above compilers. #246

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve type conversion warnings for c99 and above compilers. #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ yaml_scalar_event_initialize(yaml_event_t *event,
}

if (length < 0) {
length = strlen((char *)value);
length = (int) strlen((char *)value);
}

if (!yaml_check_utf8(value, length)) goto error;
Expand Down Expand Up @@ -1216,7 +1216,7 @@ yaml_document_add_scalar(yaml_document_t *document,
if (!tag_copy) goto error;

if (length < 0) {
length = strlen((char *)value);
length = (int) strlen((char *)value);
}

if (!yaml_check_utf8(value, length)) goto error;
Expand Down
4 changes: 2 additions & 2 deletions src/emitter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2162,8 +2162,8 @@ yaml_emitter_write_double_quoted_scalar(yaml_emitter_t *emitter,
if (!PUT(emitter, 'U')) return 0;
width = 8;
}
for (k = (width-1)*4; k >= 0; k -= 4) {
int digit = (value >> k) & 0x0F;
for (k = (int) ((width-1)*4); k >= 0; k -= 4) {
int digit = (int) ((value >> k) & 0x0F);
if (!PUT(emitter, digit + (digit < 10 ? '0' : 'A'-10)))
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,4 +541,4 @@ yaml_parser_load_mapping_end(yaml_parser_t *parser, yaml_event_t *event,
(void)POP(parser, *ctx);

return 1;
}
}
28 changes: 14 additions & 14 deletions src/reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)
if ((value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF)
return yaml_parser_set_reader_error(parser,
"invalid Unicode character",
parser->offset, value);
parser->offset, (int) value);

break;

Expand Down Expand Up @@ -350,7 +350,7 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)
if ((value & 0xFC00) == 0xDC00)
return yaml_parser_set_reader_error(parser,
"unexpected low surrogate area",
parser->offset, value);
parser->offset, (int) value);

/* Check for a high surrogate area. */

Expand Down Expand Up @@ -380,7 +380,7 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)
if ((value2 & 0xFC00) != 0xDC00)
return yaml_parser_set_reader_error(parser,
"expected low surrogate area",
parser->offset+2, value2);
parser->offset+2, (int) value2);

/* Generate the value of the surrogate pair. */

Expand Down Expand Up @@ -415,7 +415,7 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)
|| (value >= 0x10000 && value <= 0x10FFFF)))
return yaml_parser_set_reader_error(parser,
"control characters are not allowed",
parser->offset, value);
parser->offset, (int) value);

/* Move the raw pointers. */

Expand All @@ -426,25 +426,25 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)

/* 0000 0000-0000 007F -> 0xxxxxxx */
if (value <= 0x7F) {
*(parser->buffer.last++) = value;
*(parser->buffer.last++) = (unsigned char) value;
}
/* 0000 0080-0000 07FF -> 110xxxxx 10xxxxxx */
else if (value <= 0x7FF) {
*(parser->buffer.last++) = 0xC0 + (value >> 6);
*(parser->buffer.last++) = 0x80 + (value & 0x3F);
*(parser->buffer.last++) = (unsigned char)(0xC0 + (value >> 6));
*(parser->buffer.last++) = (unsigned char)(0x80 + (value & 0x3F));
}
/* 0000 0800-0000 FFFF -> 1110xxxx 10xxxxxx 10xxxxxx */
else if (value <= 0xFFFF) {
*(parser->buffer.last++) = 0xE0 + (value >> 12);
*(parser->buffer.last++) = 0x80 + ((value >> 6) & 0x3F);
*(parser->buffer.last++) = 0x80 + (value & 0x3F);
*(parser->buffer.last++) = (unsigned char)(0xE0 + (value >> 12));
*(parser->buffer.last++) = (unsigned char)(0x80 + ((value >> 6) & 0x3F));
*(parser->buffer.last++) = (unsigned char)(0x80 + (value & 0x3F));
}
/* 0001 0000-0010 FFFF -> 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
else {
*(parser->buffer.last++) = 0xF0 + (value >> 18);
*(parser->buffer.last++) = 0x80 + ((value >> 12) & 0x3F);
*(parser->buffer.last++) = 0x80 + ((value >> 6) & 0x3F);
*(parser->buffer.last++) = 0x80 + (value & 0x3F);
*(parser->buffer.last++) = (unsigned char)(0xF0 + (value >> 18));
*(parser->buffer.last++) = (unsigned char)(0x80 + ((value >> 12) & 0x3F));
*(parser->buffer.last++) = (unsigned char)(0x80 + ((value >> 6) & 0x3F));
*(parser->buffer.last++) = (unsigned char)(0x80 + (value & 0x3F));
}

parser->unread ++;
Expand Down
34 changes: 17 additions & 17 deletions src/scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ yaml_parser_fetch_next_token(yaml_parser_t *parser)

/* Check the indentation level against the current column. */

if (!yaml_parser_unroll_indent(parser, parser->mark.column))
if (!yaml_parser_unroll_indent(parser, (long) parser->mark.column))
return 0;

/*
Expand Down Expand Up @@ -1585,7 +1585,7 @@ yaml_parser_fetch_block_entry(yaml_parser_t *parser)

/* Add the BLOCK-SEQUENCE-START token if needed. */

if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
if (!yaml_parser_roll_indent(parser, (long) parser->mark.column, -1,
YAML_BLOCK_SEQUENCE_START_TOKEN, parser->mark))
return 0;
}
Expand Down Expand Up @@ -1646,7 +1646,7 @@ yaml_parser_fetch_key(yaml_parser_t *parser)

/* Add the BLOCK-MAPPING-START token if needed. */

if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
if (!yaml_parser_roll_indent(parser, (long) parser->mark.column, -1,
YAML_BLOCK_MAPPING_START_TOKEN, parser->mark))
return 0;
}
Expand Down Expand Up @@ -1702,8 +1702,8 @@ yaml_parser_fetch_value(yaml_parser_t *parser)

/* In the block context, we may need to add the BLOCK-MAPPING-START token. */

if (!yaml_parser_roll_indent(parser, simple_key->mark.column,
simple_key->token_number,
if (!yaml_parser_roll_indent(parser, (long) simple_key->mark.column,
(long) simple_key->token_number,
YAML_BLOCK_MAPPING_START_TOKEN, simple_key->mark))
return 0;

Expand Down Expand Up @@ -1732,7 +1732,7 @@ yaml_parser_fetch_value(yaml_parser_t *parser)

/* Add the BLOCK-MAPPING-START token if needed. */

if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
if (!yaml_parser_roll_indent(parser, (long) parser->mark.column, -1,
YAML_BLOCK_MAPPING_START_TOKEN, parser->mark))
return 0;
}
Expand Down Expand Up @@ -2694,7 +2694,7 @@ yaml_parser_scan_uri_escapes(yaml_parser_t *parser, int directive,

/* Get the octet. */

octet = (AS_HEX_AT(parser->buffer, 1) << 4) + AS_HEX_AT(parser->buffer, 2);
octet = (unsigned char) (AS_HEX_AT(parser->buffer, 1) << 4) + AS_HEX_AT(parser->buffer, 2);

/* If it is the leading octet, determine the length of the UTF-8 sequence. */

Expand Down Expand Up @@ -3249,22 +3249,22 @@ yaml_parser_scan_flow_scalar(yaml_parser_t *parser, yaml_token_t *token,
}

if (value <= 0x7F) {
*(string.pointer++) = value;
*(string.pointer++) = (unsigned char) value;
}
else if (value <= 0x7FF) {
*(string.pointer++) = 0xC0 + (value >> 6);
*(string.pointer++) = 0x80 + (value & 0x3F);
*(string.pointer++) = (unsigned char) (0xC0 + (value >> 6));
*(string.pointer++) = (unsigned char) (0x80 + (value & 0x3F));
}
else if (value <= 0xFFFF) {
*(string.pointer++) = 0xE0 + (value >> 12);
*(string.pointer++) = 0x80 + ((value >> 6) & 0x3F);
*(string.pointer++) = 0x80 + (value & 0x3F);
*(string.pointer++) = (unsigned char) (0xE0 + (value >> 12));
*(string.pointer++) = (unsigned char) (0x80 + ((value >> 6) & 0x3F));
*(string.pointer++) = (unsigned char) (0x80 + (value & 0x3F));
}
else {
*(string.pointer++) = 0xF0 + (value >> 18);
*(string.pointer++) = 0x80 + ((value >> 12) & 0x3F);
*(string.pointer++) = 0x80 + ((value >> 6) & 0x3F);
*(string.pointer++) = 0x80 + (value & 0x3F);
*(string.pointer++) = (unsigned char) (0xF0 + (value >> 18));
*(string.pointer++) = (unsigned char) (0x80 + ((value >> 12) & 0x3F));
*(string.pointer++) = (unsigned char) (0x80 + ((value >> 6) & 0x3F));
*(string.pointer++) = (unsigned char) (0x80 + (value & 0x3F));
}

/* Advance the pointer. */
Expand Down
12 changes: 6 additions & 6 deletions src/writer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ yaml_emitter_flush(yaml_emitter_t *emitter)

if (value < 0x10000)
{
emitter->raw_buffer.last[high] = value >> 8;
emitter->raw_buffer.last[low] = value & 0xFF;
emitter->raw_buffer.last[high] = (unsigned char) (value >> 8);
emitter->raw_buffer.last[low] = (unsigned char) (value & 0xFF);

emitter->raw_buffer.last += 2;
}
Expand All @@ -114,10 +114,10 @@ yaml_emitter_flush(yaml_emitter_t *emitter)
/* Write the character using a surrogate pair (check "reader.c"). */

value -= 0x10000;
emitter->raw_buffer.last[high] = 0xD8 + (value >> 18);
emitter->raw_buffer.last[low] = (value >> 10) & 0xFF;
emitter->raw_buffer.last[high+2] = 0xDC + ((value >> 8) & 0xFF);
emitter->raw_buffer.last[low+2] = value & 0xFF;
emitter->raw_buffer.last[high] = (unsigned char) (0xD8 + (value >> 18));
emitter->raw_buffer.last[low] = (unsigned char) ((value >> 10) & 0xFF);
emitter->raw_buffer.last[high+2] = (unsigned char) (0xDC + ((value >> 8) & 0xFF));
emitter->raw_buffer.last[low+2] = (unsigned char) (value & 0xFF);

emitter->raw_buffer.last += 4;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/example-deconstructor-alt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ main(int argc, char *argv[])
if (!key) goto document_error;
value = yaml_document_add_scalar(&output_document, NULL,
input_event.data.scalar.value,
input_event.data.scalar.length,
(int) input_event.data.scalar.length,
YAML_DOUBLE_QUOTED_SCALAR_STYLE);
if (!value) goto document_error;
if (!yaml_document_append_mapping_pair(&output_document,
Expand Down
2 changes: 1 addition & 1 deletion tests/example-deconstructor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ main(int argc, char *argv[])
if (!yaml_scalar_event_initialize(&output_event,
NULL, (yaml_char_t *)"tag:yaml.org,2002:str",
input_event.data.scalar.value,
input_event.data.scalar.length,
(int) input_event.data.scalar.length,
0, 1, YAML_DOUBLE_QUOTED_SCALAR_STYLE))
goto event_error;
if (!yaml_emitter_emit(&emitter, &output_event))
Expand Down
2 changes: 1 addition & 1 deletion tests/run-dumper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ int copy_document(yaml_document_t *document_to, yaml_document_t *document_from)
switch (node->type) {
case YAML_SCALAR_NODE:
if (!yaml_document_add_scalar(document_to, node->tag,
node->data.scalar.value, node->data.scalar.length,
node->data.scalar.value, (int) node->data.scalar.length,
node->data.scalar.style)) goto error;
break;
case YAML_SEQUENCE_NODE:
Expand Down
6 changes: 3 additions & 3 deletions tests/run-emitter-test-suite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ int main(int argc, char *argv[])
style = YAML_FLOW_MAPPING_STYLE;
ok = yaml_mapping_start_event_initialize(&event, (yaml_char_t *)
get_anchor('&', line, anchor), (yaml_char_t *)
get_tag(line, tag), 0, style);
get_tag(line, tag), 0, (yaml_mapping_style_t) style);
}
else if (strncmp(line, "-MAP", 4) == 0) {
ok = yaml_mapping_end_event_initialize(&event);
Expand All @@ -122,7 +122,7 @@ int main(int argc, char *argv[])
style = YAML_FLOW_SEQUENCE_STYLE;
ok = yaml_sequence_start_event_initialize(&event, (yaml_char_t *)
get_anchor('&', line, anchor), (yaml_char_t *)
get_tag(line, tag), 0, style);
get_tag(line, tag), 0, (yaml_sequence_style_t) style);
}
else if (strncmp(line, "-SEQ", 4) == 0) {
ok = yaml_sequence_end_event_initialize(&event);
Expand All @@ -135,7 +135,7 @@ int main(int argc, char *argv[])
implicit = (get_tag(line, tag) == NULL);

ok = yaml_scalar_event_initialize(&event, (yaml_char_t *)
get_anchor('&', line, anchor), (yaml_char_t *) get_tag(line, tag), (yaml_char_t *) value, -1, implicit, implicit, style);
get_anchor('&', line, anchor), (yaml_char_t *) get_tag(line, tag), (yaml_char_t *) value, -1, implicit, implicit, (yaml_scalar_style_t) style);
}
else if (strncmp(line, "=ALI", 4) == 0) {
ok = yaml_alias_event_initialize(&event, (yaml_char_t *)
Expand Down
2 changes: 1 addition & 1 deletion tests/run-emitter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int copy_event(yaml_event_t *event_to, yaml_event_t *event_from)
event_from->data.scalar.anchor,
event_from->data.scalar.tag,
event_from->data.scalar.value,
event_from->data.scalar.length,
(int) event_from->data.scalar.length,
event_from->data.scalar.plain_implicit,
event_from->data.scalar.quoted_implicit,
event_from->data.scalar.style);
Expand Down