NXv3 (redistributed) https://cgit.arctica-project.org/nx-libs/atom?h=3.5.99.23 2020-01-30T10:50:01+00:00 2020-01-30T10:50:01+00:00 Mike Gabriel mike.gabriel@das-netzwerkteam.de 2020-01-30T10:49:59+00:00 urn:sha1:82fc54e577c56ee3952f14c4a5c9f50c16645591 2020-01-30T10:49:42+00:00 Mike Gabriel mike.gabriel@das-netzwerkteam.de 2020-01-30T10:49:42+00:00 urn:sha1:bd5b20192880bf591f2f1c24f13133a71ac46540 2020-01-30T10:49:18+00:00 Mike Gabriel mike.gabriel@das-netzwerkteam.de 2020-01-30T10:49:18+00:00 urn:sha1:deffba48d8932b66b53c4a330f4d0e55590ee399 2020-01-30T09:59:17+00:00 Mike Gabriel mike.gabriel@das-netzwerkteam.de 2020-01-30T09:59:17+00:00 urn:sha1:c8d69ebaeed8005d38c91613ab699747f45b2228 Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895 2020-01-25T20:54:33+00:00 Ulrich Sibiller uli42@gmx.de 2020-01-25T20:23:55+00:00 urn:sha1:4821edfe0ecc2296745c4c5fcaa4c08245673c6e 2020-01-25T20:20:28+00:00 Ulrich Sibiller uli42@gmx.de 2020-01-25T14:50:04+00:00 urn:sha1:2adab29728f9598c3e1bbd89d7e1f11eeab1bcf6 This was removed by mistake in 39866f5c133230e5731156c2356c8571c971534c. Fixes ArcticaProject/nx-libs#904 2020-01-09T23:25:46+00:00 Ulrich Sibiller uli42@gmx.de 2020-01-09T22:44:33+00:00 urn:sha1:870746222abbecd16f113b93a4420846b2d5d510 Clean.c: In function ‘CleanZImage’: Clean.c:141:23: warning: declaration of ‘j’ shadows a previous local [-Wshadow=local] register int i, j; ^ Clean.c:88:16: note: shadowed declaration is here unsigned int j; ^ Clean.c: In function ‘CopyAndCleanImage’: Clean.c:239:22: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] register int i; ^ Clean.c:192:16: note: shadowed declaration is here register int i; ^ Clean.c:324:13: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] int i; ^ Clean.c:192:16: note: shadowed declaration is here register int i; ^ 2020-01-09T23:25:46+00:00 Ulrich Sibiller uli42@gmx.de 2020-01-09T22:18:17+00:00 urn:sha1:a94e8258f72ab5db4b9a1de7e10140b8d622667b commit 08d0481e299c28b64a0db9bb0782ba2b551028fd Author: Keith Packard <keithp@keithp.com> Date: Sun Dec 15 01:12:22 2013 -0800 os: Fix -Wshadow errors Rename variables to avoid shadowing globals Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net> 2020-01-09T23:25:46+00:00 Ulrich Sibiller uli42@gmx.de 2020-01-09T22:06:08+00:00 urn:sha1:4b8194e1eafb9fd788b814921f9e2518a2079344 Based on the following commit. But for mispans.c I think the first contained fix is wrong (nested loop with variable i) so I took another approach. commit f02e27e4fcc34413b2051e5a01edc92172fa8612 Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Date: Tue Oct 16 02:16:17 2012 -0500 mi: fix shadow warnings mibitblt.c: In function 'miGetImage': mibitblt.c:617:20: warning: declaration of 'pt' shadows a previous local mibitblt.c:609:17: warning: shadowed declaration is here mispans.c: In function 'miFillUniqueSpanGroup': mispans.c:456:33: warning: declaration of 'i' shadows a previous local mispans.c:382:9: warning: shadowed declaration is here mispans.c:488:17: warning: declaration of 'i' shadows a previous local mispans.c:382:9: warning: shadowed declaration is here Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Fixes these warnings: mi/mispans.c: fix shadowed vars mispans.c: In function ‘miFillUniqueSpanGroup’: mispans.c:465:12: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] int i; ^ mispans.c:387:21: note: shadowed declaration is here register int i; ^ mispans.c:497:10: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] int i; ^ mispans.c:387:21: note: shadowed declaration is here register int i; ^ mibitblt.c: In function ‘miGetImage’: mibitblt.c:669:13: warning: declaration of ‘pt’ shadows a previous local [-Wshadow=compatible-local] xPoint pt; ^~ mibitblt.c:659:18: note: shadowed declaration is here DDXPointRec pt = {0, 0}; ^~ 2020-01-09T23:25:46+00:00 Ulrich Sibiller uli42@gmx.de 2020-01-09T21:50:13+00:00 urn:sha1:1a1ace774f49bccbb4760b4a0c58e56bf46548db Fix this warning: xkbActions.c: In function ‘_XkbFilterDeviceBtn’: xkbActions.c:1084:6: warning: declaration of ‘button’ shadows a previous local [-Wshadow=compatible-local] int button; ^~~~~~ xkbActions.c:1044:6: note: shadowed declaration is here int button; ^~~~~~ Backport of this xorg-xserver upstream commit: commit 41dd7cf673e47ab74c5065b8dbf268b2e5facb64 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon Dec 12 16:49:34 2011 -0800 _XkbFilterDeviceBtn: move variable declarations to match usage scope The main body of this function is an if { } else if { } pair of blocks. Previously there was int button at the top level scope which is used only in the first block, and a redeclaration of int button inside the second block. Since there's no overlap in the code paths for the two uses of button, move the one from the outer block into the first block to help the programmer more quickly determine they are unrelated usages, and to silence the gcc warning of: xkbActions.c: In function '_XkbFilterDeviceBtn': xkbActions.c:999:6: warning: declaration of 'button' shadows a previous local xkbActions.c:955:6: warning: shadowed declaration is here For consistency, move DeviceIntPtr dev declarations as well that are used in the same way. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>