This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 932261b48ec616236d436e55a18fdb5b02d91376 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 7 06:24:49 2018 +0100 Fix types in ugly DPMSDEBUG messages. --- nx-X11/programs/Xserver/os/WaitFor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index 86a0013..137f456 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -711,7 +711,7 @@ TimerInit(void) #define DPMS_CHECK_TIMEOUT(time)\ if (time > 0 && (time - timeout) > 0) {\ - fprintf(stderr, "DPMSDEBUG: Returning time (%d) - timeout (%d) = %d in DPMS timeout check\n", time, timeout, time - timeout);\ + fprintf(stderr, "DPMSDEBUG: Returning time (%d) - timeout (%d) = %u in DPMS timeout check\n", time, timeout, time - timeout);\ return time - timeout;\ } @@ -758,7 +758,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,void * arg) DPMS_CHECK_MODE(DPMSModeStandby, DPMSStandbyTime) nextTimeout = NextDPMSTimeout(timeout); - fprintf(stderr, "DPMSDEBUG: Checked all modes, new timeout: %d\n", nextTimeout); + fprintf(stderr, "DPMSDEBUG: Checked all modes, new timeout: %u\n", nextTimeout); } /* @@ -766,19 +766,19 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,void * arg) * power saving mode */ if (DPMSPowerLevel != DPMSModeOn) { - fprintf(stderr, "DPMSDEBUG: not in DPMS mode 'on', returning next timeout %d\n", nextTimeout); + fprintf(stderr, "DPMSDEBUG: not in DPMS mode 'on', returning next timeout %u\n", nextTimeout); return nextTimeout; } #endif /* DPMSExtension */ if (!ScreenSaverTime) { - fprintf(stderr, "DPMSDEBUG: no ScreenSaverTime set, returning next timeout %d\n", nextTimeout); + fprintf(stderr, "DPMSDEBUG: no ScreenSaverTime set, returning next timeout %u\n", nextTimeout); return nextTimeout; } if (timeout < ScreenSaverTime) { - fprintf(stderr, "DPMSDEBUG: nextTimeout %d > 0 %d ? MIN(ScreenSaverTime %d - timeout %d %d, nextTimeout) %d : ScreenSaverTime - timeout %d -- %d\n", nextTimeout, nextTimeout > 0, ScreenSaverTime, timeout, ScreenSaverTime - timeout, MIN(ScreenSaverTime - timeout, nextTimeout), ScreenSaverTime - timeout, nextTimeout > 0 ? MIN(ScreenSaverTime - timeout, nextTimeout) : ScreenSaverTime - timeout); + fprintf(stderr, "DPMSDEBUG: nextTimeout %u > 0 %u ? MIN(ScreenSaverTime %u - timeout %d %u, nextTimeout) %u : ScreenSaverTime - timeout %u -- %u\n", nextTimeout, nextTimeout > 0, ScreenSaverTime, timeout, ScreenSaverTime - timeout, MIN(ScreenSaverTime - timeout, nextTimeout), ScreenSaverTime - timeout, nextTimeout > 0 ? MIN(ScreenSaverTime - timeout, nextTimeout) : ScreenSaverTime - timeout); return nextTimeout > 0 ? MIN(ScreenSaverTime - timeout, nextTimeout) : ScreenSaverTime - timeout; @@ -790,13 +790,13 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,void * arg) if (ScreenSaverInterval > 0) { - fprintf(stderr, "DPMSDEBUG: nextTimeout %d > 0 %d ? MIN(ScreenSaverInterval %d, nextTimeout) %d : ScreenSaverInterval -- %d\n", nextTimeout, nextTimeout > 0, ScreenSaverInterval, MIN(ScreenSaverInterval, nextTimeout), nextTimeout > 0 ? MIN(ScreenSaverInterval, nextTimeout) : ScreenSaverInterval); + fprintf(stderr, "DPMSDEBUG: nextTimeout %u > 0 %u ? MIN(ScreenSaverInterval %u, nextTimeout) %u : ScreenSaverInterval -- %u\n", nextTimeout, nextTimeout > 0, ScreenSaverInterval, MIN(ScreenSaverInterval, nextTimeout), nextTimeout > 0 ? MIN(ScreenSaverInterval, nextTimeout) : ScreenSaverInterval); nextTimeout = nextTimeout > 0 ? MIN(ScreenSaverInterval, nextTimeout) : ScreenSaverInterval; } - fprintf(stderr, "DPMSDEBUG: returning nextTimeout %d\n", nextTimeout); + fprintf(stderr, "DPMSDEBUG: returning nextTimeout %u\n", nextTimeout); return nextTimeout; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git