diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-12 14:05:43 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-08-12 14:21:05 +0200 |
| commit | 6a8e46700f393ff8c9522dbd90bb30058b9d6d4b (patch) | |
| tree | ef30ca659f4489b69c2a381bef7e0a12578fa607 /callouts/tests | |
| parent | 1acbe1d66fc4be5a648abe3a9725c2be9f95794f (diff) | |
| download | NetworkManager-6a8e46700f393ff8c9522dbd90bb30058b9d6d4b.tar.gz | |
dispatcher/tests: cleanup test by using cleanup attribute to free data
Diffstat (limited to 'callouts/tests')
| -rw-r--r-- | callouts/tests/test-dispatcher-envp.c | 53 |
1 files changed, 16 insertions, 37 deletions
diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index a6ced8d4b1..8636f09797 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -449,26 +449,27 @@ out: static void test_generic (const char *file, const char *override_vpn_ip_iface) { - GVariant *con_dict = NULL; - GVariant *con_props = NULL; - GVariant *device_props = NULL; - GVariant *device_ip4_props = NULL; - GVariant *device_ip6_props = NULL; - GVariant *device_dhcp4_props = NULL; - GVariant *device_dhcp6_props = NULL; + gs_unref_variant GVariant *con_dict = NULL; + gs_unref_variant GVariant *con_props = NULL; + gs_unref_variant GVariant *device_props = NULL; + gs_unref_variant GVariant *device_ip4_props = NULL; + gs_unref_variant GVariant *device_ip6_props = NULL; + gs_unref_variant GVariant *device_dhcp4_props = NULL; + gs_unref_variant GVariant *device_dhcp6_props = NULL; gs_free char *connectivity_change = NULL; - char *vpn_ip_iface = NULL; - GVariant *vpn_ip4_props = NULL; - GVariant *vpn_ip6_props = NULL; - char *expected_iface = NULL; - char *action = NULL; - char *out_iface = NULL; + gs_free char *vpn_ip_iface = NULL; + gs_unref_variant GVariant *vpn_ip4_props = NULL; + gs_unref_variant GVariant *vpn_ip6_props = NULL; + gs_free char *expected_iface = NULL; + gs_free char *action = NULL; + gs_free char *out_iface = NULL; const char *error_message = NULL; - GHashTable *expected_env = NULL; + gs_unref_hashtable GHashTable *expected_env = NULL; GError *error = NULL; gboolean success; char *p; - char **denv, **iter; + gs_strfreev char **denv = NULL; + char **iter; /* Read in the test file */ p = g_build_filename (SRCDIR, file, NULL); @@ -553,28 +554,6 @@ test_generic (const char *file, const char *override_vpn_ip_iface) } g_assert_cmpstr (expected_iface, ==, out_iface); - - g_strfreev (denv); - g_free (out_iface); - g_free (vpn_ip_iface); - g_free (expected_iface); - g_free (action); - g_variant_unref (con_dict); - g_variant_unref (con_props); - g_variant_unref (device_props); - if (device_ip4_props) - g_variant_unref (device_ip4_props); - if (device_ip6_props) - g_variant_unref (device_ip6_props); - if (device_dhcp4_props) - g_variant_unref (device_dhcp4_props); - if (device_dhcp6_props) - g_variant_unref (device_dhcp6_props); - if (vpn_ip4_props) - g_variant_unref (vpn_ip4_props); - if (vpn_ip6_props) - g_variant_unref (vpn_ip6_props); - g_hash_table_destroy (expected_env); } /*******************************************/ |