From bd4494363230705c3efaa13f3c94a73fadab88e4 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 24 Oct 2008 13:44:16 +0300 Subject: Use g_clear_error(&err) instead of g_error_free(err); err = NULL --- audio/manager.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'audio/manager.c') 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; -- cgit