diff options
author | Max Reitz <mreitz@redhat.com> | 2018-02-24 16:40:30 +0100 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2018-03-19 14:58:36 -0500 |
commit | cb51b976babf7ee16dc5eda4f2189d65b8b700a3 (patch) | |
tree | a0748ed1a0b185844477c33fc280847f2b2bf4b5 | |
parent | 7dc847ebba953db90853d15f140c20eef74d4fb2 (diff) | |
download | qemu-cb51b976babf7ee16dc5eda4f2189d65b8b700a3.zip qemu-cb51b976babf7ee16dc5eda4f2189d65b8b700a3.tar.gz qemu-cb51b976babf7ee16dc5eda4f2189d65b8b700a3.tar.bz2 |
qapi: Remove qobject_to_X() functions
They are no longer needed now.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20180224154033.29559-5-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
-rw-r--r-- | include/qapi/qmp/qbool.h | 1 | ||||
-rw-r--r-- | include/qapi/qmp/qdict.h | 1 | ||||
-rw-r--r-- | include/qapi/qmp/qlist.h | 1 | ||||
-rw-r--r-- | include/qapi/qmp/qnum.h | 1 | ||||
-rw-r--r-- | include/qapi/qmp/qstring.h | 1 | ||||
-rw-r--r-- | qobject/qbool.c | 11 | ||||
-rw-r--r-- | qobject/qdict.c | 11 | ||||
-rw-r--r-- | qobject/qlist.c | 11 | ||||
-rw-r--r-- | qobject/qnum.c | 11 | ||||
-rw-r--r-- | qobject/qstring.c | 11 |
10 files changed, 0 insertions, 60 deletions
diff --git a/include/qapi/qmp/qbool.h b/include/qapi/qmp/qbool.h index 629c508..b9a44a1 100644 --- a/include/qapi/qmp/qbool.h +++ b/include/qapi/qmp/qbool.h @@ -23,7 +23,6 @@ struct QBool { QBool *qbool_from_bool(bool value); bool qbool_get_bool(const QBool *qb); -QBool *qobject_to_qbool(const QObject *obj); bool qbool_is_equal(const QObject *x, const QObject *y); void qbool_destroy_obj(QObject *obj); diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index 7c6d844..2cc3e90 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -39,7 +39,6 @@ void qdict_put_obj(QDict *qdict, const char *key, QObject *value); void qdict_del(QDict *qdict, const char *key); int qdict_haskey(const QDict *qdict, const char *key); QObject *qdict_get(const QDict *qdict, const char *key); -QDict *qobject_to_qdict(const QObject *obj); bool qdict_is_equal(const QObject *x, const QObject *y); void qdict_iter(const QDict *qdict, void (*iter)(const char *key, QObject *obj, void *opaque), diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h index 5fd976a..5c673ac 100644 --- a/include/qapi/qmp/qlist.h +++ b/include/qapi/qmp/qlist.h @@ -53,7 +53,6 @@ QObject *qlist_pop(QList *qlist); QObject *qlist_peek(QList *qlist); int qlist_empty(const QList *qlist); size_t qlist_size(const QList *qlist); -QList *qobject_to_qlist(const QObject *obj); bool qlist_is_equal(const QObject *x, const QObject *y); void qlist_destroy_obj(QObject *obj); diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h index 15e3971..3e47475 100644 --- a/include/qapi/qmp/qnum.h +++ b/include/qapi/qmp/qnum.h @@ -68,7 +68,6 @@ double qnum_get_double(QNum *qn); char *qnum_to_string(QNum *qn); -QNum *qobject_to_qnum(const QObject *obj); bool qnum_is_equal(const QObject *x, const QObject *y); void qnum_destroy_obj(QObject *obj); diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h index 98070ef..b72843f 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); diff --git a/qobject/qbool.c b/qobject/qbool.c index 5be6277..b582499 100644 --- a/qobject/qbool.c +++ b/qobject/qbool.c @@ -40,17 +40,6 @@ bool qbool_get_bool(const QBool *qb) } /** - * qobject_to_qbool(): Convert a QObject into a QBool - */ -QBool *qobject_to_qbool(const QObject *obj) -{ - if (!obj || qobject_type(obj) != QTYPE_QBOOL) { - return NULL; - } - return container_of(obj, QBool, base); -} - -/** * qbool_is_equal(): Test whether the two QBools are equal */ bool qbool_is_equal(const QObject *x, const QObject *y) diff --git a/qobject/qdict.c b/qobject/qdict.c index 1e58812..45c8b53 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -38,17 +38,6 @@ QDict *qdict_new(void) } /** - * qobject_to_qdict(): Convert a QObject into a QDict - */ -QDict *qobject_to_qdict(const QObject *obj) -{ - if (!obj || qobject_type(obj) != QTYPE_QDICT) { - return NULL; - } - return container_of(obj, QDict, base); -} - -/** * tdb_hash(): based on the hash agorithm from gdbm, via tdb * (from module-init-tools) */ diff --git a/qobject/qlist.c b/qobject/qlist.c index 77f19ff..954fe98 100644 --- a/qobject/qlist.c +++ b/qobject/qlist.c @@ -152,17 +152,6 @@ size_t qlist_size(const QList *qlist) } /** - * qobject_to_qlist(): Convert a QObject into a QList - */ -QList *qobject_to_qlist(const QObject *obj) -{ - if (!obj || qobject_type(obj) != QTYPE_QLIST) { - return NULL; - } - return container_of(obj, QList, base); -} - -/** * qlist_is_equal(): Test whether the two QLists are equal * * In order to be considered equal, the respective two objects at each diff --git a/qobject/qnum.c b/qobject/qnum.c index ea091cf..1501c82 100644 --- a/qobject/qnum.c +++ b/qobject/qnum.c @@ -200,17 +200,6 @@ char *qnum_to_string(QNum *qn) } /** - * qobject_to_qnum(): Convert a QObject into a QNum - */ -QNum *qobject_to_qnum(const QObject *obj) -{ - if (!obj || qobject_type(obj) != QTYPE_QNUM) { - return NULL; - } - return container_of(obj, QNum, base); -} - -/** * qnum_is_equal(): Test whether the two QNums are equal * * Negative integers are never considered equal to unsigned integers, diff --git a/qobject/qstring.c b/qobject/qstring.c index 2b21532..8bae529 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -106,17 +106,6 @@ void qstring_append_chr(QString *qstring, int c) } /** - * qobject_to_qstring(): Convert a QObject to a QString - */ -QString *qobject_to_qstring(const QObject *obj) -{ - if (!obj || qobject_type(obj) != QTYPE_QSTRING) { - return NULL; - } - return container_of(obj, QString, base); -} - -/** * qstring_get_str(): Return a pointer to the stored string * * NOTE: Should be used with caution, if the object is deallocated |