yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-04-01 23:07:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

qobject: introduce qstring_get_try_str()

Browse source 
The only difference from qstring_get_str() is that it allows the qstring
to be NULL. If so, NULL is returned.

Backports commit 775932020dd6bd7e9c1acc0d7779677d8b4c094c from qemu
This commit is contained in:
Peter Xu 2018-03-20 11:07:10 -04:00 committed by Lioncash
parent 65b2b73b12
commit 6446b66dc7
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
16 changed files with 25 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qemu/aarch64.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_aarch64
#define qobject_output_visitor_new qobject_output_visitor_new_aarch64
#define qobject_decref qobject_decref_aarch64
#define qobject_to_qbool qobject_to_qbool_aarch64
#define qobject_to_qdict qobject_to_qdict_aarch64
#define qobject_to_qfloat qobject_to_qfloat_aarch64
#define qobject_to_qint qobject_to_qint_aarch64
#define qobject_to_qlist qobject_to_qlist_aarch64
#define qobject_to_qstring qobject_to_qstring_aarch64
#define qobject_type qobject_type_aarch64
#define qstring_append qstring_append_aarch64
#define qstring_append_chr qstring_append_chr_aarch64
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_aarch64
#define qstring_get_length qstring_get_length_aarch64
#define qstring_get_str qstring_get_str_aarch64
#define qstring_get_try_str qstring_get_try_str_aarch64
#define qstring_new qstring_new_aarch64
#define qstring_type qstring_type_aarch64
#define ram_block_add ram_block_add_aarch64

7
qemu/aarch64eb.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_aarch64eb
#define qobject_output_visitor_new qobject_output_visitor_new_aarch64eb
#define qobject_decref qobject_decref_aarch64eb
#define qobject_to_qbool qobject_to_qbool_aarch64eb
#define qobject_to_qdict qobject_to_qdict_aarch64eb
#define qobject_to_qfloat qobject_to_qfloat_aarch64eb
#define qobject_to_qint qobject_to_qint_aarch64eb
#define qobject_to_qlist qobject_to_qlist_aarch64eb
#define qobject_to_qstring qobject_to_qstring_aarch64eb
#define qobject_type qobject_type_aarch64eb
#define qstring_append qstring_append_aarch64eb
#define qstring_append_chr qstring_append_chr_aarch64eb
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_aarch64eb
#define qstring_get_length qstring_get_length_aarch64eb
#define qstring_get_str qstring_get_str_aarch64eb
#define qstring_get_try_str qstring_get_try_str_aarch64eb
#define qstring_new qstring_new_aarch64eb
#define qstring_type qstring_type_aarch64eb
#define ram_block_add ram_block_add_aarch64eb

7
qemu/arm.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_arm
#define qobject_output_visitor_new qobject_output_visitor_new_arm
#define qobject_decref qobject_decref_arm
#define qobject_to_qbool qobject_to_qbool_arm
#define qobject_to_qdict qobject_to_qdict_arm
#define qobject_to_qfloat qobject_to_qfloat_arm
#define qobject_to_qint qobject_to_qint_arm
#define qobject_to_qlist qobject_to_qlist_arm
#define qobject_to_qstring qobject_to_qstring_arm
#define qobject_type qobject_type_arm
#define qstring_append qstring_append_arm
#define qstring_append_chr qstring_append_chr_arm
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_arm
#define qstring_get_length qstring_get_length_arm
#define qstring_get_str qstring_get_str_arm
#define qstring_get_try_str qstring_get_try_str_arm
#define qstring_new qstring_new_arm
#define qstring_type qstring_type_arm
#define ram_block_add ram_block_add_arm

7
qemu/armeb.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_armeb
#define qobject_output_visitor_new qobject_output_visitor_new_armeb
#define qobject_decref qobject_decref_armeb
#define qobject_to_qbool qobject_to_qbool_armeb
#define qobject_to_qdict qobject_to_qdict_armeb
#define qobject_to_qfloat qobject_to_qfloat_armeb
#define qobject_to_qint qobject_to_qint_armeb
#define qobject_to_qlist qobject_to_qlist_armeb
#define qobject_to_qstring qobject_to_qstring_armeb
#define qobject_type qobject_type_armeb
#define qstring_append qstring_append_armeb
#define qstring_append_chr qstring_append_chr_armeb
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_armeb
#define qstring_get_length qstring_get_length_armeb
#define qstring_get_str qstring_get_str_armeb
#define qstring_get_try_str qstring_get_try_str_armeb
#define qstring_new qstring_new_armeb
#define qstring_type qstring_type_armeb
#define ram_block_add ram_block_add_armeb

7
qemu/header_gen.py
View file

