starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-05-19 04:03:23 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

qobject: Use GString instead of QString to accumulate JSON

Browse Source 
QString supports modifying its string, but it's quite limited: you can
only append.  The remaining callers use it for building an initial
string, never for modifying it later.

Use of GString for building the initial string is actually more
convenient here.  Change qobject_to_json() & friends to do that.

Once all such uses are replaced this way, QString can become immutable.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201211171152.146877-5-armbru@redhat.com>
This commit is contained in:
Markus Armbruster
2020-12-11 18:11:36 +01:00
parent 6589f45991
commit f1cc129df8
3 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
qobject/qstring.c
View File

@@ -66,6 +66,25 @@ QString *qstring_from_str(const char *str)
return qstring_from_substr(str, 0, strlen(str));
}
/**
* qstring_from_gstring(): Convert a GString to a QString
*
* Return strong reference.
*/
QString *qstring_from_gstring(GString *gstr)
{
QString *qstring;
qstring = g_malloc(sizeof(*qstring));
qobject_init(QOBJECT(qstring), QTYPE_QSTRING);
qstring->length = gstr->len;
qstring->capacity = gstr->allocated_len;
qstring->string = g_string_free(gstr, false);
return qstring;
}
static void capacity_increase(QString *qstring, size_t len)
{
if (qstring->capacity < (qstring->length + len)) {