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