[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 02/23] qobject: introduce qstring_get_try_str()
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v7 02/23] qobject: introduce qstring_get_try_str() |
Date: |
Wed, 24 Jan 2018 13:39:36 +0800 |
The only difference from qstring_get_str() is that it allows the qstring
to be NULL. If so, NULL is returned.
CC: Eric Blake <address@hidden>
CC: Markus Armbruster <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
include/qapi/qmp/qstring.h | 1 +
qobject/qstring.c | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h
index 65c05a9be5..a145c8ca00 100644
--- a/include/qapi/qmp/qstring.h
+++ b/include/qapi/qmp/qstring.h
@@ -27,6 +27,7 @@ QString *qstring_from_str(const char *str);
QString *qstring_from_substr(const char *str, int start, int end);
size_t qstring_get_length(const QString *qstring);
const char *qstring_get_str(const QString *qstring);
+const char *qstring_get_try_str(const QString *qstring);
void qstring_append_int(QString *qstring, int64_t value);
void qstring_append(QString *qstring, const char *str);
void qstring_append_chr(QString *qstring, int c);
diff --git a/qobject/qstring.c b/qobject/qstring.c
index 74182a1c02..7638ab990d 100644
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -128,6 +128,16 @@ const char *qstring_get_str(const QString *qstring)
return qstring->string;
}
+/**
+ * qstring_get_try_str(): Return a pointer to the stored string
+ *
+ * NOTE: will return NULL if qstring is not provided.
+ */
+const char *qstring_get_try_str(const QString *qstring)
+{
+ return qstring ? qstring_get_str(qstring) : NULL;
+}
+
/**
* qstring_is_equal(): Test whether the two QStrings are equal
*/
--
2.14.3
- [Qemu-devel] [PATCH v7 00/23] QMP: out-of-band (OOB) execution support, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 01/23] docs: update QMP documents for OOB commands, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 02/23] qobject: introduce qstring_get_try_str(),
Peter Xu <=
- [Qemu-devel] [PATCH v7 03/23] qobject: introduce qobject_get_try_str(), Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 04/23] qobject: let object_property_get_str() use new API, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 05/23] monitor: move skip_flush into monitor_data_init, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 06/23] monitor: move the cur_mon hack deeper for QMP, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 07/23] monitor: unify global init, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 08/23] monitor: let mon_list be tail queue, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 09/23] monitor: allow using IO thread for parsing, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 10/23] qmp: introduce QMPCapability, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 11/23] monitor: introduce monitor_qmp_respond(), Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 12/23] monitor: let suspend_cnt be thread safe, Peter Xu, 2018/01/24