diff --git a/src/c_client.py b/src/c_client.py index 3cef473..98421d6 100755 --- a/src/c_client.py +++ b/src/c_client.py @@ -512,8 +512,7 @@ def _c_type_setup(self, name, postfix): # special: switch C structs get pointer fields for variable-sized members _c_complex(self) for bitcase in self.bitcases: - bitcase_name = bitcase.type.name if bitcase.type.has_name else name - _c_accessors(bitcase.type, bitcase_name, bitcase_name) + _c_accessors(bitcase.type) # no list with switch as element, so no call to # _c_iterator(field.type, field_name) necessary @@ -2078,7 +2077,7 @@ def _c_accessors_list(self, field): _c(' return i;') _c('}') -def _c_accessors(self, name, base): +def _c_accessors(self): ''' Declares the accessor functions for the fields of a structure. ''' @@ -2172,7 +2171,7 @@ def c_struct(self, name): ''' _c_type_setup(self, name, ()) _c_complex(self) - _c_accessors(self, name, name) + _c_accessors(self) _c_iterator(self, name) def c_union(self, name): @@ -3202,7 +3201,7 @@ def c_request(self, name): _c_request_helper(self, name, void=False, regular=True, aux=True, reply_fds=has_fds) _c_request_helper(self, name, void=False, regular=False, aux=True, reply_fds=has_fds) # Reply accessors - _c_accessors(self.reply, name + ('reply',), name) + _c_accessors(self.reply) _c_reply(self, name) if has_fds: _c_reply_fds(self, name) @@ -3277,7 +3276,7 @@ def c_event(self, name): # generate accessors # (needed for fields after var-sized fields, for lists with var-sized elements, # switches, ...) - _c_accessors(self, name, name) + _c_accessors(self) else: # no type-setup needed for eventcopies # (the type-setup of an eventcopy would overwrite members of the original