Skip to content

Commit

Permalink
qapi: Drop unused c_null()
Browse files Browse the repository at this point in the history
Now that we are always bulk-initializing a QAPI C struct to 0
(whether by g_malloc0() or by 'Type arg = {0};'), we no longer
have any clients of c_null() in the generator for per-element
initialization.  This patch is easy enough to revert if we find
a use in the future, but in the present, get rid of the dead code.

Signed-off-by: Eric Blake <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>
  • Loading branch information
ebblake authored and Markus Armbruster committed Mar 18, 2016
1 parent 12f254f commit 861877a
Showing 1 changed file with 17 additions and 29 deletions.
46 changes: 17 additions & 29 deletions scripts/qapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -836,9 +836,6 @@ def c_param_type(self):
def c_unboxed_type(self):
return self.c_type()

def c_null(self):
return 'NULL'

def json_type(self):
pass

Expand All @@ -854,14 +851,13 @@ def alternate_qtype(self):


class QAPISchemaBuiltinType(QAPISchemaType):
def __init__(self, name, json_type, c_type, c_null):
def __init__(self, name, json_type, c_type):
QAPISchemaType.__init__(self, name, None)
assert not c_type or isinstance(c_type, str)
assert json_type in ('string', 'number', 'int', 'boolean', 'null',
'value')
self._json_type_name = json_type
self._c_type_name = c_type
self._c_null_val = c_null

def c_name(self):
return self.name
Expand All @@ -874,9 +870,6 @@ def c_param_type(self):
return 'const ' + self._c_type_name
return self._c_type_name

def c_null(self):
return self._c_null_val

def json_type(self):
return self._json_type_name

Expand Down Expand Up @@ -909,10 +902,6 @@ def c_type(self):
def member_names(self):
return [v.name for v in self.values]

def c_null(self):
return c_enum_const(self.name, (self.member_names() + ['_MAX'])[0],
self.prefix)

def json_type(self):
return 'string'

Expand Down Expand Up @@ -1240,9 +1229,8 @@ def lookup_entity(self, name, typ=None):
def lookup_type(self, name):
return self.lookup_entity(name, QAPISchemaType)

def _def_builtin_type(self, name, json_type, c_type, c_null):
self._def_entity(QAPISchemaBuiltinType(name, json_type,
c_type, c_null))
def _def_builtin_type(self, name, json_type, c_type):
self._def_entity(QAPISchemaBuiltinType(name, json_type, c_type))
# TODO As long as we have QAPI_TYPES_BUILTIN to share multiple
# qapi-types.h from a single .c, all arrays of builtins must be
# declared in the first file whether or not they are used. Nicer
Expand All @@ -1251,20 +1239,20 @@ def _def_builtin_type(self, name, json_type, c_type, c_null):
self._make_array_type(name, None)

def _def_predefineds(self):
for t in [('str', 'string', 'char' + pointer_suffix, 'NULL'),
('number', 'number', 'double', '0'),
('int', 'int', 'int64_t', '0'),
('int8', 'int', 'int8_t', '0'),
('int16', 'int', 'int16_t', '0'),
('int32', 'int', 'int32_t', '0'),
('int64', 'int', 'int64_t', '0'),
('uint8', 'int', 'uint8_t', '0'),
('uint16', 'int', 'uint16_t', '0'),
('uint32', 'int', 'uint32_t', '0'),
('uint64', 'int', 'uint64_t', '0'),
('size', 'int', 'uint64_t', '0'),
('bool', 'boolean', 'bool', 'false'),
('any', 'value', 'QObject' + pointer_suffix, 'NULL')]:
for t in [('str', 'string', 'char' + pointer_suffix),
('number', 'number', 'double'),
('int', 'int', 'int64_t'),
('int8', 'int', 'int8_t'),
('int16', 'int', 'int16_t'),
('int32', 'int', 'int32_t'),
('int64', 'int', 'int64_t'),
('uint8', 'int', 'uint8_t'),
('uint16', 'int', 'uint16_t'),
('uint32', 'int', 'uint32_t'),
('uint64', 'int', 'uint64_t'),
('size', 'int', 'uint64_t'),
('bool', 'boolean', 'bool'),
('any', 'value', 'QObject' + pointer_suffix)]:
self._def_builtin_type(*t)
self.the_empty_object_type = QAPISchemaObjectType('q_empty', None,
None, [], None)
Expand Down

0 comments on commit 861877a

Please sign in to comment.