diff options
author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-10-24 13:44:16 +0300 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-10-24 13:44:16 +0300 |
commit | bd4494363230705c3efaa13f3c94a73fadab88e4 (patch) | |
tree | 23bf1dbd912e5130cc4c608bf772f0bc7b8c8bbf /network | |
parent | e32c8dcd38b8e2282559a325c59fd6b7fa187d2f (diff) |
Use g_clear_error(&err) instead of g_error_free(err); err = NULL
Diffstat (limited to 'network')
-rw-r--r-- | network/manager.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/network/manager.c b/network/manager.c index 564af2ad..1b68ea2a 100644 --- a/network/manager.c +++ b/network/manager.c @@ -95,7 +95,7 @@ static void read_config(const char *file) if (!g_key_file_load_from_file(keyfile, file, 0, &err)) { error("Parsing %s failed: %s", file, err->message); - g_error_free(err); + g_clear_error(&err); goto done; } @@ -103,8 +103,7 @@ static void read_config(const char *file) "Disable", NULL, &err); if (err) { debug("%s: %s", file, err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else { int i; for (i = 0; disabled[i] != NULL; i++) { @@ -120,56 +119,49 @@ static void read_config(const char *file) "DisableSecurity", &err); if (err) { debug("%s: %s", file, err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } conf.panu_script = g_key_file_get_string(keyfile, "PANU Role", "Script", &err); if (err) { debug("%s: %s", file, err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } conf.gn_script = g_key_file_get_string(keyfile, "GN Role", "Script", &err); if (err) { debug("%s: %s", file, err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } conf.nap_script = g_key_file_get_string(keyfile, "NAP Role", "Script", &err); if (err) { debug("%s: %s", file, err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } conf.iface_prefix = g_key_file_get_string(keyfile, "PANU Role", "Interface", &err); if (err) { debug("%s: %s", file, err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } conf.gn_iface = g_key_file_get_string(keyfile, "GN Role", "Interface", &err); if (err) { debug("%s: %s", file, err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } conf.nap_iface = g_key_file_get_string(keyfile, "NAP Role", "Interface", &err); if (err) { debug("%s: %s", file, err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } done: |