summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2009-11-18 23:05:27 -0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-03 09:41:19 -0600
commit4b5c5766d0ee4cbe70642977530f753678ebcfce (patch)
treebfdced5b743d0fdc3598c120447546d2a7147653 /qstring.c
parentQString: Introduce qstring_append_int() (diff)
downloadqemu-kvm-4b5c5766d0ee4cbe70642977530f753678ebcfce.tar.gz
qemu-kvm-4b5c5766d0ee4cbe70642977530f753678ebcfce.tar.bz2
qemu-kvm-4b5c5766d0ee4cbe70642977530f753678ebcfce.zip
QString: Introduce qstring_from_substr()
Note that we can now write qstring_from_str() as a wrapper. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qstring.c')
-rw-r--r--qstring.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/qstring.c b/qstring.c
index ad1776949..740a1067d 100644
--- a/qstring.c
+++ b/qstring.c
@@ -31,21 +31,21 @@ QString *qstring_new(void)
}
/**
- * qstring_from_str(): Create a new QString from a regular C string
+ * qstring_from_substr(): Create a new QString from a C string substring
*
- * Return strong reference.
+ * Return string reference
*/
-QString *qstring_from_str(const char *str)
+QString *qstring_from_substr(const char *str, int start, int end)
{
QString *qstring;
qstring = qemu_malloc(sizeof(*qstring));
- qstring->length = strlen(str);
+ qstring->length = end - start + 1;
qstring->capacity = qstring->length;
qstring->string = qemu_malloc(qstring->capacity + 1);
- memcpy(qstring->string, str, qstring->length);
+ memcpy(qstring->string, str + start, qstring->length);
qstring->string[qstring->length] = 0;
QOBJECT_INIT(qstring, &qstring_type);
@@ -53,6 +53,16 @@ QString *qstring_from_str(const char *str)
return qstring;
}
+/**
+ * qstring_from_str(): Create a new QString from a regular C string
+ *
+ * Return strong reference.
+ */
+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)) {