From 90bec70e7f186f0e9dbf9e03e555ba50352caff2 Mon Sep 17 00:00:00 2001 From: NRK Date: Fri, 24 Dec 2021 06:14:12 +0600 Subject: fix -Wshadow related warnings fixes all -Wshadow related warnings (on gcc). this would allow us to use `-Wshadow` in github workflow (https://github.com/nsxiv/nsxiv/pull/195). i've thought about adding `-Wshadow` to our Makefile as well, but decided against it to keep the Makefile CFLAGS barebore/minimal. --- commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index 64f609d..423637b 100644 --- a/commands.c +++ b/commands.c @@ -328,7 +328,7 @@ bool ci_scroll_to_edge(arg_t dir) return img_pan_edge(&img, dir); } -bool ci_drag(arg_t mode) +bool ci_drag(arg_t drag_mode) { int x, y, ox, oy; float px, py; @@ -337,13 +337,13 @@ bool ci_drag(arg_t mode) if ((int)(img.w * img.zoom) <= win.w && (int)(img.h * img.zoom) <= win.h) return false; - win_set_cursor(&win, mode == DRAG_ABSOLUTE ? CURSOR_DRAG_ABSOLUTE : CURSOR_DRAG_RELATIVE); + win_set_cursor(&win, drag_mode == DRAG_ABSOLUTE ? CURSOR_DRAG_ABSOLUTE : CURSOR_DRAG_RELATIVE); win_cursor_pos(&win, &x, &y); ox = x; oy = y; while (true) { - if (mode == DRAG_ABSOLUTE) { + if (drag_mode == DRAG_ABSOLUTE) { px = MIN(MAX(0.0, x - win.w*0.1), win.w*0.8) / (win.w*0.8) * (win.w - img.w * img.zoom); py = MIN(MAX(0.0, y - win.h*0.1), win.h*0.8) / (win.h*0.8) -- cgit v1.2.3-54-g00ecf