[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 01/27] qobject: introduce qstring_get_try_str()
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v4 01/27] qobject: introduce qstring_get_try_str() |
Date: |
Thu, 16 Nov 2017 21:05:44 +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>
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 10076b7c8c..34278bd639 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 5da7b5f37c..9df04e3c7b 100644
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -129,6 +129,16 @@ const char *qstring_get_str(const QString *qstring)
}
/**
+ * 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_destroy_obj(): Free all memory allocated by a QString
* object
*/
--
2.13.6
- [Qemu-devel] [RFC v4 00/27] QMP: out-of-band (OOB) execution support, Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 02/27] qobject: introduce qobject_get_try_str(), Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 01/27] qobject: introduce qstring_get_try_str(),
Peter Xu <=
- [Qemu-devel] [RFC v4 04/27] monitor: move skip_flush into monitor_data_init, Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 05/27] qjson: add "opaque" field to JSONMessageParser, Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 03/27] qobject: let object_property_get_str() use new API, Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 06/27] monitor: move the cur_mon hack deeper for QMP, Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 07/27] monitor: unify global init, Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 08/27] monitor: let mon_list be tail queue, Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 10/27] monitor: allow to use IO thread for parsing, Peter Xu, 2017/11/16
- [Qemu-devel] [RFC v4 09/27] monitor: create monitor dedicate iothread, Peter Xu, 2017/11/16