motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qobject: Use 'bool' for qbool

Browse source 
We require a C99 compiler, so let's use 'bool' instead of 'int'
when dealing with boolean values.  There are few enough clients
to fix them all in one pass.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-05-15 16:24:59 -06:00 • committed by Markus Armbruster
parent 0a3346f5de
commit fc48ffc39e
16 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qobject/json-parser.c
View file

@ -558,9 +558,9 @@ static QObject *parse_keyword(JSONParserContext *ctxt)
}
if (token_is_keyword(token, "true")) {
ret = QOBJECT(qbool_from_int(true));
ret = QOBJECT(qbool_from_bool(true));
} else if (token_is_keyword(token, "false")) {
ret = QOBJECT(qbool_from_int(false));
ret = QOBJECT(qbool_from_bool(false));
} else if (token_is_keyword(token, "null")) {
ret = qnull();
} else {
@ -593,7 +593,7 @@ static QObject *parse_escape(JSONParserContext *ctxt, va_list *ap)
if (token_is_escape(token, "%p")) {
obj = va_arg(*ap, QObject *);
} else if (token_is_escape(token, "%i")) {
obj = QOBJECT(qbool_from_int(va_arg(*ap, int)));
obj = QOBJECT(qbool_from_bool(va_arg(*ap, int)));
} else if (token_is_escape(token, "%d")) {
obj = QOBJECT(qint_from_int(va_arg(*ap, int)));
} else if (token_is_escape(token, "%ld")) {

8
qobject/qbool.c
View file

@ -23,11 +23,11 @@ static const QType qbool_type = {
};
/**
* qbool_from_int(): Create a new QBool from an int
* qbool_from_bool(): Create a new QBool from a bool
*
* Return strong reference.
*/
QBool *qbool_from_int(int value)
QBool *qbool_from_bool(bool value)
{
QBool *qb;
@ -39,9 +39,9 @@ QBool *qbool_from_int(int value)
}
/**
* qbool_get_int(): Get the stored int
* qbool_get_bool(): Get the stored bool
*/
int qbool_get_int(const QBool *qb)
bool qbool_get_bool(const QBool *qb)
{
return qb->value;
}

4
qobject/qdict.c
View file

@ -244,7 +244,7 @@ int64_t qdict_get_int(const QDict *qdict, const char *key)
int qdict_get_bool(const QDict *qdict, const char *key)
{
QObject *obj = qdict_get_obj(qdict, key, QTYPE_QBOOL);
return qbool_get_int(qobject_to_qbool(obj));
return qbool_get_bool(qobject_to_qbool(obj));
}
/**
@ -322,7 +322,7 @@ int qdict_get_try_bool(const QDict *qdict, const char *key, int def_value)
if (!obj || qobject_type(obj) != QTYPE_QBOOL)
return def_value;
return qbool_get_int(qobject_to_qbool(obj));
return qbool_get_bool(qobject_to_qbool(obj));
}
/**

2
qobject/qjson.c
View file

@ -254,7 +254,7 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent)
case QTYPE_QBOOL: {
QBool *val = qobject_to_qbool(obj);
if (qbool_get_int(val)) {
if (qbool_get_bool(val)) {
qstring_append(str, "true");
} else {
qstring_append(str, "false");