diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2021-10-08 22:26:46 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-10-12 22:27:12 +0200 |
| commit | b7432fc01a994bc135c70e715b755264f5706ed7 (patch) | |
| tree | 8b5882da4b463ac60c691709a18f3a7a05a89a48 | |
| parent | 9506fd86267dabe0e6bdad44c5e82576ce2bfd0b (diff) | |
build-aux,codegen: remove 'string-tlv' from structs
This type was the original implementation of string TLVs, that
required an intermediate struct to exist. The new 'tlv-string' type
hides the need of the intermediate struct, and so this old type is no
longer needed.
| -rw-r--r-- | build-aux/mbim-codegen/Struct.py | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/build-aux/mbim-codegen/Struct.py b/build-aux/mbim-codegen/Struct.py index 4fba85b..02037a5 100644 --- a/build-aux/mbim-codegen/Struct.py +++ b/build-aux/mbim-codegen/Struct.py @@ -108,9 +108,6 @@ class Struct: elif field['format'] == 'string': inner_template = ( ' * @${field_name_underscore}: a string.\n') - elif field['format'] == 'string-tlv': - inner_template = ( - ' * @${field_name_underscore}: a string.\n') elif field['format'] == 'string-array': inner_template = ( ' * @${field_name_underscore}: an array of strings.\n') @@ -169,9 +166,6 @@ class Struct: elif field['format'] == 'string': inner_template = ( ' gchar *${field_name_underscore};\n') - elif field['format'] == 'string-tlv': - inner_template = ( - ' gchar *${field_name_underscore};\n') elif field['format'] == 'string-array': inner_template = ( ' gchar **${field_name_underscore};\n') @@ -251,9 +245,6 @@ class Struct: elif field['format'] == 'string': inner_template += ( ' g_free (var->${field_name_underscore});\n') - elif field['format'] == 'string-tlv': - inner_template += ( - ' g_free (var->${field_name_underscore});\n') elif field['format'] == 'string-array': inner_template += ( ' g_strfreev (var->${field_name_underscore});\n') @@ -429,9 +420,6 @@ class Struct: elif field['format'] == 'string': inner_template += ( ' g_string_append_printf (str, "\'%s\'", self->${field_name_underscore});\n') - elif field['format'] == 'string-tlv': - inner_template += ( - ' g_string_append_printf (str, "\'%s\'", self->${field_name_underscore});\n') elif field['format'] == 'string-array': translations['array_size_field_name_underscore'] = utils.build_underscore_name_from_camelcase(field['array-size-field']) @@ -608,13 +596,6 @@ class Struct: ' if (!_mbim_message_read_string (self, relative_offset, offset, &out->${field_name_underscore}, error))\n' ' goto out;\n' ' offset += 8;\n') - elif field['format'] == 'string-tlv': - inner_template += ( - '{\n' - ' guint32 size = 0;\n' - ' if (!_mbim_message_read_string_tlv (self, relative_offset, offset, &out->${field_name_underscore}, &size, error))\n' - ' goto out;\n' - ' offset += size + (size % 4);\n}') elif field['format'] == 'string-array': translations['array_size_field_name_underscore'] = utils.build_underscore_name_from_camelcase(field['array-size-field']) inner_template += ( @@ -686,7 +667,7 @@ class Struct: for field in self.contents: translations['field_name_underscore'] = utils.build_underscore_name_from_camelcase(field['name']) inner_template = '' - if field['format'] in ['ref-byte-array', 'ref-byte-array-no-offset', 'unsized-byte-array', 'byte-array', 'string', 'string-tlv']: + if field['format'] in ['ref-byte-array', 'ref-byte-array-no-offset', 'unsized-byte-array', 'byte-array', 'string']: inner_template = (' g_free (out->${field_name_underscore});\n') elif field['format'] == 'string-array': inner_template = (' g_strfreev (out->${field_name_underscore});\n') @@ -925,8 +906,6 @@ class Struct: inner_template = (' _mbim_struct_builder_append_guint64 (builder, value->${field});\n') elif field['format'] == 'string': inner_template = (' _mbim_struct_builder_append_string (builder, value->${field});\n') - elif field['format'] == 'string-tlv': - inner_template = (' _mbim_struct_builder_append_string_tlv (builder, value->${field});\n') elif field['format'] == 'string-array': inner_template = (' _mbim_struct_builder_append_string_array (builder, value->${field}, value->${array_size_field});\n') elif field['format'] == 'ipv4': |