diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:36 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 17:09:07 +0200 |
| commit | ccf6dc06bbee82c3d49f451545c5317337e0777e (patch) | |
| tree | a8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /src/tests/config/test-config.c | |
| parent | f109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff) | |
| parent | 7ffed1e6136de75188f10ba8763bcb942f932f8e (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'src/tests/config/test-config.c')
| -rw-r--r-- | src/tests/config/test-config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index 1c28e976..e6c04efd 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -978,7 +978,7 @@ test_config_enable (void) guint match_nm_version = _nm_config_match_nm_version; char *match_env = g_strdup (_nm_config_match_env); - g_clear_pointer (&_nm_config_match_env, g_free); + nm_clear_g_free (&_nm_config_match_env); _nm_config_match_env = g_strdup ("something-else"); _nm_config_match_nm_version = nm_encode_version (1, 3, 4); @@ -992,14 +992,14 @@ test_config_enable (void) g_clear_object (&config); _nm_config_match_nm_version = nm_encode_version (1, 5, 3); - g_clear_pointer (&_nm_config_match_env, g_free); + nm_clear_g_free (&_nm_config_match_env); _nm_config_match_env = g_strdup ("test-match-env-1"); config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "", NULL); assert_config_value (nm_config_get_data_orig (config), "test-group-config-enable-1", "key1", "enabled"); g_clear_object (&config); _nm_config_match_nm_version = match_nm_version; - g_clear_pointer (&_nm_config_match_env, g_free); + nm_clear_g_free (&_nm_config_match_env); _nm_config_match_env = match_env; } |