diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2012-07-23 18:40:24 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-07-31 11:59:38 +0200 |
| commit | 6b5b2b4c1f28bdd61e8a2dc24b66191436378910 (patch) | |
| tree | 9db1de0edacc825e8144b2b7c0617cd192779b09 | |
| parent | 23535a0e56da1640f0d1d4ecd8f65f66880134cf (diff) | |
| download | gvfs-6b5b2b4c1f28bdd61e8a2dc24b66191436378910.tar.gz | |
gdbus: Use g_clear_error() where appropriate
| -rw-r--r-- | client/gdaemonfile.c | 7 | ||||
| -rw-r--r-- | client/gdaemonvfs.c | 4 | ||||
| -rw-r--r-- | client/gvfsdaemondbus.c | 3 | ||||
| -rw-r--r-- | daemon/gvfsdaemon.c | 3 | ||||
| -rw-r--r-- | daemon/gvfsjobmount.c | 3 |
5 files changed, 7 insertions, 13 deletions
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c index cef7cb57..bb46b875 100644 --- a/client/gdaemonfile.c +++ b/client/gdaemonfile.c @@ -2767,7 +2767,7 @@ g_daemon_file_set_attribute (GFile *file, else if (g_error_matches (my_error, G_VFS_ERROR, G_VFS_ERROR_RETRY)) { - g_error_free (my_error); + g_clear_error (&my_error); g_object_unref (proxy); goto retry; } @@ -3008,7 +3008,7 @@ retry: else if (g_error_matches (my_error, G_VFS_ERROR, G_VFS_ERROR_RETRY)) { - g_error_free (my_error); + g_clear_error (&my_error); g_object_unref (proxy); goto retry; } @@ -3545,8 +3545,7 @@ find_enclosing_mount_cb (GMountInfo *mount_info, out: _g_simple_async_result_complete_with_cancellable (data->result, data->cancellable); - if (my_error) - g_error_free (my_error); + g_clear_error (&my_error); g_clear_object (&data->cancellable); g_object_unref (data->file); g_object_unref (data->result); diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c index 8be89591..a2bcebcd 100644 --- a/client/gdaemonvfs.c +++ b/client/gdaemonvfs.c @@ -887,9 +887,7 @@ async_get_mount_info_response (GVfsDBusMountTracker *proxy, g_mount_info_unref (info); g_variant_unref (iter_mount); - - if (error) - g_error_free (error); + g_clear_error (&error); } free_get_mount_info_data (data); diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c index 3ed9fd4e..c2cdb24f 100644 --- a/client/gvfsdaemondbus.c +++ b/client/gvfsdaemondbus.c @@ -300,8 +300,7 @@ async_call_finish (AsyncDBusCall *async_call) g_clear_object (&async_call->connection); g_clear_object (&async_call->cancellable); - if (async_call->io_error) - g_error_free (async_call->io_error); + g_clear_error (&async_call->io_error); g_free (async_call); } diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c index d2ac22be..bbf3e662 100644 --- a/daemon/gvfsdaemon.c +++ b/daemon/gvfsdaemon.c @@ -416,8 +416,7 @@ re_register_jobs_cb (GVfsDBusMountTracker *proxy, res, &error); g_debug ("re_register_jobs_cb, error: %p\n", error); - if (error) - g_error_free (error); + g_clear_error (&error); } static void diff --git a/daemon/gvfsjobmount.c b/daemon/gvfsjobmount.c index 1cd9e289..da72444d 100644 --- a/daemon/gvfsjobmount.c +++ b/daemon/gvfsjobmount.c @@ -177,8 +177,7 @@ register_mount_callback (GVfsDBusMountTracker *proxy, g_vfs_job_emit_finished (G_VFS_JOB (op_job)); } - if (error != NULL) - g_error_free (error); + g_clear_error (&error); } /* Might be called on an i/o thread */ |