Commit 77593202 authored Mar 09, 2018 by Peter Xu Committed by Eric Blake Mar 19, 2018

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 <eblake@redhat.com>
CC: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180309090006.10018-3-peterx@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

parent 378112b0

include/qapi/qmp/qstring.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);

qobject/qstring.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -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
		*/