xserver: Branch 'master' - 5 commits
Keith Packard
keithp at kemper.freedesktop.org
Fri Aug 28 13:21:38 PDT 2015
dix/touch.c | 2 +-
hw/kdrive/ephyr/ephyr.c | 4 ++--
hw/xfree86/common/xf86Events.c | 2 +-
hw/xfree86/dri/dri.c | 2 +-
hw/xfree86/ramdac/TI.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit bcb60a49c5e74aa11d0256874659afddea91e53d
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Tue Jul 7 23:11:07 2015 +0100
debug output format fix in TouchEventHistoryPush()
xserver/build.x86_64/../dix/touch.c:468:16: error: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ [-Werror=format=]
%zu is C99, but is already used in a few places. Perhaps doc/c-extensions needs
to mention it.
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/touch.c b/dix/touch.c
index 49d16ab..54da132 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -464,7 +464,7 @@ TouchEventHistoryPush(TouchPointInfoPtr ti, const DeviceEvent *ev)
/* FIXME: proper overflow fixes */
if (ti->history_elements > ti->history_size - 1) {
ti->history_elements = ti->history_size - 1;
- DebugF("source device %d: history size %d overflowing for touch %u\n",
+ DebugF("source device %d: history size %zu overflowing for touch %u\n",
ti->sourceid, ti->history_size, ti->client_id);
}
}
commit 1f96a0d273e56d01cd240e6a4ef8765e0ffe058c
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri May 1 17:40:06 2015 +0100
debug output format fix in ephyrProcessMouseMotion()
xorg/xserver/hw/kdrive/ephyr/ephyr.c:979:9: error: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘ScreenPtr’ [-Werror=format=]
This looks like a genuine bug, and ephyrCursorScreen->myNum was meant here
rather than ephyrCursorScreen
v2:
Insert a ":" as well
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 164ebdc..e6e72d3 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -977,8 +977,8 @@ ephyrProcessMouseMotion(xcb_generic_event_t *xev)
if (ephyrCursorScreen != screen->pScreen) {
EPHYR_LOG("warping mouse cursor. "
- "cur_screen%d, motion_screen:%d\n",
- ephyrCursorScreen, screen->pScreen->myNum);
+ "cur_screen:%d, motion_screen:%d\n",
+ ephyrCursorScreen->myNum, screen->pScreen->myNum);
ephyrWarpCursor(inputInfo.pointer, screen->pScreen,
motion->event_x, motion->event_y);
}
commit 8cc88fbe9e4699cd2570641eb2752977b5505d16
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri May 1 17:33:35 2015 +0100
debug output format fix in DRISwapContext()
xorg/xserver/hw/xfree86/dri/dri.c:1695:19: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 4 has type ‘DRIContextPrivPtr’ [-Werror=format=] ^
xorg/xserver/hw/xfree86/dri/dri.c:1695:19: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘DRIContextPrivPtr’ [-Werror=format=]
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index ae92fc2..875c9cc 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1691,7 +1691,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
if (!newContext) {
DRIDrvMsg(pScreen->myNum, X_ERROR,
- "[DRI] Context Switch Error: oldContext=%x, newContext=%x\n",
+ "[DRI] Context Switch Error: oldContext=%p, newContext=%p\n",
oldContext, newContext);
return;
}
commit 27cf5840272810ae20fdae550db71ec48cf1b02d
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Tue Jul 7 23:29:51 2015 +0100
debug output format fix in TI.c
xserver/hw/xfree86/ramdac/TI.c:118:12: error: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘long unsigned int’ [-Werror=format=]
xserver/hw/xfree86/ramdac/TI.c:118:12: error: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘long unsigned int’ [-Werror=format=]
xserver/hw/xfree86/ramdac/TI.c:118:12: error: format ‘%d’ expects argument of type ‘int’, but argument 6 has type ‘long unsigned int’ [-Werror=format=]
Use %lu for an unsigned long
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c
index f8081ca..0ae1db5 100644
--- a/hw/xfree86/ramdac/TI.c
+++ b/hw/xfree86/ramdac/TI.c
@@ -114,7 +114,7 @@ TIramdacCalculateMNPForClock(unsigned long RefClock, /* In 100Hz units */
VCO = 8.0 * IntRef * best_m / best_n;
ActualClock = VCO / (1 << p);
- DebugF("f_out=%ld f_vco=%.1f n=%d m=%d p=%d\n",
+ DebugF("f_out=%ld f_vco=%.1f n=%lu m=%lu p=%lu\n",
ActualClock, VCO, *rN, *rM, *rP);
return ActualClock;
commit 6cc0f3d95d62e33a5d86f865159cc3526d3a9dc5
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Tue Jul 7 23:20:29 2015 +0100
debug output format fix in xf86Events.c
xserver/hw/xfree86/common/xf86Events.c:183:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘void *’ [-Werror=format=]
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 97a1f97..6570f0b 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -180,7 +180,7 @@ ProcessInputEvents(void)
void
xf86ProcessActionEvent(ActionEvent action, void *arg)
{
- DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg);
+ DebugF("ProcessActionEvent(%d,%p)\n", (int) action, arg);
switch (action) {
case ACTION_TERMINATE:
if (!xf86Info.dontZap) {
More information about the xorg-commit
mailing list