ovirt-engine-sdk 4.0.0.alpha11 → 4.0.0.alpha12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191883f8dedae81116c21bacbbd76842a24bd4dd
-  data.tar.gz: 4d495588ffdc4ed4a148aeffef41ce4a8619c946
+  metadata.gz: a910fa355950cb5a7ae1e1263fa42de439a4388d
+  data.tar.gz: a5da7ba22f549c6f20e27d11011ecf6da33b7abf
 SHA512:
-  metadata.gz: 1e7275a18726e7c3cca952cdccadca40dd6bc728056906337ef4dc2e339f39b4a40d528f5e75b1e0172b9a44c9635e04b25643a609e98f3c0950f7fdcc733b5a
-  data.tar.gz: e977a9cc0ce518facde71d617d1f42e29cf463fe8b452d519f5b88b5916982199909594d688511728bb4beb4217189d5ae4498e71bb9914e8a65dc3167732c29
+  metadata.gz: e662f4df3c0254d86f05bceedb55e40e1d08fd8108912b9f46f36f95e1f5e7980a35c2e2e498df8788b544cd39114d0248626e63ed1e0e4f05a7da1bd41230d7
+  data.tar.gz: 282472f9d5e04d8d4c0120f80f9607fef94e7ebcf1f0466a91d0f320e211cfdcdd8090cea098ded44b1f4049d0384f6d52301db6128b1567361c9c74f9b2cf4d

data/ext/ovirtsdk4c/ov_xml_reader.c

@@ -27,11 +27,9 @@ limitations under the License.
 #include "ov_error.h"
 #include "ov_xml_reader.h"
 
-// Symbols:
-static VALUE IO_SYMBOL;
-
 // Method identifiers:
 static ID READ_ID;
