From cb51b976babf7ee16dc5eda4f2189d65b8b700a3 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Sat, 24 Feb 2018 16:40:30 +0100 Subject: qapi: Remove qobject_to_X() functions They are no longer needed now. Signed-off-by: Max Reitz Reviewed-by: Alberto Garcia Message-Id: <20180224154033.29559-5-mreitz@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Eric Blake --- include/qapi/qmp/qstring.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/qapi/qmp/qstring.h') diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h index 98070ef3d6..b72843fc1b 100644 --- a/include/qapi/qmp/qstring.h +++ b/include/qapi/qmp/qstring.h @@ -30,7 +30,6 @@ 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); void qstring_append_chr(QString *qstring, int c); -QString *qobject_to_qstring(const QObject *obj); bool qstring_is_equal(const QObject *x, const QObject *y); void qstring_destroy_obj(QObject *obj); -- cgit v1.2.3-55-g7522 From 775932020dd6bd7e9c1acc0d7779677d8b4c094c Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Fri, 9 Mar 2018 16:59:45 +0800 Subject: qobject: introduce qstring_get_try_str() The only difference from qstring_get_str() is that it allows the qstring to be NULL. If so, NULL is returned. CC: Eric Blake CC: Markus Armbruster Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Reviewed-by: Eric Blake Signed-off-by: Peter Xu Message-Id: <20180309090006.10018-3-peterx@redhat.com> Signed-off-by: Eric Blake --- include/qapi/qmp/qstring.h | 1 + qobject/qstring.c | 10 ++++++++++ 2 files changed, 11 insertions(+) (limited to 'include/qapi/qmp/qstring.h') diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h index b72843fc1b..38c680b718 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 8bae529ef7..5777f0af23 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -116,6 +116,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 */ -- cgit v1.2.3-55-g7522 From b26ae1cb8eb0756524e322169138830b9b542311 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Fri, 9 Mar 2018 16:59:46 +0800 Subject: qobject: introduce qobject_get_try_str() A quick way to fetch string from qobject when it's a QString. Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Peter Xu Message-Id: <20180309090006.10018-4-peterx@redhat.com> Reviewed-by: Eric Blake [eblake: rebase to qobject_to() macro] Signed-off-by: Eric Blake --- include/qapi/qmp/qstring.h | 1 + qobject/qstring.c | 11 +++++++++++ 2 files changed, 12 insertions(+) (limited to 'include/qapi/qmp/qstring.h') diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h index 38c680b718..30ae260a7f 100644 --- a/include/qapi/qmp/qstring.h +++ b/include/qapi/qmp/qstring.h @@ -28,6 +28,7 @@ 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); +const char *qobject_get_try_str(const QObject *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 5777f0af23..afca54b47a 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -126,6 +126,17 @@ const char *qstring_get_try_str(const QString *qstring) return qstring ? qstring_get_str(qstring) : NULL; } +/** + * qobject_get_try_str(): Return a pointer to the corresponding string + * + * NOTE: the string will only be returned if the object is valid, and + * its type is QString, otherwise NULL is returned. + */ +const char *qobject_get_try_str(const QObject *qstring) +{ + return qstring_get_try_str(qobject_to(QString, qstring)); +} + /** * qstring_is_equal(): Test whether the two QStrings are equal */ -- cgit v1.2.3-55-g7522