Commit 05dfb26c authored by Amos Kong's avatar Amos Kong Committed by Luiz Capitulino
Browse files

qapi: Suppress unwanted space between type and identifier 



We always generate a space between type and identifier in parameter
and variable declarations, even when idiomatic C style doesn't have
a space there.  Suppress it.

Signed-off-by: default avatarAmos Kong <akong@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 0d14eeb2

scripts/qapi-commands.py

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ def gen_visitor_input_vars_decl(args): 
bool has_%(argname)s = false;

''',

                         argname=c_var(argname))

        if c_type(argtype).endswith("*"):

        if is_c_ptr(argtype):

            ret += mcgen('''

%(argtype)s %(argname)s = NULL;

''',
@@ -227,7 +227,7 @@ def gen_marshal_input(name, args, ret_type, middle_mode): 
''')



    if ret_type:

        if c_type(ret_type).endswith("*"):

        if is_c_ptr(ret_type):

            retval = "    %s retval = NULL;" % c_type(ret_type)

        else:

            retval = "    %s retval;" % c_type(ret_type)

scripts/qapi.py

+17 −6
Original line number Diff line number Diff line
@@ -470,11 +470,17 @@ def find_enum(name): 
def is_enum(name):

    return find_enum(name) != None



eatspace = '\033EATSPACE.'



# A special suffix is added in c_type() for pointer types, and it's

# stripped in mcgen(). So please notice this when you check the return

# value of c_type() outside mcgen().

def c_type(name, is_param=False):

    if name == 'str':

        if is_param:

            return 'const char *'

        return 'char *'

            return 'const char *' + eatspace

        return 'char *' + eatspace



    elif name == 'int':

        return 'int64_t'

    elif (name == 'int8' or name == 'int16' or name == 'int32' or
@@ -488,15 +494,19 @@ def c_type(name, is_param=False): 
    elif name == 'number':

        return 'double'

    elif type(name) == list:

        return '%s *' % c_list_type(name[0])

        return '%s *%s' % (c_list_type(name[0]), eatspace)

    elif is_enum(name):

        return name

    elif name == None or len(name) == 0:

        return 'void'

    elif name == name.upper():

        return '%sEvent *' % camel_case(name)

        return '%sEvent *%s' % (camel_case(name), eatspace)

    else:

        return '%s *' % name

        return '%s *%s' % (name, eatspace)



def is_c_ptr(name):

    suffix = "*" + eatspace

    return c_type(name).endswith(suffix)



def genindent(count):

    ret = ""
@@ -521,7 +531,8 @@ def cgen(code, **kwds): 
    return '\n'.join(lines) % kwds + '\n'



def mcgen(code, **kwds):

    return cgen('\n'.join(code.split('\n')[1:-1]), **kwds)

    raw = cgen('\n'.join(code.split('\n')[1:-1]), **kwds)

    return re.sub(re.escape(eatspace) + ' *', '', raw)



def basename(filename):

    return filename.split("/")[-1]