[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] QString: Introduce qstring_from_substr()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 04/10] QString: Introduce qstring_from_substr() |
Date: |
Tue, 17 Nov 2009 17:43:51 -0200 |
Note that we can now write qstring_from_str() as a wrapper.
Signed-off-by: Luiz Capitulino <address@hidden>
---
qstring.c | 20 +++++++++++++++-----
qstring.h | 1 +
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/qstring.c b/qstring.c
index ad17769..740a106 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)) {
diff --git a/qstring.h b/qstring.h
index c065331..6aaa7d5 100644
--- a/qstring.h
+++ b/qstring.h
@@ -13,6 +13,7 @@ typedef struct QString {
QString *qstring_new(void);
QString *qstring_from_str(const char *str);
+QString *qstring_from_substr(const char *str, int start, int end);
const char *qstring_get_str(const QString *qstring);
void qstring_append_int(QString *qstring, int64_t value);
void qstring_append(QString *qstring, const char *str);
--
1.6.5.2.180.gc5b3e
- [Qemu-devel] [PATCH 00/10]: QError v4, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 01/10] QJSON: Introduce qobject_from_jsonv(), Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 02/10] QString: Introduce qstring_append_chr(), Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 03/10] QString: Introduce qstring_append_int(), Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 04/10] QString: Introduce qstring_from_substr(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 05/10] utests: Add qstring_append_chr() unit-test, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 06/10] utests: Add qstring_from_substr() unit-test, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 07/10] Introduce QError, Luiz Capitulino, 2009/11/17
- Re: [Qemu-devel] [PATCH 07/10] Introduce QError, Daniel P. Berrange, 2009/11/18