motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qobject: Make QString immutable

Browse source 
The functions to modify a QString's string are all unused now.  Drop
them, and make the string immutable.  Saves 16 bytes per QString on my
system.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201211171152.146877-21-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-12-11 18:11:52 +01:00
parent 18cf67c5e1
commit 4ac76ba414
4 changed files with 4 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

65
qobject/qstring.c
View file

@ -24,14 +24,6 @@ QString *qstring_new(void)
return qstring_from_str("");
}
/**
* qstring_get_length(): Get the length of a QString
*/
size_t qstring_get_length(const QString *qstring)
{
return qstring->length;
}
/**
* qstring_from_substr(): Create a new QString from a C string substring
*
@ -42,18 +34,9 @@ QString *qstring_from_substr(const char *str, size_t start, size_t end)
QString *qstring;
assert(start <= end);
qstring = g_malloc(sizeof(*qstring));
qobject_init(QOBJECT(qstring), QTYPE_QSTRING);
qstring->length = end - start;
qstring->capacity = qstring->length;
assert(qstring->capacity < SIZE_MAX);
qstring->string = g_malloc(qstring->capacity + 1);
memcpy(qstring->string, str + start, qstring->length);
qstring->string[qstring->length] = 0;
qstring->string = g_strndup(str + start, end - start);
return qstring;
}
@ -79,55 +62,11 @@ QString *qstring_from_gstring(GString *gstr)
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)) {
assert(len <= SIZE_MAX - qstring->capacity);
qstring->capacity += len;
assert(qstring->capacity <= SIZE_MAX / 2);
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);
}
/**
* qstring_append_chr(): Append a C char to a QString
*/
void qstring_append_chr(QString *qstring, int c)
{
capacity_increase(qstring, 1);
qstring->string[qstring->length++] = c;
qstring->string[qstring->length] = 0;
}
/**
* qstring_get_str(): Return a pointer to the stored string
*
@ -158,6 +97,6 @@ void qstring_destroy_obj(QObject *obj)
assert(obj != NULL);
qs = qobject_to(QString, obj);
g_free(qs->string);
g_free((char *)qs->string);
g_free(qs);
}