brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: use g_autoptr for GError in xserver_died

Browse Source 
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.
This commit is contained in:
Ray Strode 2018-04-12 14:03:03 -04:00
parent bc05e49eba
commit bb65854065
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wayland/meta-xwayland.c
View File

@ -393,13 +393,12 @@ xserver_died (GObject *source,
gpointer user_data) gpointer user_data)
{ {
GSubprocess *proc = G_SUBPROCESS (source); GSubprocess *proc = G_SUBPROCESS (source);
GError *error = NULL; g_autoptr (GError) error = NULL;
if (!g_subprocess_wait_finish (proc, result, &error)) if (!g_subprocess_wait_finish (proc, result, &error))
{ {
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_error ("Failed to finish waiting for Xwayland: %s", error->message); g_error ("Failed to finish waiting for Xwayland: %s", error->message);
g_clear_error (&error);
} }
else if (!g_subprocess_get_successful (proc)) else if (!g_subprocess_get_successful (proc))
g_error ("X Wayland crashed; aborting"); g_error ("X Wayland crashed; aborting");