Merge tag 'pull-aspeed-20240201' of https://github.com/legoater/qemu into staging

[mirror_qemu.git] / qobject / qstring.c

diff --git a/qobject/qstring.c b/qobject/qstring.c
index 5f7376c336fec182320c98cba097008e318869c1..794f8c93578a831a5feecfc9a0d8dfa50335ff48 100644 (file)
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -10,16 +10,9 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
-#include "qapi/qmp/qobject.h"
+#include "qemu/osdep.h"
 #include "qapi/qmp/qstring.h"
-#include "qemu-common.h"
-
-static void qstring_destroy_obj(QObject *obj);
-
-static const QType qstring_type = {
-    .code = QTYPE_QSTRING,
-    .destroy = qstring_destroy_obj,
-};
+#include "qobject-internal.h"
 
 /**
  * qstring_new(): Create a new empty QString
@@ -36,21 +29,14 @@ QString *qstring_new(void)
  *
  * Return string reference
  */
-QString *qstring_from_substr(const char *str, int start, int end)
+QString *qstring_from_substr(const char *str, size_t start, size_t end)
 {
     QString *qstring;
 
+    assert(start <= end);
     qstring = g_malloc(sizeof(*qstring));
-
-    qstring->length = end - start + 1;
-    qstring->capacity = qstring->length;
-
-    qstring->string = g_malloc(qstring->capacity + 1);
-    memcpy(qstring->string, str + start, qstring->length);
-    qstring->string[qstring->length] = 0;
-
-    QOBJECT_INIT(qstring, &qstring_type);
-
+    qobject_init(QOBJECT(qstring), QTYPE_QSTRING);
+    qstring->string = g_strndup(str + start, end - start);
     return qstring;
 }
 
@@ -61,60 +47,26 @@ QString *qstring_from_substr(const char *str, int start, int end)
  */
 QString *qstring_from_str(const char *str)
 {
-    return qstring_from_substr(str, 0, strlen(str) - 1);
-}
-
-static void capacity_increase(QString *qstring, size_t len)
-{
-    if (qstring->capacity < (qstring->length + len)) {
-        qstring->capacity += len;
-        qstring->capacity *= 2; /* use exponential growth */
-
-        qstring->string = g_realloc(qstring->string, qstring->capacity + 1);
-    }
-}
-
-/* qstring_append(): Append a C string to a QString
- */
-void qstring_append(QString *qstring, const char *str)
-{
-    size_t len = strlen(str);
-
-    capacity_increase(qstring, len);
-    memcpy(qstring->string + qstring->length, str, len);
-    qstring->length += len;
-    qstring->string[qstring->length] = 0;
-}
-
-void qstring_append_int(QString *qstring, int64_t value)
-{
-    char num[32];
-
-    snprintf(num, sizeof(num), "%" PRId64, value);
-    qstring_append(qstring, num);
+    return qstring_from_substr(str, 0, strlen(str));
 }
 
 /**
- * qstring_append_chr(): Append a C char to a QString
+ * qstring_from_gstring(): Convert a GString to a QString
+ *
+ * Return strong reference.
  */
-void qstring_append_chr(QString *qstring, int c)
-{
-    capacity_increase(qstring, 1);
-    qstring->string[qstring->length++] = c;
-    qstring->string[qstring->length] = 0;
-}
 
-/**
- * qobject_to_qstring(): Convert a QObject to a QString
- */
-QString *qobject_to_qstring(const QObject *obj)
+QString *qstring_from_gstring(GString *gstr)
 {
-    if (qobject_type(obj) != QTYPE_QSTRING)
-        return NULL;
+    QString *qstring;
 
-    return container_of(obj, QString, base);
+    qstring = g_malloc(sizeof(*qstring));
+    qobject_init(QOBJECT(qstring), QTYPE_QSTRING);
+    qstring->string = g_string_free(gstr, false);
+    return qstring;
 }
 
+
 /**
  * qstring_get_str(): Return a pointer to the stored string
  *
@@ -126,16 +78,30 @@ const char *qstring_get_str(const QString *qstring)
     return qstring->string;
 }
 
+/**
+ * qstring_is_equal(): Test whether the two QStrings are equal
+ */
+bool qstring_is_equal(const QObject *x, const QObject *y)
+{
+    return !strcmp(qobject_to(QString, x)->string,
+                   qobject_to(QString, y)->string);
+}
+
 /**
  * qstring_destroy_obj(): Free all memory allocated by a QString
  * object
  */
-static void qstring_destroy_obj(QObject *obj)
+void qstring_destroy_obj(QObject *obj)
 {
     QString *qs;
 
     assert(obj != NULL);
-    qs = qobject_to_qstring(obj);
-    g_free(qs->string);
+    qs = qobject_to(QString, obj);
+    g_free((char *)qs->string);
     g_free(qs);
 }
+
+void qstring_unref(QString *q)
+{
+    qobject_unref(q);
+}