From c137c2a4d68cb17802275739a40cf0ad7eda9bc8 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 9 Jan 2020 21:01:34 +0100 Subject: Clipboard.c: fix shadowed variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this was harmless but not nice nevertheless. Clipboard.c: In function ‘nxagentConvertSelection’: Clipboard.c:1850:9: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] int i = nxagentFindCurrentSelectionIndex(selection); ^ Clipboard.c:1736:7: note: shadowed declaration is here int i = nxagentFindCurrentSelectionIndex(selection); ^ --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 47eaa946d..1d5054fbb 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -1733,13 +1733,15 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, return 0; } - int i = nxagentFindCurrentSelectionIndex(selection); - if (i < NumCurrentSelections && IS_INTERNAL_OWNER(i)) { - /* - * There is a client owner on the agent side, let normal dix stuff happen. - */ - return 0; + int i = nxagentFindCurrentSelectionIndex(selection); + if (i < NumCurrentSelections && IS_INTERNAL_OWNER(i)) + { + /* + * There is a client owner on the agent side, let normal dix stuff happen. + */ + return 0; + } } /* -- cgit v1.2.3