yaml_string_extend(yaml_char_t **start,
yaml_char_t **pointer, yaml_char_t **end)
{
- void *new_start = yaml_realloc(*start, (*end - *start)*2);
+ yaml_char_t *new_start = yaml_realloc(*start, (*end - *start)*2);
if (!new_start) return 0;
YAML_DECLARE(int)
yaml_stack_extend(void **start, void **top, void **end)
{
- void *new_start = yaml_realloc(*start, (*end - *start)*2);
+ void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
if (!new_start) return 0;
- *top = new_start + (*top - *start);
- *end = new_start + (*end - *start)*2;
+ *top = (char *)new_start + ((char *)*top - (char *)*start);
+ *end = (char *)new_start + ((char *)*end - (char *)*start)*2;
*start = new_start;
return 1;
/* Check if we need to resize the queue. */
if (*start == *head && *tail == *end) {
- void *new_start = yaml_realloc(*start, (*end - *start)*2);
+ void *new_start = yaml_realloc(*start,
+ ((char *)*end - (char *)*start)*2);
if (!new_start) return 0;
- *head = new_start + (*head - *start);
- *tail = new_start + (*tail - *start);
- *end = new_start + (*end - *start)*2;
+ *head = (char *)new_start + ((char *)*head - (char *)*start);
+ *tail = (char *)new_start + ((char *)*tail - (char *)*start);
+ *end = (char *)new_start + ((char *)*end - (char *)*start)*2;
*start = new_start;
}
if (*tail == *end) {
if (*head != *tail) {
- memmove(*start, *head, *tail - *head);
+ memmove(*start, *head, (char *)*tail - (char *)*head);
}
- *tail -= *head - *start;
+ *tail = (char *)*tail - (char *)*head + (char *)*start;
*head = *start;
}
return 1;
}
- if (size > (parser->input.string.end - parser->input.string.current)) {
+ if (size > (size_t)(parser->input.string.end
+ - parser->input.string.current)) {
size = parser->input.string.end - parser->input.string.current;
}
unsigned char octet;
unsigned int width;
unsigned int value;
- int k;
+ size_t k;
octet = pointer[0];
width = (octet & 0x80) == 0x00 ? 1 :
} 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)) {
*/
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;
}
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;
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;
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;
struct {
yaml_error_type_t error;
} context;
- yaml_node_pair_t pair = { key, value };
+
+ yaml_node_pair_t pair;
assert(document); /* Non-NULL document is required. */
assert(mapping > 0
assert(value > 0 && document->nodes.start + value <= document->nodes.top);
/* Valid value id is required. */
+ pair.key = key;
+ pair.value = value;
+
if (!PUSH(&context,
document->nodes.start[mapping-1].data.mapping.pairs, pair))
return 0;
return 1;
}
+