Module Name: xsrc
Committed By: apb
Date: Fri Nov 2 07:44:10 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c
xsrc/external/mit/xf86-video-xgi/dist/src: vb_ext.c xgi_accel.c
xgi_driver.c
Log Message:
printf format fixes, found using clang -Wformat.
Some are fixed by adding casts, some by changing the format string,
and some by changing the type of the variable.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-xgi/dist/src/vb_ext.c \
xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c \
xsrc/external/mit/xf86-video-xgi/dist/src/xgi_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.2 Wed May 30 04:54:27 2012
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Fri Nov 2 07:44:09 2012
@@ -915,7 +915,7 @@ NVPciProbe(DriverPtr drv, int entity, st
if (pci_device_has_kernel_driver(dev)) {
xf86DrvMsg(0, X_ERROR,
NV_NAME ": The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
- id, name, dev->bus, dev->domain, dev->dev, dev->func);
+ (int)id, name, dev->bus, dev->domain, dev->dev, dev->func);
xf86DrvMsg(0, X_ERROR,
NV_NAME ": This driver cannot operate until it has been unloaded.\n");
return FALSE;
@@ -928,11 +928,11 @@ NVPciProbe(DriverPtr drv, int entity, st
if(name)
xf86DrvMsg(0, X_WARNING,
NV_NAME ": Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n",
- id, name, dev->bus, dev->domain, dev->dev, dev->func);
+ (int)id, name, dev->bus, dev->domain, dev->dev, dev->func);
else
xf86DrvMsg(0, X_WARNING,
NV_NAME ": Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n",
- id, dev->bus, dev->domain, dev->dev, dev->func);
+ (int)id, dev->bus, dev->domain, dev->dev, dev->func);
return FALSE;
}
Index: xsrc/external/mit/xf86-video-xgi/dist/src/vb_ext.c
diff -u xsrc/external/mit/xf86-video-xgi/dist/src/vb_ext.c:1.2 xsrc/external/mit/xf86-video-xgi/dist/src/vb_ext.c:1.3
--- xsrc/external/mit/xf86-video-xgi/dist/src/vb_ext.c:1.2 Thu Jul 19 19:18:20 2012
+++ xsrc/external/mit/xf86-video-xgi/dist/src/vb_ext.c Fri Nov 2 07:44:10 2012
@@ -510,7 +510,7 @@ VOID XGISetDPMS(ScrnInfoPtr pScrn, PVB_D
/* VB_DEVICE_INFO VBINF; */
/* PVB_DEVICE_INFO pVBInfo = pXGI->XGI_Pr */ /* &VBINF */;
- ErrorF("XGISetDPMS(VESA_POWER_STATE = 0x%x)...\n", VESA_POWER_STATE);
+ ErrorF("XGISetDPMS(VESA_POWER_STATE = 0x%lx)...\n", VESA_POWER_STATE);
InitTo330Pointer( pXGIHWDE->jChipType, pVBInfo ) ;
ReadVBIOSTablData( pXGIHWDE->jChipType , pVBInfo) ;
Index: xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c
diff -u xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c:1.2 xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c:1.3
--- xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c:1.2 Thu Jul 19 19:18:20 2012
+++ xsrc/external/mit/xf86-video-xgi/dist/src/xgi_accel.c Fri Nov 2 07:44:10 2012
@@ -1739,8 +1739,8 @@ void XGIDumpCMDQueue(ScrnInfoPtr pScrn)
ErrorF("----------------------------------------------------------------------\n") ;
SwWP = Volari_GetSwWP() ;
- ErrorF("SwWP=0x%x\n", SwWP) ;
- ErrorF("pXGI->cmdQueueBase=0x%x\n", pXGI->cmdQueueBase) ;
+ ErrorF("SwWP=0x%lx\n", SwWP) ;
+ ErrorF("pXGI->cmdQueueBase=%p\n", pXGI->cmdQueueBase) ;
for( i = 0 ; i < SwWP ; i+=0x04 )
{
ErrorF("[%04X]: %08lX\n",i, *(CARD32 *)(pXGI->cmdQueueBase+i));
Index: xsrc/external/mit/xf86-video-xgi/dist/src/xgi_driver.c
diff -u xsrc/external/mit/xf86-video-xgi/dist/src/xgi_driver.c:1.2 xsrc/external/mit/xf86-video-xgi/dist/src/xgi_driver.c:1.3
--- xsrc/external/mit/xf86-video-xgi/dist/src/xgi_driver.c:1.2 Thu Jul 19 19:18:20 2012
+++ xsrc/external/mit/xf86-video-xgi/dist/src/xgi_driver.c Fri Nov 2 07:44:10 2012
@@ -765,7 +765,7 @@ XGIDisplayPowerManagementSet(ScrnInfoPtr
typedef struct
{
- unsigned char name[10];
+ char name[10];
unsigned int DCLK;
unsigned int HDisplay;
unsigned int HSyncStart;
@@ -865,13 +865,13 @@ XGIErrorLog(ScrnInfoPtr pScrn, const cha
"**************************************************\n";
va_start(ap, format);
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, " ERROR:\n");
xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
va_end(ap);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
" END OF MESSAGE\n");
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
}
#ifdef XSERVER_LIBPCIACCESS
@@ -2773,11 +2773,11 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
#endif
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "VGA memory map from 0x%x to 0x%x \n",
+ "VGA memory map from %p to %p \n",
#ifdef XSERVER_LIBPCIACCESS
- pXGI->PciInfo->regions[2].base_addr, VGAHWPTR(pScrn)->Base);
+ (void *)(intptr_t)pXGI->PciInfo->regions[2].base_addr, VGAHWPTR(pScrn)->Base);
#else
- pXGI->PciInfo->ioBase[2], VGAHWPTR(pScrn)->Base);
+ (void *)(intptr_t)pXGI->PciInfo->ioBase[2], VGAHWPTR(pScrn)->Base);
#endif
}
}
@@ -3056,7 +3056,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
pXGI->xgi_HwDevExt.pjIOAddress = (XGIIOADDRESS) (pXGI->RelIO + 0x30);
xf86DrvMsg(pScrn->scrnIndex, from, "Relocated IO registers at 0x%lX\n",
(unsigned long) pXGI->RelIO);
- ErrorF("xgi_driver.c-pXGI->xgi_HwDevExt.pjIOAddress=0x%x...\n", pXGI->xgi_HwDevExt.pjIOAddress);
+ ErrorF("xgi_driver.c-pXGI->xgi_HwDevExt.pjIOAddress=0x%lx...\n", pXGI->xgi_HwDevExt.pjIOAddress);
if (!xf86SetDepthBpp(pScrn, 0, 0, 0, pix24flags)) {
XGIErrorLog(pScrn, "xf86SetDepthBpp() error\n");
@@ -3737,7 +3737,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->monitor->nHsync = 1;
pScrn->monitor->hsync[0].lo=30;
pScrn->monitor->hsync[0].hi=50;
- ErrorF("No HorizSync information set in Monitor section and use default (%d, %d)...\n",
+ ErrorF("No HorizSync information set in Monitor section and use default (%g, %g)...\n",
pScrn->monitor->hsync[0].lo, pScrn->monitor->hsync[0].hi);
}
@@ -3746,7 +3746,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->monitor->nVrefresh = 1;
pScrn->monitor->vrefresh[0].lo=40;
pScrn->monitor->vrefresh[0].hi=60;
- ErrorF("No VertRefresh information set in Monitor section and use default (%d, %d)...\n",
+ ErrorF("No VertRefresh information set in Monitor section and use default (%g, %g)...\n",
pScrn->monitor->vrefresh[0].lo, pScrn->monitor->vrefresh[0].hi);
}
}
