Skip to content

Fixed most compiler warnings -Wall -Wextra #78

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

Merged
ingydotnet merged 1 commit into from
Jan 8, 2018
Merged

Fixed most compiler warnings -Wall -Wextra #78

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 26 additions & 25 deletions src/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ YAML_DECLARE(int)
yaml_string_extend(yaml_char_t **start,
yaml_char_t **pointer, yaml_char_t **end)
{
yaml_char_t *new_start = yaml_realloc(*start, (*end - *start)*2);
yaml_char_t *new_start = (yaml_char_t *)yaml_realloc((void*)*start, (*end - *start)*2);

if (!new_start) return 0;

Expand All @@ -94,8 +94,9 @@ yaml_string_extend(yaml_char_t **start,
YAML_DECLARE(int)
yaml_string_join(
yaml_char_t **a_start, yaml_char_t **a_pointer, yaml_char_t **a_end,
yaml_char_t **b_start, yaml_char_t **b_pointer, yaml_char_t **b_end)
yaml_char_t **b_start, yaml_char_t **b_pointer, SHIM(yaml_char_t **b_end))
{
UNUSED_PARAM(b_end)
if (*b_start == *b_pointer)
return 1;

Expand Down Expand Up @@ -177,17 +178,17 @@ yaml_parser_initialize(yaml_parser_t *parser)
goto error;
if (!BUFFER_INIT(parser, parser->buffer, INPUT_BUFFER_SIZE))
goto error;
if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_SIZE))
if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_SIZE, yaml_token_t*))
goto error;
if (!STACK_INIT(parser, parser->indents, INITIAL_STACK_SIZE))
if (!STACK_INIT(parser, parser->indents, int*))
goto error;
if (!STACK_INIT(parser, parser->simple_keys, INITIAL_STACK_SIZE))
if (!STACK_INIT(parser, parser->simple_keys, yaml_simple_key_t*))
goto error;
if (!STACK_INIT(parser, parser->states, INITIAL_STACK_SIZE))
if (!STACK_INIT(parser, parser->states, yaml_parser_state_t*))
goto error;
if (!STACK_INIT(parser, parser->marks, INITIAL_STACK_SIZE))
if (!STACK_INIT(parser, parser->marks, yaml_mark_t*))
goto error;
if (!STACK_INIT(parser, parser->tag_directives, INITIAL_STACK_SIZE))
if (!STACK_INIT(parser, parser->tag_directives, yaml_tag_directive_t*))
goto error;

return 1;
Expand Down Expand Up @@ -243,7 +244,7 @@ static int
yaml_string_read_handler(void *data, unsigned char *buffer, size_t size,
size_t *size_read)
{
yaml_parser_t *parser = data;
yaml_parser_t *parser = (yaml_parser_t *)data;

if (parser->input.string.current == parser->input.string.end) {
*size_read = 0;
Expand All @@ -269,7 +270,7 @@ static int
yaml_file_read_handler(void *data, unsigned char *buffer, size_t size,
size_t *size_read)
{
yaml_parser_t *parser = data;
yaml_parser_t *parser = (yaml_parser_t *)data;

*size_read = fread(buffer, 1, size, parser->input.file);
return !ferror(parser->input.file);
Expand Down Expand Up @@ -355,13 +356,13 @@ yaml_emitter_initialize(yaml_emitter_t *emitter)
goto error;
if (!BUFFER_INIT(emitter, emitter->raw_buffer, OUTPUT_RAW_BUFFER_SIZE))
goto error;
if (!STACK_INIT(emitter, emitter->states, INITIAL_STACK_SIZE))
if (!STACK_INIT(emitter, emitter->states, yaml_emitter_state_t*))
goto error;
if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE))
if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE, yaml_event_t*))
goto error;
if (!STACK_INIT(emitter, emitter->indents, INITIAL_STACK_SIZE))
if (!STACK_INIT(emitter, emitter->indents, int*))
goto error;
if (!STACK_INIT(emitter, emitter->tag_directives, INITIAL_STACK_SIZE))
if (!STACK_INIT(emitter, emitter->tag_directives, yaml_tag_directive_t*))
goto error;