+static ID STRING_IO_ID;
 
 typedef struct {
     VALUE io;
@@ -46,39 +44,46 @@ static void ov_xml_reader_check_closed(ov_xml_reader_object* object) {
 }
 
 static void ov_xml_reader_mark(ov_xml_reader_object *object) {
-    // Mark the IO object as reachable:
+    /* Mark the IO object as reachable: */
     if (!NIL_P(object->io)) {
         rb_gc_mark(object->io);
     }
 }
 
 static void ov_xml_reader_free(ov_xml_reader_object *object) {
-    // Free the libxml reader:
+    /* Free the libxml reader: */
     if (!object->closed) {
-       xmlFreeTextReader(object->reader);
+       if (object->reader != NULL) {
+           xmlFreeTextReader(object->reader);
+       }
        object->reader = NULL;
        object->closed = true;
     }
 
-    // Free this object:
+    /* Free this object: */
     xfree(object);
 }
 
 static VALUE ov_xml_reader_alloc(VALUE klass) {
-    ov_xml_reader_object *object = ALLOC(ov_xml_reader_object);
+    ov_xml_reader_object* object = NULL;
+
+    object = ALLOC(ov_xml_reader_object);
+    memset(object, 0, sizeof(ov_xml_reader_object));
     return Data_Wrap_Struct(klass, ov_xml_reader_mark, ov_xml_reader_free, object);
 }
 
 static int ov_xml_reader_callback(void *context, char *buffer, int length) {
-    ov_xml_reader_object *object = (ov_xml_reader_object*) context;
+    VALUE data;
+    ov_xml_reader_object* object = NULL;
 
-    // Do nothing if the reader is already closed:
+    /* Do nothing if the reader is already closed: */
+    object = (ov_xml_reader_object*) context;
     if (object->closed) {
         return -1;
     }
 
-    // Read from the Ruby IO object, and copy the result to the buffer:
-    VALUE data = rb_funcall(object->io, READ_ID, 1, INT2NUM(length));
+    /* Read from the Ruby IO object, and copy the result to the buffer: */
+    data = rb_funcall(object->io, READ_ID, 1, INT2NUM(length));
     if (NIL_P(data)) {
         return 0;
     }
@@ -88,32 +93,51 @@ static int ov_xml_reader_callback(void *context, char *buffer, int length) {
     return length;
 }
 
-static VALUE ov_xml_reader_initialize(VALUE self, VALUE options) {
-    // Initialize the reader:
-    ov_xml_reader_object *object;
+static VALUE ov_xml_reader_create_string_io(VALUE text) {
+    VALUE sio_class;
+    VALUE sio_obj;
+
+    sio_class = rb_const_get(rb_cObject, STRING_IO_ID);
+    sio_obj = rb_class_new_instance(1, &text, sio_class);
+    return sio_obj;
+}
+
+static VALUE ov_xml_reader_initialize(VALUE self, VALUE io) {
+    VALUE io_class;
+    int rc = 0;
+    ov_xml_reader_object* object = NULL;
+
+    /* Get the pointer to the object: */
     Data_Get_Struct(self, ov_xml_reader_object, object);
 
-    // Get the options, and assign default values:
-    Check_Type(options, T_HASH);
-    VALUE io = rb_hash_aref(options, IO_SYMBOL);
-    if (NIL_P(io)) {
-       rb_raise(ov_error_class, "The \"io\" parameter is mandatory and can't be nil");
+    /* The parameter of the constructor can be a string or an IO object. If it is a string then we need to create aa
+       IO object to read from it. */
+    io_class = rb_class_of(io);
+    if (io_class == rb_cString) {
+        object->io = ov_xml_reader_create_string_io(io);
+    }
+    else if (io_class == rb_cIO) {
+        object->io = io;
+    }
+    else {
+        rb_raise(
+            ov_error_class,
+            "The type of the 'io' parameter must be 'String' or 'IO', but it is '%"PRIsVALUE"'",
+            io_class
+        );
     }
 
-    // Save the IO object:
-    object->io = io;
-
-    // Clear the closed flag:
+    /* Clear the closed flag: */
     object->closed = false;
 
-    // Create the libxml reader:
+    /* Create the libxml reader: */
     object->reader = xmlReaderForIO(ov_xml_reader_callback, NULL, object, NULL, NULL, 0);
     if (object->reader == NULL) {
         rb_raise(ov_error_class, "Can't create reader");
     }
 
-    // Move the cursor to the first node:
-    int rc = xmlTextReaderRead(object->reader);
+    /* Move the cursor to the first node: */
+    rc = xmlTextReaderRead(object->reader);
     if (rc == -1) {
         rb_raise(ov_error_class, "Can't read first node");
     }
@@ -121,17 +145,13 @@ static VALUE ov_xml_reader_initialize(VALUE self, VALUE options) {
     return self;
 }
 
-static VALUE ov_xml_reader_io(VALUE self) {
-    ov_xml_reader_object *object;
-    Data_Get_Struct(self, ov_xml_reader_object, object);
-    return object->io;
-}
-
 static VALUE ov_xml_reader_read(VALUE self) {
-    ov_xml_reader_object *object;
+    int rc = 0;
+    ov_xml_reader_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_reader_object, object);
     ov_xml_reader_check_closed(object);
-    int rc = xmlTextReaderRead(object->reader);
+    rc = xmlTextReaderRead(object->reader);
     if (rc == 0) {
         return Qfalse;
     }
@@ -171,34 +191,42 @@ static VALUE ov_xml_reader_forward(VALUE self) {
 }
 
 static VALUE ov_xml_reader_node_name(VALUE self) {
-    ov_xml_reader_object *object;
+    VALUE name;
+    const xmlChar* c_name = NULL;
+    ov_xml_reader_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_reader_object, object);
     ov_xml_reader_check_closed(object);
-    const xmlChar *c_name = xmlTextReaderConstName(object->reader);
+    c_name = xmlTextReaderConstName(object->reader);
     if (c_name == NULL) {
         return Qnil;
     }
-    VALUE name = rb_str_new_cstr((char*) c_name);
+    name = rb_str_new_cstr((char*) c_name);
     return name;
 }
 
 static VALUE ov_xml_reader_empty_element(VALUE self) {
-    ov_xml_reader_object *object;
+    ov_xml_reader_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_reader_object, object);
     ov_xml_reader_check_closed(object);
     return xmlTextReaderIsEmptyElement(object->reader)? Qtrue: Qfalse;
 }
 
 static VALUE ov_xml_reader_get_attribute(VALUE self, VALUE name) {
-    ov_xml_reader_object *object;
+    VALUE value;
+    ov_xml_reader_object* object = NULL;
+    xmlChar* c_name = NULL;
+    xmlChar* c_value = NULL;
+
     Data_Get_Struct(self, ov_xml_reader_object, object);
     ov_xml_reader_check_closed(object);
-    xmlChar *c_name = (xmlChar*) StringValueCStr(name);
-    xmlChar *c_value = xmlTextReaderGetAttribute(object->reader, c_name);
+    c_name = (xmlChar*) StringValueCStr(name);
+    c_value = xmlTextReaderGetAttribute(object->reader, c_name);
     if (c_value == NULL) {
         return Qnil;
     }
-    VALUE value = rb_str_new_cstr((char*) c_value);
+    value = rb_str_new_cstr((char*) c_value);
     xmlFree(c_value);
     return value;
 }
@@ -295,10 +323,12 @@ static VALUE ov_xml_reader_read_elements(VALUE self) {
 }
 
 static VALUE ov_xml_reader_next_element(VALUE self) {
-    ov_xml_reader_object *object;
+    int rc = 0;
+    ov_xml_reader_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_reader_object, object);
     ov_xml_reader_check_closed(object);
-    int rc = xmlTextReaderNext(object->reader);
+    rc = xmlTextReaderNext(object->reader);
     if (rc == 0) {
         return Qfalse;
     }
@@ -309,7 +339,8 @@ static VALUE ov_xml_reader_next_element(VALUE self) {
 }
 
 static VALUE ov_xml_reader_close(VALUE self) {
-    ov_xml_reader_object *object;
+    ov_xml_reader_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_reader_object, object);
     ov_xml_reader_check_closed(object);
     xmlFreeTextReader(object->reader);
@@ -319,16 +350,18 @@ static VALUE ov_xml_reader_close(VALUE self) {
 }
 
 void ov_xml_reader_define(void) {
-    // Define the class:
+    /* Load required modules: */
+    rb_require("stringio");
+
+    /* Define the class: */
     ov_xml_reader_class = rb_define_class_under(ov_module, "XmlReader", rb_cObject);
 
-    // Define the constructor:
+    /* Define the constructor: */
     rb_define_alloc_func(ov_xml_reader_class, ov_xml_reader_alloc);
     rb_define_method(ov_xml_reader_class, "initialize", ov_xml_reader_initialize, 1);
 
-    // Define the methods:
+    /* Define the methods: */
     rb_define_method(ov_xml_reader_class, "forward", ov_xml_reader_forward, 0);
-    rb_define_method(ov_xml_reader_class, "io", ov_xml_reader_io, 0);
     rb_define_method(ov_xml_reader_class, "read", ov_xml_reader_read, 0);
     rb_define_method(ov_xml_reader_class, "node_name", ov_xml_reader_node_name, 0);
     rb_define_method(ov_xml_reader_class, "empty_element?", ov_xml_reader_empty_element, 0);
@@ -338,9 +371,7 @@ void ov_xml_reader_define(void) {
     rb_define_method(ov_xml_reader_class, "next_element", ov_xml_reader_next_element, 0);
     rb_define_method(ov_xml_reader_class, "close", ov_xml_reader_close, 0);
 
-    // Create symbols:
-    IO_SYMBOL = ID2SYM(rb_intern("io"));
-
-    // Create method identifiers:
+    /* Create method identifiers: */
     READ_ID = rb_intern("read");
+    STRING_IO_ID = rb_intern("StringIO");
 }

data/ext/ovirtsdk4c/ov_xml_writer.c

@@ -23,11 +23,9 @@ limitations under the License.
 #include "ov_error.h"
 #include "ov_xml_writer.h"
 
-// Symbols:
-static VALUE IO_SYMBOL;
-static VALUE INDENT_SYMBOL;
-
-// Method identifiers:
+/* Identifiers: */
+static ID STRING_ID;
+static ID STRING_IO_ID;
 static ID WRITE_ID;
 
 typedef struct {
@@ -42,77 +40,108 @@ static void ov_xml_writer_check_closed(ov_xml_writer_object* object) {
 }
 
 static void ov_xml_writer_mark(ov_xml_writer_object *object) {
-    // Mark the IO object as reachable:
+    /* Mark the IO object as reachable: */
     if (!NIL_P(object->io)) {
         rb_gc_mark(object->io);
     }
 }
 
 static void ov_xml_writer_free(ov_xml_writer_object *object) {
-    // Free the libxml writer, the buffer is automatically closed:
+    /* Free the libxml writer, the buffer is automatically closed: */
     if (object->writer != NULL) {
         xmlTextWriterPtr tmp = object->writer;
         object->writer = NULL;
         xmlFreeTextWriter(tmp);
     }
 
-    // Free this object:
+    /* Free this object: */
     xfree(object);
 }
 
 static VALUE ov_xml_writer_alloc(VALUE klass) {
-    ov_xml_writer_object *object = ALLOC(ov_xml_writer_object);
+    ov_xml_writer_object* object = NULL;
+
+    object = ALLOC(ov_xml_writer_object);
+    memset(object, 0, sizeof(ov_xml_writer_object));
     return Data_Wrap_Struct(klass, ov_xml_writer_mark, ov_xml_writer_free, object);
 }
 
 static int ov_xml_writer_callback(void *context, const char *buffer, int length) {
+    VALUE count;
+    VALUE data;
     ov_xml_writer_object *object = (ov_xml_writer_object*) context;
 
-    // Do nothing if the writer is already closed:
+    /* Do nothing if the writer is already closed: */
     if (object->writer == NULL) {
         return 0;
     }
 
-    // Convert the buffer to a Ruby string and write it to the IO object, using the "write" method:
-    VALUE data = rb_str_new(buffer, length);
-    VALUE count = rb_funcall(object->io, WRITE_ID, 1, data);
+    /* Convert the buffer to a Ruby string and write it to the IO object, using the "write" method: */
+    data = rb_str_new(buffer, length);
+    count = rb_funcall(object->io, WRITE_ID, 1, data);
 
     return NUM2INT(count);
 }
 
-static VALUE ov_xml_writer_initialize(VALUE self, VALUE options) {
-    // Initialize the writer:
-    ov_xml_writer_object *object;
+static VALUE ov_xml_writer_create_string_io() {
+    VALUE sio_class;
+    VALUE sio_obj;
+
+    sio_class = rb_const_get(rb_cObject, STRING_IO_ID);
+    sio_obj = rb_class_new_instance(0, NULL, sio_class);
+    return sio_obj;
+}
+
+static VALUE ov_xml_writer_initialize(int argc, VALUE* argv, VALUE self) {
+    VALUE indent;
+    VALUE io;
+    VALUE io_class;
+    ov_xml_writer_object* object = NULL;
+    xmlOutputBufferPtr buffer = NULL;
+
+    /* Get the pointer to the object: */
     Data_Get_Struct(self, ov_xml_writer_object, object);
 
-    // Get the options, and assign default values:
-    Check_Type(options, T_HASH);
-    VALUE io = rb_hash_aref(options, IO_SYMBOL);
+    /* Get the values of the parameters: */
+    if (argc > 2) {
+      rb_raise(ov_error_class, "Expected at most two arguments, 'io' and 'indent', but received %d", argc);
+    }
+    io = argc > 0? argv[0]: Qnil;
+    indent = argc > 1? argv[1]: Qnil;
+
+    /* The first parameter can be an IO object or nil. If it is nil then we need to create a IO object where we can
+       write the generated XML. */
     if (NIL_P(io)) {
-       rb_raise(ov_error_class, "The \"io\" parameter is mandatory and can't be nil");
+        object->io = ov_xml_writer_create_string_io();
     }
-    VALUE indent = rb_hash_aref(options, INDENT_SYMBOL);
-    if (NIL_P(indent)) {
-        indent = Qfalse;
+    else {
+        io_class = rb_class_of(io);
+        if (io_class == rb_cIO) {
+            object->io = io;
+        }
+        else {
+            rb_raise(
+                ov_error_class,
+                "The type of the 'io' parameter must be 'IO', but it is '%"PRIsVALUE"'",
+                io_class
+            );
+        }
     }
 
-    // Save the IO object:
-    object->io = io;
-
-    // Create the libxml buffer that writes to the IO object:
-    xmlOutputBufferPtr buffer = xmlOutputBufferCreateIO(ov_xml_writer_callback, NULL, object, NULL);
+    /* Create the libxml buffer that writes to the IO object: */
+    buffer = xmlOutputBufferCreateIO(ov_xml_writer_callback, NULL, object, NULL);
     if (buffer == NULL) {
         rb_raise(ov_error_class, "Can't create XML buffer");
     }
 
-    // Create the libxml writer:
+    /* Create the libxml writer: */
     object->writer = xmlNewTextWriter(buffer);
     if (object->writer == NULL) {
         xmlOutputBufferClose(buffer);
         rb_raise(ov_error_class, "Can't create XML writer");
     }
 
-    // Enable indentation:
+    /* Enable indentation: */
     if (RTEST(indent)) {
         xmlTextWriterSetIndent(object->writer, 1);
         xmlTextWriterSetIndentString(object->writer, BAD_CAST "  ");
@@ -121,19 +150,29 @@ static VALUE ov_xml_writer_initialize(VALUE self, VALUE options) {
     return self;
 }
 
-static VALUE ov_xml_writer_io(VALUE self) {
-    ov_xml_writer_object *object;
+static VALUE ov_xml_writer_string(VALUE self) {
+    int rc = 0;
+    ov_xml_writer_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_writer_object, object);
-    return object->io;
+    ov_xml_writer_check_closed(object);
+    rc = xmlTextWriterFlush(object->writer);
+    if (rc < 0) {
+        rb_raise(ov_error_class, "Can't flush XML writer");
+    }
+    return rb_funcall(object->io, STRING_ID, 0, NULL);
 }
 
 static VALUE ov_xml_writer_write_start(VALUE self, VALUE name) {
-    ov_xml_writer_object *object;
+    char* c_name = NULL;
+    int rc = 0;
+    ov_xml_writer_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_writer_object, object);
     ov_xml_writer_check_closed(object);
     Check_Type(name, T_STRING);
-    char *c_name = StringValueCStr(name);
-    int rc = xmlTextWriterStartElement(object->writer, BAD_CAST c_name);
+    c_name = StringValueCStr(name);
+    rc = xmlTextWriterStartElement(object->writer, BAD_CAST c_name);
     if (rc < 0) {
         rb_raise(ov_error_class, "Can't start XML element");
     }
@@ -141,10 +180,12 @@ static VALUE ov_xml_writer_write_start(VALUE self, VALUE name) {
 }
 
 static VALUE ov_xml_writer_write_end(VALUE self) {
-    ov_xml_writer_object *object;
+    int rc = 0;
+    ov_xml_writer_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_writer_object, object);
     ov_xml_writer_check_closed(object);
-    int rc = xmlTextWriterEndElement(object->writer);
+    rc = xmlTextWriterEndElement(object->writer);
     if (rc < 0) {
         rb_raise(ov_error_class, "Can't end XML element");
     }
@@ -152,14 +193,18 @@ static VALUE ov_xml_writer_write_end(VALUE self) {
 }
 
 static VALUE ov_xml_writer_write_attribute(VALUE self, VALUE name, VALUE value) {
-    ov_xml_writer_object *object;
+    char* c_name = NULL;
+    char* c_value = NULL;
+    int rc = 0;
+    ov_xml_writer_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_writer_object, object);
     ov_xml_writer_check_closed(object);
     Check_Type(name, T_STRING);
     Check_Type(value, T_STRING);
-    char *c_name = StringValueCStr(name);
-    char *c_value = StringValueCStr(value);
-    int rc = xmlTextWriterWriteAttribute(object->writer, BAD_CAST c_name, BAD_CAST c_value);
+    c_name = StringValueCStr(name);
+    c_value = StringValueCStr(value);
+    rc = xmlTextWriterWriteAttribute(object->writer, BAD_CAST c_name, BAD_CAST c_value);
     if (rc < 0) {
         rb_raise(ov_error_class, "Can't write attribute with name \"%s\" and value \"%s\"", c_name, c_value);
     }
@@ -167,14 +212,18 @@ static VALUE ov_xml_writer_write_attribute(VALUE self, VALUE name, VALUE value)
 }
 
 static VALUE ov_xml_writer_write_element(VALUE self, VALUE name, VALUE value) {
-    ov_xml_writer_object *object;
+    char* c_name = NULL;
+    char* c_value = NULL;
+    int rc = 0;
+    ov_xml_writer_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_writer_object, object);
     ov_xml_writer_check_closed(object);
     Check_Type(name, T_STRING);
     Check_Type(value, T_STRING);
-    char *c_name = StringValueCStr(name);
-    char *c_value = StringValueCStr(value);
-    int rc = xmlTextWriterWriteElement(object->writer, BAD_CAST c_name, BAD_CAST c_value);
+    c_name = StringValueCStr(name);
+    c_value = StringValueCStr(value);
+    rc = xmlTextWriterWriteElement(object->writer, BAD_CAST c_name, BAD_CAST c_value);
     if (rc < 0) {
         rb_raise(ov_error_class, "Can't write element with name \"%s\" and value \"%s\"", c_name, c_value);
     }
@@ -182,10 +231,12 @@ static VALUE ov_xml_writer_write_element(VALUE self, VALUE name, VALUE value) {
 }
 
 static VALUE ov_xml_writer_flush(VALUE self) {
-    ov_xml_writer_object *object;
+    ov_xml_writer_object* object = NULL;
+    int rc = 0;
+
     Data_Get_Struct(self, ov_xml_writer_object, object);
     ov_xml_writer_check_closed(object);
-    int rc = xmlTextWriterFlush(object->writer);
+    rc = xmlTextWriterFlush(object->writer);
     if (rc < 0) {
         rb_raise(ov_error_class, "Can't flush XML writer");
     }
@@ -193,7 +244,8 @@ static VALUE ov_xml_writer_flush(VALUE self) {
 }
 
 static VALUE ov_xml_writer_close(VALUE self) {
-    ov_xml_writer_object *object;
+    ov_xml_writer_object* object = NULL;
+
     Data_Get_Struct(self, ov_xml_writer_object, object);
     ov_xml_writer_check_closed(object);
     xmlFreeTextWriter(object->writer);
@@ -202,26 +254,27 @@ static VALUE ov_xml_writer_close(VALUE self) {
 }
 
 void ov_xml_writer_define(void) {
-    // Define the class:
+    /* Load required modules: */
+    rb_require("stringio");
+
+    /* Define the class: */
     ov_xml_writer_class = rb_define_class_under(ov_module, "XmlWriter", rb_cObject);
 
-    // Define the constructor:
+    /* Define the constructor: */
     rb_define_alloc_func(ov_xml_writer_class, ov_xml_writer_alloc);
-    rb_define_method(ov_xml_writer_class, "initialize", ov_xml_writer_initialize, 1);
+    rb_define_method(ov_xml_writer_class, "initialize", ov_xml_writer_initialize, -1);
 
-    // Define the methods:
-    rb_define_method(ov_xml_writer_class, "io", ov_xml_writer_io, 0);
-    rb_define_method(ov_xml_writer_class, "write_start", ov_xml_writer_write_start, 1);
-    rb_define_method(ov_xml_writer_class, "write_end", ov_xml_writer_write_end, 0);
+    /* Define the methods: */
+    rb_define_method(ov_xml_writer_class, "close", ov_xml_writer_close, 0);
+    rb_define_method(ov_xml_writer_class, "flush", ov_xml_writer_flush, 0);
+    rb_define_method(ov_xml_writer_class, "string", ov_xml_writer_string, 0);
     rb_define_method(ov_xml_writer_class, "write_attribute", ov_xml_writer_write_attribute, 2);
     rb_define_method(ov_xml_writer_class, "write_element", ov_xml_writer_write_element, 2);
-    rb_define_method(ov_xml_writer_class, "flush", ov_xml_writer_flush, 0);
-    rb_define_method(ov_xml_writer_class, "close", ov_xml_writer_close, 0);
-
-    // Create symbols:
-    IO_SYMBOL = ID2SYM(rb_intern("io"));
-    INDENT_SYMBOL  = ID2SYM(rb_intern("indent"));
+    rb_define_method(ov_xml_writer_class, "write_end", ov_xml_writer_write_end, 0);
+    rb_define_method(ov_xml_writer_class, "write_start", ov_xml_writer_write_start, 1);
 
-    // Create method identifiers:
+    /* Create method identifiers: */
+    STRING_ID = rb_intern("string");
+    STRING_IO_ID = rb_intern("StringIO");
     WRITE_ID = rb_intern("write");
 }