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 | |
| parent | e32c8dcd38b8e2282559a325c59fd6b7fa187d2f (diff) | |
Use g_clear_error(&err) instead of g_error_free(err); err = NULL
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/a2dp.c | 15 | ||||
| -rw-r--r-- | audio/headset.c | 3 | ||||
| -rw-r--r-- | audio/manager.c | 12 |
3 files changed, 10 insertions, 20 deletions
diff --git a/audio/a2dp.c b/audio/a2dp.c index 49312a71..8c38a90b 100644 --- a/audio/a2dp.c +++ b/audio/a2dp.c @@ -1071,8 +1071,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else { if (strstr(str, "Sink")) source = FALSE; @@ -1084,8 +1083,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) str = g_key_file_get_string(config, "A2DP", "SBCSources", &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else { sbc_srcs = atoi(str); g_free(str); @@ -1094,8 +1092,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) str = g_key_file_get_string(config, "A2DP", "MPEG12Sources", &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else { mpeg12_srcs = atoi(str); g_free(str); @@ -1104,8 +1101,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) str = g_key_file_get_string(config, "A2DP", "SBCSinks", &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else { sbc_sinks = atoi(str); g_free(str); @@ -1114,8 +1110,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) str = g_key_file_get_string(config, "A2DP", "MPEG12Sinks", &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else { mpeg12_sinks = atoi(str); g_free(str); diff --git a/audio/headset.c b/audio/headset.c index 0a7f18ed..9ba2138a 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -2040,8 +2040,7 @@ uint32_t headset_config_init(GKeyFile *config) &err); if (err) { debug("audio.conf: %s", err->message); - g_error_free(err); - err = NULL; + g_clear_error(&err); } else { if (strcmp(str, "PCM") == 0) sco_hci = FALSE; 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; |