Re: [PATCH] Weston: fbdev: Remove uneeded semicolon

[Daniel Stone]

Hi,

On 3 December 2014 at 03:07, nerdopolis bluescreen_aven...@verizon.net
wrote:

 ---
  0001-weston-fbdev-remove-uneeded-semicolon.patch |  33 +++
  fd   | 116
 +++


We probably don't need these, either. ;)

Instead of using git send-email directly, you can use git format-patch to
generate a series of patches, check them over, and then call git send-email
on the filenames generated by git format-patch. That can help things like
this slipping in.

The patch is trivially correct though, so I've merged it in. Thanks!

Cheers,
Daniel
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH] weston: fbdev: remove uneeded semicolon

[nerdopolis]

---
 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

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH] Weston: fbdev: Remove uneeded semicolon

[nerdopolis]

---
 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 000..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_aven...@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 000..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