diff options
| author | Ray Strode <rstrode@redhat.com> | 2018-04-12 14:03:03 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2018-04-17 11:14:00 -0400 |
| commit | bb6585406543688f3df48aea3211726ce52a8f29 (patch) | |
| tree | c6a9d4b502dcfd58b69220804edbca89b489daf8 | |
| parent | bc05e49eba6b99f07e2036573952da0e752d1f86 (diff) | |
| download | mutter-bb6585406543688f3df48aea3211726ce52a8f29.tar.gz | |
xwayland: use g_autoptr for GError in xserver_died
Right now we explicitly g_clear_error any error we find, but that
makes it tricky to return early from the function, which a
subsequent commit will want to to do.
This commit switches GError to use g_autoptr so the error clearing
happens automatically.
| -rw-r--r-- | src/wayland/meta-xwayland.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index 4a7c8fffd..774997611 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -393,13 +393,12 @@ xserver_died (GObject *source, gpointer user_data) { GSubprocess *proc = G_SUBPROCESS (source); - GError *error = NULL; + g_autoptr (GError) error = NULL; if (!g_subprocess_wait_finish (proc, result, &error)) { if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) g_error ("Failed to finish waiting for Xwayland: %s", error->message); - g_clear_error (&error); } else if (!g_subprocess_get_successful (proc)) g_error ("X Wayland crashed; aborting"); |