[PATCH] Weston: fbdev: Remove uneeded semicolon
nerdopolis
bluescreen_avenger at verizon.net
Tue Dec 2 19:07:57 PST 2014
---
0001-weston-fbdev-remove-uneeded-semicolon.patch | 33 +++++++
fd | 116 +++++++++++++++++++++++
src/compositor-fbdev.c | 2 +-
3 files changed, 150 insertions(+), 1 deletion(-)
create mode 100644 0001-weston-fbdev-remove-uneeded-semicolon.patch
create mode 100644 fd
diff --git a/0001-weston-fbdev-remove-uneeded-semicolon.patch b/0001-weston-fbdev-remove-uneeded-semicolon.patch
new file mode 100644
index 0000000..dd3b987
--- /dev/null
+++ b/0001-weston-fbdev-remove-uneeded-semicolon.patch
@@ -0,0 +1,33 @@
+From 708cf1fe9068fb535fa5f1f059ddc7b4ae2ce2d5 Mon Sep 17 00:00:00 2001
+From: nerdopolis <bluescreen_avenger at verizon.net>
+Date: Tue, 2 Dec 2014 21:55:03 -0500
+Subject: [PATCH] weston: fbdev: remove uneeded semicolon
+
+---
+ src/compositor-fbdev.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
+index 138aaab..eb238a2 100644
+--- a/src/compositor-fbdev.c
++++ b/src/compositor-fbdev.c
+@@ -811,7 +811,6 @@ session_notify(struct wl_listener *listener, void *data)
+ {
+ struct fbdev_compositor *compositor = data;
+ struct weston_output *output;
+-
+ if (compositor->base.session_active) {
+ weston_log("entering VT\n");
+ compositor->base.state = compositor->prev_state;
+@@ -845,7 +844,7 @@ session_notify(struct wl_listener *listener, void *data)
+ &compositor->base.output_list, link) {
+ output->repaint_needed = 0;
+ }
+- };
++ }
+ }
+
+ static void
+--
+2.1.0
+
diff --git a/fd b/fd
new file mode 100644
index 0000000..b7fb3ad
--- /dev/null
+++ b/fd
@@ -0,0 +1,116 @@
+src/launcher-util.c:#include "launcher-util.h"
+src/launcher-util.c: if (launcher->logind)
+src/launcher-util.c: return weston_logind_open(launcher->logind, path, flags);
+src/launcher-util.c: if (launcher->fd == -1) {
+src/launcher-util.c: launcher->drm_fd = fd;
+src/launcher-util.c: len = send(launcher->fd, message, n, 0);
+src/launcher-util.c: len = recvmsg(launcher->fd, &msg, MSG_CMSG_CLOEXEC);
+src/launcher-util.c: if (launcher->logind)
+src/launcher-util.c: return weston_logind_close(launcher->logind, fd);
+src/launcher-util.c: if (launcher->logind)
+src/launcher-util.c: return weston_logind_restore(launcher->logind);
+src/launcher-util.c: if (ioctl(launcher->tty, KDSKBMUTE, 0) &&
+src/launcher-util.c: ioctl(launcher->tty, KDSKBMODE, launcher->kb_mode))
+src/launcher-util.c: if (ioctl(launcher->tty, KDSETMODE, KD_TEXT))
+src/launcher-util.c: drmDropMaster(launcher->drm_fd);
+src/launcher-util.c: if (ioctl(launcher->tty, VT_SETMODE, &mode) < 0)
+src/launcher-util.c: len = recv(launcher->fd, &ret, sizeof ret, 0);
+src/launcher-util.c: launcher->compositor->session_active = 1;
+src/launcher-util.c: wl_signal_emit(&launcher->compositor->session_signal,
+src/launcher-util.c: launcher->compositor);
+src/launcher-util.c: launcher->compositor->session_active = 0;
+src/launcher-util.c: wl_signal_emit(&launcher->compositor->session_signal,
+src/launcher-util.c: launcher->compositor);
+src/launcher-util.c: struct weston_compositor *compositor = launcher->compositor;
+src/launcher-util.c: drmDropMaster(launcher->drm_fd);
+src/launcher-util.c: ioctl(launcher->tty, VT_RELDISP, 1);
+src/launcher-util.c: ioctl(launcher->tty, VT_RELDISP, VT_ACKACQ);
+src/launcher-util.c: drmSetMaster(launcher->drm_fd);
+src/launcher-util.c: launcher->tty = dup(tty);
+src/launcher-util.c: if (launcher->tty == -1) {
+src/launcher-util.c: launcher->tty = open(tty_device, O_RDWR | O_CLOEXEC);
+src/launcher-util.c: if (launcher->tty == -1) {
+src/launcher-util.c: if (fstat(launcher->tty, &buf) == -1 ||
+src/launcher-util.c: ret = ioctl(launcher->tty, KDGETMODE, &kd_mode);
+src/launcher-util.c: ioctl(launcher->tty, VT_ACTIVATE, minor(buf.st_rdev));
+src/launcher-util.c: ioctl(launcher->tty, VT_WAITACTIVE, minor(buf.st_rdev));
+src/launcher-util.c: if (ioctl(launcher->tty, KDGKBMODE, &launcher->kb_mode)) {
+src/launcher-util.c: if (ioctl(launcher->tty, KDSKBMUTE, 1) &&
+src/launcher-util.c: ioctl(launcher->tty, KDSKBMODE, K_OFF)) {
+src/launcher-util.c: ret = ioctl(launcher->tty, KDSETMODE, KD_GRAPHICS);
+src/launcher-util.c: if (ioctl(launcher->tty, VT_SETMODE, &mode) < 0) {
+src/launcher-util.c: loop = wl_display_get_event_loop(launcher->compositor->wl_display);
+src/launcher-util.c: launcher->vt_source =
+src/launcher-util.c: if (!launcher->vt_source)
+src/launcher-util.c: close(launcher->tty);
+src/launcher-util.c: if (launcher->logind)
+src/launcher-util.c: return weston_logind_activate_vt(launcher->logind, vt);
+src/launcher-util.c: return ioctl(launcher->tty, VT_ACTIVATE, vt);
+src/launcher-util.c: launcher->logind = NULL;
+src/launcher-util.c: launcher->compositor = compositor;
+src/launcher-util.c: launcher->drm_fd = -1;
+src/launcher-util.c: launcher->fd = weston_environment_get_fd("WESTON_LAUNCHER_SOCK");
+src/launcher-util.c: if (launcher->fd != -1) {
+src/launcher-util.c: launcher->tty = weston_environment_get_fd("WESTON_TTY_FD");
+src/launcher-util.c: launcher->kb_mode = K_UNICODE;
+src/launcher-util.c: launcher->source = wl_event_loop_add_fd(loop, launcher->fd,
+src/launcher-util.c: if (launcher->source == NULL) {
+src/launcher-util.c: r = weston_logind_connect(&launcher->logind, compositor,
+src/launcher-util.c: launcher->logind = NULL;
+src/launcher-util.c: if (launcher->logind) {
+src/launcher-util.c: weston_logind_destroy(launcher->logind);
+src/launcher-util.c: } else if (launcher->fd != -1) {
+src/launcher-util.c: close(launcher->fd);
+src/launcher-util.c: wl_event_source_remove(launcher->source);
+src/launcher-util.c: wl_event_source_remove(launcher->vt_source);
+src/launcher-util.c: if (launcher->tty >= 0)
+src/launcher-util.c: close(launcher->tty);
+src/compositor-rpi.c:#include "launcher-util.h"
+src/libinput-seat.c:#include "launcher-util.h"
+src/udev-seat.c:#include "launcher-util.h"
+src/compositor-fbdev.c:#include "launcher-util.h"
+src/compositor-drm.c:#include "launcher-util.h"
+Makefile.am: src/launcher-util.c \
+Makefile.am: src/launcher-util.h
+Binary file .git/index matches
+Binary file .git/objects/pack/pack-1aac36d8b06a5c9f4a530f19f18475df696483e9.pack matches
+clients/desktop-shell.c: cr = widget_cairo_create(launcher->panel->widget);
+clients/desktop-shell.c: if (launcher->pressed) {
+clients/desktop-shell.c: cairo_set_source_surface(cr, launcher->icon,
+clients/desktop-shell.c: if (launcher->focused) {
+clients/desktop-shell.c: cairo_mask_surface(cr, launcher->icon,
+clients/desktop-shell.c: widget_set_tooltip(widget, basename((char *)launcher->path), x, y);
+clients/desktop-shell.c: launcher->focused = 1;
+clients/desktop-shell.c: launcher->focused = 0;
+clients/desktop-shell.c: launcher->focused = 1;
+clients/desktop-shell.c: launcher->focused = 0;
+clients/desktop-shell.c: w = cairo_image_surface_get_width(launcher->icon);
+clients/desktop-shell.c: h = cairo_image_surface_get_height(launcher->icon);
+clients/desktop-shell.c: widget_set_allocation(launcher->widget,
+clients/desktop-shell.c: wl_array_release(&launcher->argv);
+clients/desktop-shell.c: wl_array_release(&launcher->envp);
+clients/desktop-shell.c: free(launcher->path);
+clients/desktop-shell.c: cairo_surface_destroy(launcher->icon);
+clients/desktop-shell.c: widget_destroy(launcher->widget);
+clients/desktop-shell.c: wl_list_remove(&launcher->link);
+clients/desktop-shell.c: launcher->icon = load_icon_or_fallback(icon);
+clients/desktop-shell.c: launcher->path = xstrdup(path);
+clients/desktop-shell.c: wl_array_init(&launcher->envp);
+clients/desktop-shell.c: wl_array_init(&launcher->argv);
+clients/desktop-shell.c: ps = wl_array_add(&launcher->envp, sizeof *ps);
+clients/desktop-shell.c: start = launcher->path;
+clients/desktop-shell.c: ps = launcher->envp.data;
+clients/desktop-shell.c: ps = wl_array_add(&launcher->envp, sizeof *ps);
+clients/desktop-shell.c: ps = wl_array_add(&launcher->argv, sizeof *ps);
+clients/desktop-shell.c: ps = wl_array_add(&launcher->envp, sizeof *ps);
+clients/desktop-shell.c: ps = wl_array_add(&launcher->argv, sizeof *ps);
+clients/desktop-shell.c: launcher->panel = panel;
+clients/desktop-shell.c: wl_list_insert(panel->launcher_list.prev, &launcher->link);
+clients/desktop-shell.c: launcher->widget = widget_add_widget(panel->widget, launcher);
+clients/desktop-shell.c: widget_set_enter_handler(launcher->widget,
+clients/desktop-shell.c: widget_set_leave_handler(launcher->widget,
+clients/desktop-shell.c: widget_set_button_handler(launcher->widget,
+clients/desktop-shell.c: widget_set_touch_down_handler(launcher->widget,
+clients/desktop-shell.c: widget_set_touch_up_handler(launcher->widget,
+clients/desktop-shell.c: widget_set_redraw_handler(launcher->widget,
+clients/desktop-shell.c: widget_set_motion_handler(launcher->widget,
diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
index 138aaab..76d3df0 100644
--- a/src/compositor-fbdev.c
+++ b/src/compositor-fbdev.c
@@ -845,7 +845,7 @@ session_notify(struct wl_listener *listener, void *data)
&compositor->base.output_list, link) {
output->repaint_needed = 0;
}
- };
+ }
}
static void
--
2.1.0
More information about the wayland-devel
mailing list