diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-01-15 12:15:51 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-01-15 12:15:51 +0100 |
| commit | da013cb526eb25bf9d9fe74f00a1f5f710041fbc (patch) | |
| tree | 2fa69f16db62b8ebb765890cedd2aa2804ef9b12 /build-aux | |
| parent | 5b7c6cd35e970bb9b2a0e9f3681fa8b0d94c2412 (diff) | |
qmi-codegen,message: use g_autofree for helper strings
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/qmi-codegen/Message.py | 9 | ||||
| -rw-r--r-- | build-aux/qmi-codegen/VariableInteger.py | 3 | ||||
| -rw-r--r-- | build-aux/qmi-codegen/VariableString.py | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/build-aux/qmi-codegen/Message.py b/build-aux/qmi-codegen/Message.py index 475e310..792bf9b 100644 --- a/build-aux/qmi-codegen/Message.py +++ b/build-aux/qmi-codegen/Message.py @@ -273,7 +273,7 @@ class Message: ' struct ${type}_${underscore}_context *ctx)\n' '{\n' ' const gchar *tlv_type_str = NULL;\n' - ' gchar *translated_value;\n' + ' g_autofree gchar *translated_value = NULL;\n' '\n') if self.type == 'Message': @@ -325,7 +325,7 @@ class Message: ' }\n' '\n' ' if (!tlv_type_str) {\n' - ' gchar *value_str = NULL;\n' + ' g_autofree gchar *value_str = NULL;\n' '\n' ' value_str = qmi_message_get_tlv_printable (ctx->self,\n' ' ctx->line_prefix,\n' @@ -333,9 +333,8 @@ class Message: ' value,\n' ' length);\n' ' g_string_append (ctx->printable, value_str);\n' - ' g_free (value_str);\n' ' } else {\n' - ' gchar *value_hex;\n' + ' g_autofree gchar *value_hex = NULL;\n' '\n' ' value_hex = __qmi_utils_str_hex (value, length, \':\');\n' ' g_string_append_printf (ctx->printable,\n' @@ -349,8 +348,6 @@ class Message: ' ctx->line_prefix, length,\n' ' ctx->line_prefix, value_hex,\n' ' ctx->line_prefix, translated_value ? translated_value : "");\n' - ' g_free (value_hex);\n' - ' g_free (translated_value);\n' ' }\n' '}\n') diff --git a/build-aux/qmi-codegen/VariableInteger.py b/build-aux/qmi-codegen/VariableInteger.py index cb8178b..97eb396 100644 --- a/build-aux/qmi-codegen/VariableInteger.py +++ b/build-aux/qmi-codegen/VariableInteger.py @@ -232,11 +232,10 @@ class VariableInteger(Variable): '${lp} g_string_append_printf (printable, "%s", ${public_type_underscore}_get_string ((${public_format})tmp));\n' '#elif defined __${public_type_underscore_upper}_IS_FLAGS__\n' '${lp} {\n' - '${lp} gchar *flags_str;\n' + '${lp} g_autofree gchar *flags_str = NULL;\n' '\n' '${lp} flags_str = ${public_type_underscore}_build_string_from_mask ((${public_format})tmp);\n' '${lp} g_string_append_printf (printable, "%s", flags_str);\n' - '${lp} g_free (flags_str);\n' '${lp} }\n' '#else\n' '# error unexpected public format: ${public_format}\n' diff --git a/build-aux/qmi-codegen/VariableString.py b/build-aux/qmi-codegen/VariableString.py index 4e9faa9..1f6b958 100644 --- a/build-aux/qmi-codegen/VariableString.py +++ b/build-aux/qmi-codegen/VariableString.py @@ -154,12 +154,11 @@ class VariableString(Variable): template = ( '\n' '${lp}{\n' - '${lp} gchar *tmp;\n' + '${lp} g_autofree gchar *tmp = NULL;\n' '\n' '${lp} if (!qmi_message_tlv_read_string (message, init_offset, &offset, ${n_size_prefix_bytes}, ${max_size}, &tmp, &error))\n' '${lp} goto out;\n' '${lp} g_string_append (printable, tmp);\n' - '${lp} g_free (tmp);\n' '${lp}}\n') f.write(string.Template(template).substitute(translations)) |