diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2018-10-07 22:26:55 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2018-10-07 22:34:04 +0200 |
| commit | 670641b4f2aee333cd809e1c06a380eeb7144a2a (patch) | |
| tree | 0a0bb79b5e045338cabca8aca59825099abb3783 | |
| parent | 6ac1b7f994d8e07b7c27caed47f97f927505a488 (diff) | |
| download | libmbim-670641b4f2aee333cd809e1c06a380eeb7144a2a.tar.gz | |
mbim-codegen: remove support for ipv4-array and ipv6-array inside structs
It was never used and the implementation was actually buggy. Not worth
maintaining this.
| -rw-r--r-- | build-aux/mbim-codegen/Struct.py | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/build-aux/mbim-codegen/Struct.py b/build-aux/mbim-codegen/Struct.py index 6e540a4..89880a2 100644 --- a/build-aux/mbim-codegen/Struct.py +++ b/build-aux/mbim-codegen/Struct.py @@ -98,18 +98,12 @@ class Struct: elif field['format'] == 'ref-ipv4': inner_template = ( ' * @${field_name_underscore}: a #MbimIPv4.\n') - elif field['format'] == 'ipv4-array': - inner_template = ( - ' * @${field_name_underscore}: an array of #MbimIPv4 values.\n') elif field['format'] == 'ipv6': inner_template = ( ' * @${field_name_underscore}: a #MbimIPv6\n') elif field['format'] == 'ref-ipv6': inner_template = ( ' * @${field_name_underscore}: a #MbimIPv6\n') - elif field['format'] == 'ipv6-array': - inner_template = ( - ' * @${field_name_underscore}: an array of #MbimIPv6 values.\n') else: raise ValueError('Cannot handle format \'%s\' in struct' % field['format']) template += string.Template(inner_template).substitute(translations) @@ -154,18 +148,12 @@ class Struct: elif field['format'] == 'ref-ipv4': inner_template = ( ' MbimIPv4 ${field_name_underscore};\n') - elif field['format'] == 'ipv4-array': - inner_template = ( - ' MbimIPv4 *${field_name_underscore};\n') elif field['format'] == 'ipv6': inner_template = ( ' MbimIPv6 ${field_name_underscore};\n') elif field['format'] == 'ref-ipv6': inner_template = ( ' MbimIPv6 ${field_name_underscore};\n') - elif field['format'] == 'ipv6-array': - inner_template = ( - ' MbimIPv6 *${field_name_underscore};\n') else: raise ValueError('Cannot handle format \'%s\' in struct' % field['format']) template += string.Template(inner_template).substitute(translations) @@ -223,16 +211,10 @@ class Struct: pass elif field['format'] == 'ref-ipv4': pass - elif field['format'] == 'ipv4-array': - inner_template += ( - ' g_free (var->${field_name_underscore});\n') elif field['format'] == 'ipv6': pass elif field['format'] == 'ref-ipv6': pass - elif field['format'] == 'ipv6-array': - inner_template += ( - ' g_free (var->${field_name_underscore});\n') else: raise ValueError('Cannot handle format \'%s\' in struct clear' % field['format']) template += string.Template(inner_template).substitute(translations) @@ -403,11 +385,6 @@ class Struct: '\n' ' memcpy (&(out->${field_name_underscore}), _mbim_message_read_ipv4 (self, offset, TRUE), 4);\n' ' offset += 4;\n') - elif field['format'] == 'ipv4-array': - inner_template += ( - '\n' - ' out->${field_name_underscore} =_mbim_message_read_ipv4_array (self, out->${array_size_field_name_underscore}, offset);\n' - ' offset += 4;\n') elif field['format'] == 'ipv6': inner_template += ( '\n' @@ -418,11 +395,6 @@ class Struct: '\n' ' memcpy (&(out->${field_name_underscore}), _mbim_message_read_ipv6 (self, offset, TRUE), 16);\n' ' offset += 4;\n') - elif field['format'] == 'ipv6-array': - inner_template += ( - '\n' - ' out->${field_name_underscore} =_mbim_message_read_ipv6_array (self, out->${array_size_field_name_underscore}, offset);\n' - ' offset += 4;\n') else: raise ValueError('Cannot handle format \'%s\' in struct' % field['format']) @@ -524,14 +496,10 @@ class Struct: inner_template = (' _mbim_struct_builder_append_ipv4 (builder, &value->${field}, FALSE);\n') elif field['format'] == 'ref-ipv4': inner_template = (' _mbim_struct_builder_append_ipv4 (builder, &value->${field}, TRUE);\n') - elif field['format'] == 'ipv4-array': - inner_template = (' _mbim_struct_builder_append_ipv4_array (builder, value->${field}, value->${array_size_field});\n') elif field['format'] == 'ipv6': inner_template = (' _mbim_struct_builder_append_ipv6 (builder, &value->${field}, FALSE);\n') elif field['format'] == 'ref-ipv6': inner_template = (' _mbim_struct_builder_append_ipv6 (builder, &value->${field}, TRUE);\n') - elif field['format'] == 'ipv6-array': - inner_template = (' _mbim_struct_builder_append_ipv6_array (builder, value->${field}, value->${array_size_field});\n') else: raise ValueError('Cannot handle format \'%s\' in struct' % field['format']) |