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

xwayland: Reindent

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-01-29 10:23:58 -05:00
parent 20545941fa
commit 96fc93d744
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ xserver_set_window_id (struct wl_client *client,
} }
static const struct xserver_interface xserver_implementation = { static const struct xserver_interface xserver_implementation = {
xserver_set_window_id xserver_set_window_id
}; };
static void static void
@ -123,7 +123,7 @@ create_lockfile (int display, int *display_out)
/* ignore error and try the next display number */ /* ignore error and try the next display number */
display++; display++;
continue; continue;
} }
close (fd); close (fd);
other = strtol (pid, &end, 0); other = strtol (pid, &end, 0);
@ -135,7 +135,7 @@ create_lockfile (int display, int *display_out)
/* ignore error and try the next display number */ /* ignore error and try the next display number */
display++; display++;
continue; continue;
} }
if (kill (other, 0) < 0 && errno == ESRCH) if (kill (other, 0) < 0 && errno == ESRCH)
{ {
@ -148,7 +148,7 @@ create_lockfile (int display, int *display_out)
} }
g_free (filename); g_free (filename);
continue; continue;
} }
g_free (filename); g_free (filename);
display++; display++;
@ -240,11 +240,12 @@ bind_to_unix_socket (int display)
return -1; return -1;
} }
if (listen (fd, 1) < 0) { if (listen (fd, 1) < 0)
{
unlink (addr.sun_path); unlink (addr.sun_path);
close (fd); close (fd);
return -1; return -1;
} }
return fd; return fd;
} }
@ -310,8 +311,8 @@ meta_xwayland_start (MetaWaylandCompositor *compositor)
lockfile = create_lockfile (display, &display); lockfile = create_lockfile (display, &display);
if (!lockfile) if (!lockfile)
{ {
g_warning ("Failed to create an X lock file"); g_warning ("Failed to create an X lock file");
return FALSE; return FALSE;
} }
compositor->xwayland_abstract_fd = bind_to_abstract_socket (display); compositor->xwayland_abstract_fd = bind_to_abstract_socket (display);