diff options
author | Kirill Simonov <xi@resolvent.net> | 2007-01-08 18:33:55 +0000 |
---|---|---|
committer | Kirill Simonov <xi@resolvent.net> | 2007-01-08 18:33:55 +0000 |
commit | c9b74def08ff0fcac2f1466652b432e4c3129b35 (patch) | |
tree | 9ef0415a94ff177bb4d21618166dc660d09c310c /src | |
parent | 01224901943b05fd939158398d1940ac86ce16b8 (diff) | |
download | libyaml-hg-c9b74def08ff0fcac2f1466652b432e4c3129b35.tar.gz |
Eliminate some warnings and add more doxygen definitions.
Diffstat (limited to 'src')
-rw-r--r-- | src/api.c | 16 | ||||
-rw-r--r-- | src/loader.c | 10 | ||||
-rw-r--r-- | src/parser.c | 12 | ||||
-rw-r--r-- | src/scanner.c | 4 | ||||
-rw-r--r-- | src/yaml_private.h | 6 |
5 files changed, 29 insertions, 19 deletions
@@ -1118,9 +1118,11 @@ yaml_document_delete(yaml_document_t *document) { struct { yaml_error_type_t error; - } context = { YAML_NO_ERROR }; + } context; yaml_tag_directive_t *tag_directive; + context.error = YAML_NO_ERROR; /* Eliminate a compliler warning. */ + assert(document); /* Non-NULL document object is expected. */ while (!STACK_EMPTY(&context, document->nodes)) { @@ -1159,12 +1161,12 @@ yaml_document_delete(yaml_document_t *document) */ YAML_DECLARE(yaml_node_t *) -yaml_document_get_node(yaml_document_t *document, int node) +yaml_document_get_node(yaml_document_t *document, int index) { assert(document); /* Non-NULL document object is expected. */ - if (node > 0 && document->nodes.start + node <= document->nodes.top) { - return document->nodes.start + node - 1; + if (index > 0 && document->nodes.start + index <= document->nodes.top) { + return document->nodes.start + index - 1; } return NULL; } @@ -1205,7 +1207,7 @@ yaml_document_add_scalar(yaml_document_t *document, assert(value); /* Non-NULL value is expected. */ if (!tag) { - tag = YAML_DEFAULT_SCALAR_TAG; + tag = (yaml_char_t *)YAML_DEFAULT_SCALAR_TAG; } if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error; @@ -1257,7 +1259,7 @@ yaml_document_add_sequence(yaml_document_t *document, assert(document); /* Non-NULL document object is expected. */ if (!tag) { - tag = YAML_DEFAULT_SEQUENCE_TAG; + tag = (yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG; } if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error; @@ -1302,7 +1304,7 @@ yaml_document_add_mapping(yaml_document_t *document, assert(document); /* Non-NULL document object is expected. */ if (!tag) { - tag = YAML_DEFAULT_MAPPING_TAG; + tag = (yaml_char_t *)YAML_DEFAULT_MAPPING_TAG; } if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error; diff --git a/src/loader.c b/src/loader.c index f69d18b..3c96116 100644 --- a/src/loader.c +++ b/src/loader.c @@ -13,11 +13,11 @@ yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document); */ static int -yaml_parser_set_parser_error(yaml_parser_t *parser, +yaml_parser_set_composer_error(yaml_parser_t *parser, const char *problem, yaml_mark_t problem_mark); static int -yaml_parser_set_parser_error_context(yaml_parser_t *parser, +yaml_parser_set_composer_error_context(yaml_parser_t *parser, const char *context, yaml_mark_t context_mark, const char *problem, yaml_mark_t problem_mark); @@ -286,7 +286,7 @@ yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event) if (!tag || strcmp((char *)tag, "!") == 0) { yaml_free(tag); - tag = yaml_strdup(YAML_DEFAULT_SCALAR_TAG); + tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_SCALAR_TAG); if (!tag) goto error; } @@ -329,7 +329,7 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event) if (!tag || strcmp((char *)tag, "!") == 0) { yaml_free(tag); - tag = yaml_strdup(YAML_DEFAULT_SEQUENCE_TAG); + tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG); if (!tag) goto error; } @@ -387,7 +387,7 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event) if (!tag || strcmp((char *)tag, "!") == 0) { yaml_free(tag); - tag = yaml_strdup(YAML_DEFAULT_MAPPING_TAG); + tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_MAPPING_TAG); if (!tag) goto error; } diff --git a/src/parser.c b/src/parser.c index c9f67af..bad2fc6 100644 --- a/src/parser.c +++ b/src/parser.c @@ -750,8 +750,9 @@ 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); - POP(parser, parser->marks); + dummy_mark = POP(parser, parser->marks); SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark); SKIP_TOKEN(parser); return 1; @@ -859,8 +860,9 @@ 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); - POP(parser, parser->marks); + dummy_mark = POP(parser, parser->marks); MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark); SKIP_TOKEN(parser); return 1; @@ -941,6 +943,7 @@ 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); @@ -985,7 +988,7 @@ yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser, } parser->state = POP(parser, parser->states); - POP(parser, parser->marks); + dummy_mark = POP(parser, parser->marks); SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark); SKIP_TOKEN(parser); return 1; @@ -1092,6 +1095,7 @@ 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); @@ -1145,7 +1149,7 @@ yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser, } parser->state = POP(parser, parser->states); - POP(parser, parser->marks); + dummy_mark = POP(parser, parser->marks); MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark); SKIP_TOKEN(parser); return 1; diff --git a/src/scanner.c b/src/scanner.c index f77e86a..4792dfd 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -1186,9 +1186,11 @@ 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 --; - POP(parser, parser->simple_keys); + dummy_key = POP(parser, parser->simple_keys); } return 1; diff --git a/src/yaml_private.h b/src/yaml_private.h index 10c4219..6320caf 100644 --- a/src/yaml_private.h +++ b/src/yaml_private.h @@ -586,7 +586,7 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end); #define DOCUMENT_INIT(document,document_nodes_start,document_nodes_end, \ document_version_directive,document_tag_directives_start, \ document_tag_directives_end,document_start_implicit, \ - document_end_implicit,start_mark,end_mark) \ + document_end_implicit,document_start_mark,document_end_mark) \ (memset(&(document), 0, sizeof(yaml_document_t)), \ (document).nodes.start = (document_nodes_start), \ (document).nodes.end = (document_nodes_end), \ @@ -595,7 +595,9 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end); (document).tag_directives.start = (document_tag_directives_start), \ (document).tag_directives.end = (document_tag_directives_end), \ (document).start_implicit = (document_start_implicit), \ - (document).end_implicit = (document_end_implicit)) + (document).end_implicit = (document_end_implicit), \ + (document).start_mark = (document_start_mark), \ + (document).end_mark = (document_end_mark)) /* * Node initializers. |