Commit 082696e7 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qlit: use QLit prefix consistently 



Rename from LiteralQ to QLit.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20170825105913.4060-4-marcandre.lureau@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 28035bcd

include/qapi/qmp/qlit.h

+12 −12
Original line number Diff line number Diff line
@@ -17,33 +17,33 @@ 
#include "qapi-types.h"

#include "qobject.h"



typedef struct LiteralQDictEntry LiteralQDictEntry;

typedef struct LiteralQObject LiteralQObject;

typedef struct QLitDictEntry QLitDictEntry;

typedef struct QLitObject QLitObject;



struct LiteralQObject {

struct QLitObject {

    int type;

    union {

        int64_t qnum;

        const char *qstr;

        LiteralQDictEntry *qdict;

        LiteralQObject *qlist;

        QLitDictEntry *qdict;

        QLitObject *qlist;

    } value;

};



struct LiteralQDictEntry {

struct QLitDictEntry {

    const char *key;

    LiteralQObject value;

    QLitObject value;

};



#define QLIT_QNUM(val) \

    (LiteralQObject){.type = QTYPE_QNUM, .value.qnum = (val)}

    (QLitObject){.type = QTYPE_QNUM, .value.qnum = (val)}

#define QLIT_QSTR(val) \

    (LiteralQObject){.type = QTYPE_QSTRING, .value.qstr = (val)}

    (QLitObject){.type = QTYPE_QSTRING, .value.qstr = (val)}

#define QLIT_QDICT(val) \

    (LiteralQObject){.type = QTYPE_QDICT, .value.qdict = (val)}

    (QLitObject){.type = QTYPE_QDICT, .value.qdict = (val)}

#define QLIT_QLIST(val) \

    (LiteralQObject){.type = QTYPE_QLIST, .value.qlist = (val)}

    (QLitObject){.type = QTYPE_QLIST, .value.qlist = (val)}



int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs);

int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs);



#endif /* QLIT_H */

qobject/qlit.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


typedef struct QListCompareHelper {

    int index;

    LiteralQObject *objs;

    QLitObject *objs;

    int result;

} QListCompareHelper;
@@ -41,7 +41,7 @@ static void compare_helper(QObject *obj, void *opaque) 
        compare_litqobj_to_qobj(&helper->objs[helper->index++], obj);

}



int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs)

int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs)

{

    int64_t val;

tests/check-qjson.c

+20 −20
Original line number Diff line number Diff line
@@ -1065,23 +1065,23 @@ static void simple_dict(void) 
    int i;

    struct {

        const char *encoded;

        LiteralQObject decoded;

        QLitObject decoded;

    } test_cases[] = {

        {

            .encoded = "{\"foo\": 42, \"bar\": \"hello world\"}",

            .decoded = QLIT_QDICT(((LiteralQDictEntry[]){

            .decoded = QLIT_QDICT(((QLitDictEntry[]){

                        { "foo", QLIT_QNUM(42) },

                        { "bar", QLIT_QSTR("hello world") },

                        { }

                    })),

        }, {

            .encoded = "{}",

            .decoded = QLIT_QDICT(((LiteralQDictEntry[]){

            .decoded = QLIT_QDICT(((QLitDictEntry[]){

                        { }

                    })),

        }, {

            .encoded = "{\"foo\": 43}",

            .decoded = QLIT_QDICT(((LiteralQDictEntry[]){

            .decoded = QLIT_QDICT(((QLitDictEntry[]){

                        { "foo", QLIT_QNUM(43) },

                        { }

                    })),
@@ -1163,11 +1163,11 @@ static void simple_list(void) 
    int i;

    struct {

        const char *encoded;

        LiteralQObject decoded;

        QLitObject decoded;

    } test_cases[] = {

        {

            .encoded = "[43,42]",

            .decoded = QLIT_QLIST(((LiteralQObject[]){

            .decoded = QLIT_QLIST(((QLitObject[]){

                        QLIT_QNUM(43),

                        QLIT_QNUM(42),

                        { }
@@ -1175,21 +1175,21 @@ static void simple_list(void) 
        },

        {

            .encoded = "[43]",

            .decoded = QLIT_QLIST(((LiteralQObject[]){

            .decoded = QLIT_QLIST(((QLitObject[]){

                        QLIT_QNUM(43),

                        { }

                    })),

        },

        {

            .encoded = "[]",

            .decoded = QLIT_QLIST(((LiteralQObject[]){

            .decoded = QLIT_QLIST(((QLitObject[]){

                        { }

                    })),

        },

        {

            .encoded = "[{}]",

            .decoded = QLIT_QLIST(((LiteralQObject[]){

                        QLIT_QDICT(((LiteralQDictEntry[]){

            .decoded = QLIT_QLIST(((QLitObject[]){

                        QLIT_QDICT(((QLitDictEntry[]){

                                    {},

                                        })),

                        {},
@@ -1220,11 +1220,11 @@ static void simple_whitespace(void) 
    int i;

    struct {

        const char *encoded;

        LiteralQObject decoded;

        QLitObject decoded;

    } test_cases[] = {

        {

            .encoded = " [ 43 , 42 ]",

            .decoded = QLIT_QLIST(((LiteralQObject[]){

            .decoded = QLIT_QLIST(((QLitObject[]){

                        QLIT_QNUM(43),

                        QLIT_QNUM(42),

                        { }
@@ -1232,12 +1232,12 @@ static void simple_whitespace(void) 
        },

        {

            .encoded = " [ 43 , { 'h' : 'b' }, [ ], 42 ]",

            .decoded = QLIT_QLIST(((LiteralQObject[]){

            .decoded = QLIT_QLIST(((QLitObject[]){

                        QLIT_QNUM(43),

                        QLIT_QDICT(((LiteralQDictEntry[]){

                        QLIT_QDICT(((QLitDictEntry[]){

                                    { "h", QLIT_QSTR("b") },

                                    { }})),

                        QLIT_QLIST(((LiteralQObject[]){

                        QLIT_QLIST(((QLitObject[]){

                                    { }})),

                        QLIT_QNUM(42),

                        { }
@@ -1245,13 +1245,13 @@ static void simple_whitespace(void) 
        },

        {

            .encoded = " [ 43 , { 'h' : 'b' , 'a' : 32 }, [ ], 42 ]",

            .decoded = QLIT_QLIST(((LiteralQObject[]){

            .decoded = QLIT_QLIST(((QLitObject[]){

                        QLIT_QNUM(43),

                        QLIT_QDICT(((LiteralQDictEntry[]){

                        QLIT_QDICT(((QLitDictEntry[]){

                                    { "h", QLIT_QSTR("b") },

                                    { "a", QLIT_QNUM(32) },

                                    { }})),

                        QLIT_QLIST(((LiteralQObject[]){

                        QLIT_QLIST(((QLitObject[]){

                                    { }})),

                        QLIT_QNUM(42),

                        { }
@@ -1282,10 +1282,10 @@ static void simple_varargs(void) 
{

    QObject *embedded_obj;

    QObject *obj;

    LiteralQObject decoded = QLIT_QLIST(((LiteralQObject[]){

    QLitObject decoded = QLIT_QLIST(((QLitObject[]){

            QLIT_QNUM(1),

            QLIT_QNUM(2),

            QLIT_QLIST(((LiteralQObject[]){

            QLIT_QLIST(((QLitObject[]){

                        QLIT_QNUM(32),

                        QLIT_QNUM(42),

                        {}})),