return 1;
Expand Down Expand Up @@ -413,7 +414,7 @@ yaml_emitter_delete(yaml_emitter_t *emitter)
static int
yaml_string_write_handler(void *data, unsigned char *buffer, size_t size)
{
yaml_emitter_t *emitter = data;
yaml_emitter_t *emitter = (yaml_emitter_t *)data;

if (emitter->output.string.size - *emitter->output.string.size_written
< size) {
Expand All @@ -439,7 +440,7 @@ yaml_string_write_handler(void *data, unsigned char *buffer, size_t size)
static int
yaml_file_write_handler(void *data, unsigned char *buffer, size_t size)
{
yaml_emitter_t *emitter = data;
yaml_emitter_t *emitter = (yaml_emitter_t *)data;

return (fwrite(buffer, 1, size, emitter->output.file) == size);
}
Expand Down Expand Up @@ -717,15 +718,15 @@ yaml_document_start_event_initialize(yaml_event_t *event,
/* Valid tag directives are expected. */

if (version_directive) {
version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
version_directive_copy = YAML_MALLOC_STATIC(yaml_version_directive_t);
if (!version_directive_copy) goto error;
version_directive_copy->major = version_directive->major;
version_directive_copy->minor = version_directive->minor;
}

if (tag_directives_start != tag_directives_end) {
yaml_tag_directive_t *tag_directive;
if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
if (!STACK_INIT(&context, tag_directives_copy, yaml_tag_directive_t*))
goto error;
for (tag_directive = tag_directives_start;
tag_directive != tag_directives_end; tag_directive ++) {
Expand Down Expand Up @@ -843,7 +844,7 @@ yaml_scalar_event_initialize(yaml_event_t *event,
}

if (!yaml_check_utf8(value, length)) goto error;
value_copy = yaml_malloc(length+1);
value_copy = YAML_MALLOC(length+1);
if (!value_copy) goto error;
memcpy(value_copy, value, length);
value_copy[length] = '\0';
Expand Down Expand Up @@ -1055,18 +1056,18 @@ yaml_document_initialize(yaml_document_t *document,
(tag_directives_start == tag_directives_end));
/* Valid tag directives are expected. */

if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error;
if (!STACK_INIT(&context, nodes, yaml_node_t*)) goto error;

if (version_directive) {
version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
version_directive_copy = YAML_MALLOC_STATIC(yaml_version_directive_t);
if (!version_directive_copy) goto error;
version_directive_copy->major = version_directive->major;
version_directive_copy->minor = version_directive->minor;
}

if (tag_directives_start != tag_directives_end) {
yaml_tag_directive_t *tag_directive;
if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
if (!STACK_INIT(&context, tag_directives_copy, yaml_tag_directive_t*))
goto error;
for (tag_directive = tag_directives_start;
tag_directive != tag_directives_end; tag_directive ++) {
Expand Down Expand Up @@ -1219,7 +1220,7 @@ yaml_document_add_scalar(yaml_document_t *document,
}

if (!yaml_check_utf8(value, length)) goto error;
value_copy = yaml_malloc(length+1);
value_copy = YAML_MALLOC(length+1);
if (!value_copy) goto error;
memcpy(value_copy, value, length);
value_copy[length] = '\0';
Expand Down Expand Up @@ -1266,7 +1267,7 @@ yaml_document_add_sequence(yaml_document_t *document,
tag_copy = yaml_strdup(tag);
if (!tag_copy) goto error;

if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error;
if (!STACK_INIT(&context, items, yaml_node_item_t*)) goto error;

SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
style, mark, mark);
Expand Down Expand Up @@ -1311,7 +1312,7 @@ yaml_document_add_mapping(yaml_document_t *document,
tag_copy = yaml_strdup(tag);
if (!tag_copy) goto error;

if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error;
if (!STACK_INIT(&context, pairs, yaml_node_pair_t*)) goto error;

MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
style, mark, mark);
Expand Down
4 changes: 2 additions & 2 deletions src/dumper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ yaml_emitter_anchor_node(yaml_emitter_t *emitter, int index)
#define ANCHOR_TEMPLATE_LENGTH 16

static yaml_char_t *
yaml_emitter_generate_anchor(yaml_emitter_t *emitter, int anchor_id)
yaml_emitter_generate_anchor(SHIM(yaml_emitter_t *emitter), int anchor_id)
{
yaml_char_t *anchor = yaml_malloc(ANCHOR_TEMPLATE_LENGTH);
yaml_char_t *anchor = YAML_MALLOC(ANCHOR_TEMPLATE_LENGTH);

if (!anchor) return NULL;

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 @@ -1002,7 +1002,7 @@ yaml_emitter_emit_node(yaml_emitter_t *emitter, yaml_event_t *event,
*/

static int
yaml_emitter_emit_alias(yaml_emitter_t *emitter, yaml_event_t *event)
yaml_emitter_emit_alias(yaml_emitter_t *emitter, SHIM(yaml_event_t *event))
{
if (!yaml_emitter_process_anchor(emitter))
return 0;
Expand Down Expand Up @@ -1087,7 +1087,7 @@ yaml_emitter_emit_mapping_start(yaml_emitter_t *emitter, yaml_event_t *event)
*/

static int
yaml_emitter_check_empty_document(yaml_emitter_t *emitter)
yaml_emitter_check_empty_document(SHIM(yaml_emitter_t *emitter))
{
return 0;
}
Expand Down
8 changes: 4 additions & 4 deletions src/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document)
assert(document); /* Non-NULL document object is expected. */

memset(document, 0, sizeof(yaml_document_t));
if (!STACK_INIT(parser, document->nodes, INITIAL_STACK_SIZE))
if (!STACK_INIT(parser, document->nodes, yaml_node_t*))
goto error;

if (!parser->stream_start_produced) {
Expand All @@ -90,7 +90,7 @@ yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document)
return 1;
}

if (!STACK_INIT(parser, parser->aliases, INITIAL_STACK_SIZE))
if (!STACK_INIT(parser, parser->aliases, yaml_alias_data_t*))
goto error;

parser->document = document;
Expand Down Expand Up @@ -339,7 +339,7 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
if (!tag) goto error;
}

if (!STACK_INIT(parser, items, INITIAL_STACK_SIZE)) goto error;
if (!STACK_INIT(parser, items, yaml_node_item_t*)) goto error;

SEQUENCE_NODE_INIT(node, tag, items.start, items.end,
first_event->data.sequence_start.style,
Expand Down Expand Up @@ -402,7 +402,7 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
if (!tag) goto error;
}

if (!STACK_INIT(parser, pairs, INITIAL_STACK_SIZE)) goto error;
if (!STACK_INIT(parser, pairs, yaml_node_pair_t*)) goto error;

MAPPING_NODE_INIT(node, tag, pairs.start, pairs.end,
first_event->data.mapping_start.style,
Expand Down
22 changes: 9 additions & 13 deletions src/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
if (strcmp((char *)tag_directive->handle, (char *)tag_handle) == 0) {
size_t prefix_len = strlen((char *)tag_directive->prefix);
size_t suffix_len = strlen((char *)tag_suffix);
tag = yaml_malloc(prefix_len+suffix_len+1);
tag = YAML_MALLOC(prefix_len+suffix_len+1);
if (!tag) {
parser->error = YAML_MEMORY_ERROR;
goto error;
Expand Down Expand Up @@ -685,7 +685,7 @@ yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
return 1;
}
else if (anchor || tag) {
yaml_char_t *value = yaml_malloc(1);
yaml_char_t *value = YAML_MALLOC(1);
if (!value) {
parser->error = YAML_MEMORY_ERROR;
goto error;
Expand Down Expand Up @@ -759,9 +759,8 @@ yaml_parser_parse_block_sequence_entry(yaml_parser_t *parser,

else if (token->type == YAML_BLOCK_END_TOKEN)
{
yaml_mark_t dummy_mark; /* Used to eliminate a compiler warning. */
parser->state = POP(parser, parser->states);
dummy_mark = POP(parser, parser->marks);
(void)POP(parser, parser->marks);
SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
SKIP_TOKEN(parser);
return 1;
Expand Down Expand Up @@ -869,9 +868,8 @@ yaml_parser_parse_block_mapping_key(yaml_parser_t *parser,

else if (token->type == YAML_BLOCK_END_TOKEN)
{
yaml_mark_t dummy_mark; /* Used to eliminate a compiler warning. */
parser->state = POP(parser, parser->states);
dummy_mark = POP(parser, parser->marks);
(void)POP(parser, parser->marks);
MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
SKIP_TOKEN(parser);
return 1;
Expand Down Expand Up @@ -952,7 +950,6 @@ yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
yaml_event_t *event, int first)
{
yaml_token_t *token;
yaml_mark_t dummy_mark; /* Used to eliminate a compiler warning. */

if (first) {
token = PEEK_TOKEN(parser);
Expand Down Expand Up @@ -997,7 +994,7 @@ yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
}

parser->state = POP(parser, parser->states);
dummy_mark = POP(parser, parser->marks);
(void)POP(parser, parser->marks);
SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
SKIP_TOKEN(parser);
return 1;
Expand Down Expand Up @@ -1104,7 +1101,6 @@ yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
yaml_event_t *event, int first)
{
yaml_token_t *token;
yaml_mark_t dummy_mark; /* Used to eliminate a compiler warning. */

if (first) {
token = PEEK_TOKEN(parser);
Expand Down Expand Up @@ -1158,7 +1154,7 @@ yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
}

parser->state = POP(parser, parser->states);
dummy_mark = POP(parser, parser->marks);
(void)POP(parser, parser->marks);
MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
SKIP_TOKEN(parser);
return 1;
Expand Down Expand Up @@ -1212,7 +1208,7 @@ yaml_parser_process_empty_scalar(yaml_parser_t *parser, yaml_event_t *event,
{
yaml_char_t *value;

value = yaml_malloc(1);
value = YAML_MALLOC(1);
if (!value) {
parser->error = YAML_MEMORY_ERROR;
return 0;
Expand Down Expand Up @@ -1249,7 +1245,7 @@ yaml_parser_process_directives(yaml_parser_t *parser,
} tag_directives = { NULL, NULL, NULL };
yaml_token_t *token;

if (!STACK_INIT(parser, tag_directives, INITIAL_STACK_SIZE))
if (!STACK_INIT(parser, tag_directives, yaml_tag_directive_t*))
goto error;

token = PEEK_TOKEN(parser);
Expand All @@ -1270,7 +1266,7 @@ yaml_parser_process_directives(yaml_parser_t *parser,
"found incompatible YAML document", token->start_mark);
goto error;
}
version_directive = yaml_malloc(sizeof(yaml_version_directive_t));
version_directive = YAML_MALLOC_STATIC(yaml_version_directive_t);
if (!version_directive) {
parser->error = YAML_MEMORY_ERROR;
goto error;
Expand Down
8 changes: 3 additions & 5 deletions src/scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,11 +1186,9 @@ yaml_parser_increase_flow_level(yaml_parser_t *parser)
static int
yaml_parser_decrease_flow_level(yaml_parser_t *parser)
{
yaml_simple_key_t dummy_key; /* Used to eliminate a compiler warning. */

if (parser->flow_level) {
parser->flow_level --;
dummy_key = POP(parser, parser->simple_keys);
(void)POP(parser, parser->simple_keys);
}

return 1;
Expand Down Expand Up @@ -2401,7 +2399,7 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
{
/* Set the handle to '' */

handle = yaml_malloc(1);
handle = YAML_MALLOC(1);
if (!handle) goto error;
handle[0] = '\0';

Expand Down Expand Up @@ -2453,7 +2451,7 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
/* Set the handle to '!'. */

yaml_free(handle);
handle = yaml_malloc(2);
handle = YAML_MALLOC(2);
if (!handle) goto error;
handle[0] = '!';
handle[1] = '\0';
Expand Down
Loading