Allow strings to grow in size

This lets us use QString for building larger strings

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/qstring.c b/qstring.c
index 6d411da7b7eeed5362d29b6fef5cd4bafa4cc7ed..441a9e6ef0f97b061cb84ad669887564353ceeb1 100644 (file)
--- a/qstring.c
+++ b/qstring.c
@@ -20,6 +20,16 @@ static const QType qstring_type = {
     .destroy = qstring_destroy_obj,
 };
 
+/**
+ * qstring_new(): Create a new empty QString
+ *
+ * Return strong reference.
+ */
+QString *qstring_new(void)
+{
+    return qstring_from_str("");
+}
+
 /**
  * qstring_from_str(): Create a new QString from a regular C string
  *
@@ -30,12 +40,37 @@ QString *qstring_from_str(const char *str)
     QString *qstring;
 
     qstring = qemu_malloc(sizeof(*qstring));
-    qstring->string = qemu_strdup(str);
+
+    qstring->length = strlen(str);
+    qstring->capacity = qstring->length;
+
+    qstring->string = qemu_malloc(qstring->capacity + 1);
+    memcpy(qstring->string, str, qstring->length);
+    qstring->string[qstring->length] = 0;
+
     QOBJECT_INIT(qstring, &qstring_type);
 
     return qstring;
 }
 
+/* qstring_append(): Append a C string to a QString
+ */
+void qstring_append(QString *qstring, const char *str)
+{
+    size_t len = strlen(str);
+
+    if (qstring->capacity < (qstring->length + len)) {
+        qstring->capacity += len;
+        qstring->capacity *= 2; /* use exponential growth */
+
+        qstring->string = qemu_realloc(qstring->string, qstring->capacity + 1);
+    }
+
+    memcpy(qstring->string + qstring->length, str, len);
+    qstring->length += len;
+    qstring->string[qstring->length] = 0;
+}
+
 /**
  * qobject_to_qstring(): Convert a QObject to a QString
  */

diff --git a/qstring.h b/qstring.h
index e012cb7dc5737422e09fd77e72d3a6587cfe7c5f..65905d457fe1a7cbce506da99b3545c719750cb9 100644 (file)
--- a/qstring.h
+++ b/qstring.h
@@ -6,10 +6,14 @@
 typedef struct QString {
     QObject_HEAD;
     char *string;
+    size_t length;
+    size_t capacity;
 } QString;
 
+QString *qstring_new(void);
 QString *qstring_from_str(const char *str);
 const char *qstring_get_str(const QString *qstring);
+void qstring_append(QString *qstring, const char *str);
 QString *qobject_to_qstring(const QObject *obj);
 
 #endif /* QSTRING_H */