Fix a few -pedantic warnings
We're not enabling -pedantic by default, but a quick test brought up a few
issues that we should fix.
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 2b670b3..d588dbf 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -992,14 +992,6 @@
EGL_NONE
};
- sysnum = udev_device_get_sysnum(device);
- if (sysnum)
- ec->drm.id = atoi(sysnum);
- if (!sysnum || ec->drm.id < 0) {
- fprintf(stderr, "cannot get device sysnum\n");
- return -1;
- }
-
static const EGLint config_attribs[] = {
EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
EGL_RED_SIZE, 1,
@@ -1010,6 +1002,14 @@
EGL_NONE
};
+ sysnum = udev_device_get_sysnum(device);
+ if (sysnum)
+ ec->drm.id = atoi(sysnum);
+ if (!sysnum || ec->drm.id < 0) {
+ fprintf(stderr, "cannot get device sysnum\n");
+ return -1;
+ }
+
filename = udev_device_get_devnode(device);
fd = open(filename, O_RDWR | O_CLOEXEC);
if (fd < 0) {
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 69135a9..96fedbc 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -46,7 +46,7 @@
struct weston_compositor base;
struct wl_egl_pixmap *dummy_pixmap;
- EGLSurface dummy_egl_surface;;
+ EGLSurface dummy_egl_surface;
struct {
struct wl_display *display;
diff --git a/src/libbacklight.h b/src/libbacklight.h
index cea34c2..0c32671 100644
--- a/src/libbacklight.h
+++ b/src/libbacklight.h
@@ -10,7 +10,7 @@
enum backlight_type {
BACKLIGHT_RAW,
BACKLIGHT_PLATFORM,
- BACKLIGHT_FIRMWARE,
+ BACKLIGHT_FIRMWARE
};
struct backlight {
diff --git a/src/shell.c b/src/shell.c
index 51b37e2..a44074d 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -440,8 +440,7 @@
static void
ping_handler(struct weston_surface *surface, uint32_t serial)
{
- struct shell_surface *shsurf;
- shsurf = get_shell_surface(surface);
+ struct shell_surface *shsurf = get_shell_surface(surface);
struct wl_event_loop *loop;
int ping_timeout = 2500;
@@ -2437,7 +2436,7 @@
} else if (key == KEY_TAB && state) {
switcher_next(switcher);
}
-};
+}
static const struct wl_keyboard_grab_interface switcher_grab = {
switcher_key
diff --git a/src/xserver-launcher.c b/src/xserver-launcher.c
index 95c6546..1bd1afd 100644
--- a/src/xserver-launcher.c
+++ b/src/xserver-launcher.c
@@ -796,9 +796,10 @@
static void
weston_wm_send_incr_chunk(struct weston_wm *wm)
{
- fprintf(stderr, "property deleted\n");
int length;
+ fprintf(stderr, "property deleted\n");
+
wm->selection_property_set = 0;
if (wm->flush_property_on_delete) {
fprintf(stderr, "setting new property, %zu bytes\n",