@ -2249,12 +2249,6 @@ symbols = (
'qobject_output_visitor_cleanup',
'qobject_output_visitor_new',
'qobject_decref',
'qobject_to_qbool',
'qobject_to_qdict',
'qobject_to_qfloat',
'qobject_to_qint',
'qobject_to_qlist',
'qobject_to_qstring',
'qobject_type',
'qstring_append',
'qstring_append_chr',
@ -2265,6 +2259,7 @@ symbols = (
'qstring_from_substr',
'qstring_get_length',
'qstring_get_str',
'qstring_get_try_str',
'qstring_new',
'qstring_type',
'ram_block_add',

1
qemu/include/qapi/qmp/qstring.h
View file

@ -28,6 +28,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);

7
qemu/m68k.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_m68k
#define qobject_output_visitor_new qobject_output_visitor_new_m68k
#define qobject_decref qobject_decref_m68k
#define qobject_to_qbool qobject_to_qbool_m68k
#define qobject_to_qdict qobject_to_qdict_m68k
#define qobject_to_qfloat qobject_to_qfloat_m68k
#define qobject_to_qint qobject_to_qint_m68k
#define qobject_to_qlist qobject_to_qlist_m68k
#define qobject_to_qstring qobject_to_qstring_m68k
#define qobject_type qobject_type_m68k
#define qstring_append qstring_append_m68k
#define qstring_append_chr qstring_append_chr_m68k
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_m68k
#define qstring_get_length qstring_get_length_m68k
#define qstring_get_str qstring_get_str_m68k
#define qstring_get_try_str qstring_get_try_str_m68k
#define qstring_new qstring_new_m68k
#define qstring_type qstring_type_m68k
#define ram_block_add ram_block_add_m68k

7
qemu/mips.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_mips
#define qobject_output_visitor_new qobject_output_visitor_new_mips
#define qobject_decref qobject_decref_mips
#define qobject_to_qbool qobject_to_qbool_mips
#define qobject_to_qdict qobject_to_qdict_mips
#define qobject_to_qfloat qobject_to_qfloat_mips
#define qobject_to_qint qobject_to_qint_mips
#define qobject_to_qlist qobject_to_qlist_mips
#define qobject_to_qstring qobject_to_qstring_mips
#define qobject_type qobject_type_mips
#define qstring_append qstring_append_mips
#define qstring_append_chr qstring_append_chr_mips
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_mips
#define qstring_get_length qstring_get_length_mips
#define qstring_get_str qstring_get_str_mips
#define qstring_get_try_str qstring_get_try_str_mips
#define qstring_new qstring_new_mips
#define qstring_type qstring_type_mips
#define ram_block_add ram_block_add_mips

7
qemu/mips64.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_mips64
#define qobject_output_visitor_new qobject_output_visitor_new_mips64
#define qobject_decref qobject_decref_mips64
#define qobject_to_qbool qobject_to_qbool_mips64
#define qobject_to_qdict qobject_to_qdict_mips64
#define qobject_to_qfloat qobject_to_qfloat_mips64
#define qobject_to_qint qobject_to_qint_mips64
#define qobject_to_qlist qobject_to_qlist_mips64
#define qobject_to_qstring qobject_to_qstring_mips64
#define qobject_type qobject_type_mips64
#define qstring_append qstring_append_mips64
#define qstring_append_chr qstring_append_chr_mips64
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_mips64
#define qstring_get_length qstring_get_length_mips64
#define qstring_get_str qstring_get_str_mips64
#define qstring_get_try_str qstring_get_try_str_mips64
#define qstring_new qstring_new_mips64
#define qstring_type qstring_type_mips64
#define ram_block_add ram_block_add_mips64

7
qemu/mips64el.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_mips64el
#define qobject_output_visitor_new qobject_output_visitor_new_mips64el
#define qobject_decref qobject_decref_mips64el
#define qobject_to_qbool qobject_to_qbool_mips64el
#define qobject_to_qdict qobject_to_qdict_mips64el
#define qobject_to_qfloat qobject_to_qfloat_mips64el
#define qobject_to_qint qobject_to_qint_mips64el
#define qobject_to_qlist qobject_to_qlist_mips64el
#define qobject_to_qstring qobject_to_qstring_mips64el
#define qobject_type qobject_type_mips64el
#define qstring_append qstring_append_mips64el
#define qstring_append_chr qstring_append_chr_mips64el
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_mips64el
#define qstring_get_length qstring_get_length_mips64el
#define qstring_get_str qstring_get_str_mips64el
#define qstring_get_try_str qstring_get_try_str_mips64el
#define qstring_new qstring_new_mips64el
#define qstring_type qstring_type_mips64el
#define ram_block_add ram_block_add_mips64el

7
qemu/mipsel.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_mipsel
#define qobject_output_visitor_new qobject_output_visitor_new_mipsel
#define qobject_decref qobject_decref_mipsel
#define qobject_to_qbool qobject_to_qbool_mipsel
#define qobject_to_qdict qobject_to_qdict_mipsel
#define qobject_to_qfloat qobject_to_qfloat_mipsel
#define qobject_to_qint qobject_to_qint_mipsel
#define qobject_to_qlist qobject_to_qlist_mipsel
#define qobject_to_qstring qobject_to_qstring_mipsel
#define qobject_type qobject_type_mipsel
#define qstring_append qstring_append_mipsel
#define qstring_append_chr qstring_append_chr_mipsel
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_mipsel
#define qstring_get_length qstring_get_length_mipsel
#define qstring_get_str qstring_get_str_mipsel
#define qstring_get_try_str qstring_get_try_str_mipsel
#define qstring_new qstring_new_mipsel
#define qstring_type qstring_type_mipsel
#define ram_block_add ram_block_add_mipsel

7
qemu/powerpc.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_powerpc
#define qobject_output_visitor_new qobject_output_visitor_new_powerpc
#define qobject_decref qobject_decref_powerpc
#define qobject_to_qbool qobject_to_qbool_powerpc
#define qobject_to_qdict qobject_to_qdict_powerpc
#define qobject_to_qfloat qobject_to_qfloat_powerpc
#define qobject_to_qint qobject_to_qint_powerpc
#define qobject_to_qlist qobject_to_qlist_powerpc
#define qobject_to_qstring qobject_to_qstring_powerpc
#define qobject_type qobject_type_powerpc
#define qstring_append qstring_append_powerpc
#define qstring_append_chr qstring_append_chr_powerpc
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_powerpc
#define qstring_get_length qstring_get_length_powerpc
#define qstring_get_str qstring_get_str_powerpc
#define qstring_get_try_str qstring_get_try_str_powerpc
#define qstring_new qstring_new_powerpc
#define qstring_type qstring_type_powerpc
#define ram_block_add ram_block_add_powerpc

10
qemu/qobject/qstring.c
View file

@ -115,6 +115,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
*/

7
qemu/sparc.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_sparc
#define qobject_output_visitor_new qobject_output_visitor_new_sparc
#define qobject_decref qobject_decref_sparc
#define qobject_to_qbool qobject_to_qbool_sparc
#define qobject_to_qdict qobject_to_qdict_sparc
#define qobject_to_qfloat qobject_to_qfloat_sparc
#define qobject_to_qint qobject_to_qint_sparc
#define qobject_to_qlist qobject_to_qlist_sparc
#define qobject_to_qstring qobject_to_qstring_sparc
#define qobject_type qobject_type_sparc
#define qstring_append qstring_append_sparc
#define qstring_append_chr qstring_append_chr_sparc
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_sparc
#define qstring_get_length qstring_get_length_sparc
#define qstring_get_str qstring_get_str_sparc
#define qstring_get_try_str qstring_get_try_str_sparc
#define qstring_new qstring_new_sparc
#define qstring_type qstring_type_sparc
#define ram_block_add ram_block_add_sparc

7
qemu/sparc64.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_sparc64
#define qobject_output_visitor_new qobject_output_visitor_new_sparc64
#define qobject_decref qobject_decref_sparc64
#define qobject_to_qbool qobject_to_qbool_sparc64
#define qobject_to_qdict qobject_to_qdict_sparc64
#define qobject_to_qfloat qobject_to_qfloat_sparc64
#define qobject_to_qint qobject_to_qint_sparc64
#define qobject_to_qlist qobject_to_qlist_sparc64
#define qobject_to_qstring qobject_to_qstring_sparc64
#define qobject_type qobject_type_sparc64
#define qstring_append qstring_append_sparc64
#define qstring_append_chr qstring_append_chr_sparc64
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_sparc64
#define qstring_get_length qstring_get_length_sparc64
#define qstring_get_str qstring_get_str_sparc64
#define qstring_get_try_str qstring_get_try_str_sparc64
#define qstring_new qstring_new_sparc64
#define qstring_type qstring_type_sparc64
#define ram_block_add ram_block_add_sparc64

7
qemu/x86_64.h
View file

@ -2243,12 +2243,6 @@
#define qobject_output_visitor_cleanup qobject_output_visitor_cleanup_x86_64
#define qobject_output_visitor_new qobject_output_visitor_new_x86_64
#define qobject_decref qobject_decref_x86_64
#define qobject_to_qbool qobject_to_qbool_x86_64
#define qobject_to_qdict qobject_to_qdict_x86_64
#define qobject_to_qfloat qobject_to_qfloat_x86_64
#define qobject_to_qint qobject_to_qint_x86_64
#define qobject_to_qlist qobject_to_qlist_x86_64
#define qobject_to_qstring qobject_to_qstring_x86_64
#define qobject_type qobject_type_x86_64
#define qstring_append qstring_append_x86_64
#define qstring_append_chr qstring_append_chr_x86_64
@ -2259,6 +2253,7 @@
#define qstring_from_substr qstring_from_substr_x86_64
#define qstring_get_length qstring_get_length_x86_64
#define qstring_get_str qstring_get_str_x86_64
#define qstring_get_try_str qstring_get_try_str_x86_64
#define qstring_new qstring_new_x86_64
#define qstring_type qstring_type_x86_64
#define ram_block_add ram_block_add_x86_64