1 files changed, 10 insertions, 16 deletions

diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c
index 236fd99e..6b67e8eb 100644
--- a/examples/multi-pointer.c
+++ b/examples/multi-pointer.c
@@ -205,8 +205,8 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) {
 	for (int i = 0; i < nsyms; i++) {
 		xkb_keysym_t sym = syms[i];
 		if (sym == XKB_KEY_Escape) {
-				wl_display_terminate(sample->display);
-			}
+			wl_display_terminate(sample->display);
+		}
 	}
 }
 
@@ -220,28 +220,22 @@ void keyboard_destroy_notify(struct wl_listener *listener, void *data) {
 void new_input_notify(struct wl_listener *listener, void *data) {
 	struct wlr_input_device *device = data;
 	struct sample_state *sample = wl_container_of(listener, sample, new_input);
-	struct sample_keyboard *keyboard;
-	struct xkb_rule_names rules;
-	struct xkb_context *context;
-   	struct sample_cursor *cursor = 0;
-	struct sample_pointer *pointer = 0;
-	struct wlr_xcursor_image *image;
 	switch (device->type) {
-	case WLR_INPUT_DEVICE_KEYBOARD:
-		keyboard = calloc(1, sizeof(struct sample_keyboard));
+	case WLR_INPUT_DEVICE_KEYBOARD:;
+		struct sample_keyboard *keyboard = calloc(1, sizeof(struct sample_keyboard));
 		keyboard->device = device;
 		keyboard->sample = sample;
 		wl_signal_add(&device->events.destroy, &keyboard->destroy);
 		keyboard->destroy.notify = keyboard_destroy_notify;
 		wl_signal_add(&device->keyboard->events.key, &keyboard->key);
 		keyboard->key.notify = keyboard_key_notify;
-		memset(&rules, 0, sizeof(rules));
+		struct xkb_rule_names rules = { 0 };
 		rules.rules = getenv("XKB_DEFAULT_RULES");
 		rules.model = getenv("XKB_DEFAULT_MODEL");
 		rules.layout = getenv("XKB_DEFAULT_LAYOUT");
 		rules.variant = getenv("XKB_DEFAULT_VARIANT");
 		rules.options = getenv("XKB_DEFAULT_OPTIONS");
-		context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+		struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 		if (!context) {
 			wlr_log(L_ERROR, "Failed to create XKB context");
 			exit(1);
@@ -250,9 +244,9 @@ void new_input_notify(struct wl_listener *listener, void *data) {
 					&rules, XKB_KEYMAP_COMPILE_NO_FLAGS));
 		xkb_context_unref(context);
 		break;
-	case WLR_INPUT_DEVICE_POINTER:
-	   	cursor = calloc(1, sizeof(struct sample_cursor));
-		pointer = calloc(1, sizeof(struct sample_pointer));
+	case WLR_INPUT_DEVICE_POINTER:;
+	   	struct sample_cursor *cursor = calloc(1, sizeof(struct sample_cursor));
+		struct sample_pointer *pointer = calloc(1, sizeof(struct sample_pointer));
 		pointer->device = device;
 	   	cursor->sample = sample;
 		cursor->device = device;
@@ -270,7 +264,7 @@ void new_input_notify(struct wl_listener *listener, void *data) {
 		wlr_cursor_attach_input_device(cursor->cursor, device);
 		configure_cursor(cursor->cursor, device, sample);
 
-		image = sample->xcursor->images[0];
+		struct wlr_xcursor_image *image = sample->xcursor->images[0];
 		wlr_cursor_set_image(cursor->cursor, image->buffer, image->width * 4,
 			image->width, image->height, image->hotspot_x, image->hotspot_y, 0);