From b541341681d683f5a613d7da0d64cd144853abf1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 29 Apr 2020 14:37:26 +0530 Subject: [PATCH] Avoid use of goto --- kitty/glfw.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kitty/glfw.c b/kitty/glfw.c index d81be34ff..4672f1b1a 100644 --- a/kitty/glfw.c +++ b/kitty/glfw.c @@ -323,17 +323,17 @@ window_focus_callback(GLFWwindow *w, int focused) { static int drop_callback(GLFWwindow *w, const char *mime, const char *data, size_t sz) { if (!set_callback_window(w)) return 0; +#define RETURN(x) { global_state.callback_os_window = NULL; return x; } if (!data) { - if (strcmp(mime, "text/uri-list") == 0) return 3; - if (strcmp(mime, "text/plain;charset=utf-8") == 0) return 2; - if (strcmp(mime, "text/plain") == 0) return 1; - goto end; + if (strcmp(mime, "text/uri-list") == 0) RETURN(3); + if (strcmp(mime, "text/plain;charset=utf-8") == 0) RETURN(2); + if (strcmp(mime, "text/plain") == 0) RETURN(1); + RETURN(0); } WINDOW_CALLBACK(on_drop, "sy#", mime, data, (Py_ssize_t)sz); request_tick_callback(); -end: - global_state.callback_os_window = NULL; - return 0; + RETURN(0); +#undef RETURN } // }}}