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 /audio/manager.c | |
| parent | e32c8dcd38b8e2282559a325c59fd6b7fa187d2f (diff) | |
Use g_clear_error(&err) instead of g_error_free(err); err = NULL
Diffstat (limited to 'audio/manager.c')
| -rw-r--r-- | audio/manager.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/audio/manager.c b/audio/manager.c index 4441b90f..816e6821 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -510,8 +510,7 @@ static int headset_server_init(struct audio_adapter *adapter) &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else master = tmp; } @@ -595,8 +594,7 @@ static int gateway_server_init(struct audio_adapter *adapter) &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else master = tmp; } @@ -918,8 +916,7 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf) &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else enabled.hfp = b; @@ -928,8 +925,7 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf) &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else max_connected_headsets = i; |