Changeset 265 for libyaml/trunk/src/api.c

Timestamp:

12/27/07 16:11:27 (5 years ago)

Author:

xi

Message:

Fixed bugs and updated tests.

File:

• libyaml/trunk/src/api.c (modified) (12 diffs)

libyaml/trunk/src/api.c

@@ -104 +104 @@
             if (error->data.reading.value == -1) {
                 length = snprintf(buffer, capacity,
-                        "%s: %s at position %d",
+                        "%s: %s at byte %d",
                         prefixes[error->type],
                         error->data.reading.problem,
@@ -111 +111 @@
             else {
                 length = snprintf(buffer, capacity,
-                        "%s: %s (#%X) at position %d",
+                        "%s: %s (#%X) at byte %d",
                         prefixes[error->type],
                         error->data.reading.problem,
@@ -145 +145 @@
         case YAML_WRITER_ERROR:
             length = snprintf(buffer, capacity,
-                    "%s: %s at position %d",
+                    "%s: %s at byte %d",
                     prefixes[error->type],
                     error->data.writing.problem,
@@ -497 +497 @@
     STACK_DEL(emitter, emitter->states);
     while (!QUEUE_EMPTY(emitter, emitter->events)) {
-        yaml_event_delete(&DEQUEUE(emitter, emitter->events));
+        yaml_event_destroy(&DEQUEUE(emitter, emitter->events));
     }
     QUEUE_DEL(emitter, emitter->events);
@@ -564 +564 @@
 YAML_DECLARE(void)
 yaml_emitter_set_string_writer(yaml_emitter_t *emitter,
-        unsigned char *buffer, size_t *length, size_t capacity)
+        unsigned char *buffer, size_t capacity, size_t *length)
 {
     assert(emitter);    /* Non-NULL emitter object expected. */
@@ -730 +730 @@
 
     token->type = model->type;
-    token->start_mark = model->start_mark;
-    token->end_mark = model->end_mark;
 
     switch (token->type)
@@ -782 +780 @@
                     model->data.scalar.length+1);
             token->data.scalar.length = model->data.scalar.length;
+            token->data.scalar.style = model->data.scalar.style;
             break;
 
@@ -927 +926 @@
 
     event->type = model->type;
-    event->start_mark = model->start_mark;
-    event->end_mark = model->end_mark;
 
     switch (event->type)
@@ -969 +966 @@
             event->data.document_end.is_implicit =
                 model->data.document_end.is_implicit;
+            break;
 
         case YAML_ALIAS_EVENT:
@@ -981 +979 @@
                         yaml_strdup(model->data.scalar.anchor)))
                 goto error;
-            if (event->data.scalar.tag &&
+            if (model->data.scalar.tag &&
                     !(event->data.scalar.tag =
                         yaml_strdup(model->data.scalar.tag)))
@@ -1003 +1001 @@
                         yaml_strdup(model->data.sequence_start.anchor)))
                 goto error;
-            if (event->data.sequence_start.tag &&
+            if (model->data.sequence_start.tag &&
                     !(event->data.sequence_start.tag =
                         yaml_strdup(model->data.sequence_start.tag)))
@@ -1018 +1016 @@
                         yaml_strdup(model->data.mapping_start.anchor)))
                 goto error;
-            if (event->data.mapping_start.tag &&
+            if (model->data.mapping_start.tag &&
                     !(event->data.mapping_start.tag =
                         yaml_strdup(model->data.mapping_start.tag)))