summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-10-29 19:13:28 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-10-29 19:13:28 -0700
commit881ac08b1dfed4822b1239ab8a0da4dc7aa2ee43 (patch)
tree8d847a13fb97d444565f88ae773c7fde096dc30f
parent4b4a2dcd75b329311b21e6203e9b12df7fa06a8b (diff)
Silence printf format warnings
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/xgi_hwmc.c6
-rw-r--r--src/xgi_misc.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/xgi_hwmc.c b/src/xgi_hwmc.c
index b0d2f58..11d8e46 100644
--- a/src/xgi_hwmc.c
+++ b/src/xgi_hwmc.c
@@ -317,7 +317,7 @@ int XGIXvMCCreateSurface(ScrnInfoPtr pScrn,
pXGI->xvmcSurface[i] = *pXGISurface;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG," index: %d surfPitch: %d surfHwAddr %lx\n",
- i, surfPitch, alloc.hw_addr);
+ i, surfPitch, (unsigned long)alloc.hw_addr);
return Success;
}
}
@@ -341,7 +341,7 @@ int XGIXvMCCreateSubpicture(ScrnInfoPtr pScrn,
XGITRACE(("XGIXvMCCreateSubpicture \n"));
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "subpicture_id = %x xvimage_id = %x width = %d, height = %d\n",
- pSubpicture->subpicture_id, pSubpicture->xvimage_id, pSubpicture->width, pSubpicture->height);
+ (unsigned int)pSubpicture->subpicture_id, pSubpicture->xvimage_id, pSubpicture->width, pSubpicture->height);
*priv = (long *)calloc(1, sizeof(XGIXvMCSubpictureRec));
if (!*priv)
@@ -380,7 +380,7 @@ int XGIXvMCCreateSubpicture(ScrnInfoPtr pScrn,
pXGI->xvmcSubpic = *pXGISubpicture;
memset(pXGISubpicture->hwAddr + pXGI->fbBase, i, surfSize);
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,"pitch: %d size: %x hwAddr %lx\n",
- surfPitch, pXGISubpicture->size, pXGISubpicture->hwAddr);
+ surfPitch, pXGISubpicture->size, (unsigned long)pXGISubpicture->hwAddr);
}
}
diff --git a/src/xgi_misc.c b/src/xgi_misc.c
index f9a5e3c..129eb6f 100644
--- a/src/xgi_misc.c
+++ b/src/xgi_misc.c
@@ -113,7 +113,7 @@ void XGIDumpMemory(CARD8 *addr, unsigned long size)
return;
#endif
- ErrorF("\n==================memory dump at 0x%x, size = %d ===============\n", addr, size);
+ ErrorF("\n==================memory dump at %p, size = %lu ===============\n", addr, size);
for(i=0; i<0x10; i++)
{
@@ -327,7 +327,7 @@ Bool XGIPcieMemAllocate(ScrnInfoPtr pScrn, size_t size,
}
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "alloc.size: 0x%x "
- "alloc.offset: 0x%lx alloc.hwAddr: 0x%x\n",
+ "alloc.offset: 0x%x alloc.hwAddr: 0x%x\n",
alloc.size, alloc.offset, alloc.hw_addr);
*offset = alloc.index;