More warning cleanup.

10 files changed, 17 insertions, 29 deletions

diff --git a/hw/dmx/input/usb-other.c b/hw/dmx/input/usb-other.c
index 9ac9e16ca..9bb284281 100644
--- a/hw/dmx/input/usb-other.c
+++ b/hw/dmx/input/usb-other.c
@@ -142,7 +142,7 @@ void othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
                 } else
                     info->numAbsAxes     = priv->numAbs;
                 for (j = 0; j < info->numAbsAxes; j++) {
-                    ioctl(priv->fd, EVIOCGABS(j), abs);
+                    ioctl(priv->fd, EVIOCGABS(j), absolute);
                     info->minval[1+j]    = absolute[1];
                     info->maxval[1+j]    = absolute[2];
                     info->res[1+j]       = absolute[3];
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 821ece11d..0caca8010 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -687,8 +687,6 @@ xf86XVCopyClip(
    XvPortRecPrivatePtr portPriv,
    GCPtr pGC
 ){
-    ScreenPtr pScreen = pGC->pScreen;
-
     /* copy the new clip if it exists */
     if((pGC->clientClipType == CT_REGION) && pGC->clientClip) {
 	if(!portPriv->clientClip)
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 8ac66fdc5..8d2851033 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -41,6 +41,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86.h"
 #include <sys/time.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdio.h>
 
 #define NEED_REPLIES
 #define NEED_EVENTS
@@ -1135,7 +1137,9 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
     WindowPtr		pWin, pOldWin;
     int			i;
 
+#if 0
     printf("maxDrawableTableEntry = %d\n", pDRIPriv->pDriverInfo->maxDrawableTableEntry);
+#endif
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
 	pWin = (WindowPtr)pDrawable;
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 7d98d8bc3..e35bc8c2e 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -5,6 +5,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c
index 22a019499..ea37414b2 100644
--- a/hw/xfree86/i2c/fi1236.c
+++ b/hw/xfree86/i2c/fi1236.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/hw/xfree86/i2c/fi1236.c,v 1.8 2005/07/30 18:56:32 alanc Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/i2c/fi1236.c,v 1.9 2006/02/10 22:00:25 anholt Exp $ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
@@ -102,7 +102,6 @@ xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "MT2032: Company code 0x%02x%02x, pa
 static void MT2032_shutdown(FI1236Ptr f)
 {
 CARD8 data[10];
-CARD8 value;
 
 data[0]=0x00; /* start with register 0x00 */
 data[1]=0x1A; 
@@ -534,8 +533,6 @@ void FI1236_tune(FI1236Ptr f, CARD32 frequency)
 
 void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency)
 {
-    CARD16 divider;
-
     if(frequency < f->parm.min_freq) frequency = f->parm.min_freq;
     if(frequency > f->parm.max_freq) frequency = f->parm.max_freq;
 
diff --git a/hw/xfree86/i2c/msp3430.c b/hw/xfree86/i2c/msp3430.c
index 42f100e7c..4bd3a7187 100644
--- a/hw/xfree86/i2c/msp3430.c
+++ b/hw/xfree86/i2c/msp3430.c
@@ -82,6 +82,7 @@ static void GetMSP3430Data(MSP3430Ptr m, CARD8 RegAddress, CARD8 RegSubAddressHi
    *RegValueLow = receive[1];
 }
 
+#if __MSPDEBUG__ > 2
 static void MSP3430DumpStatus(MSP3430Ptr m)
 {
 CARD8 status_hi, status_lo;
@@ -102,6 +103,7 @@ I2C_WriteRead(&(m->d), &subaddr, 1, data, 2);
 xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP34xx: control=0x%02x%02x\n",
 		data[1], data[0]);
 }
+#endif
 
 /* wrapper */
 void InitMSP3430(MSP3430Ptr m)
@@ -263,9 +265,8 @@ void ResetMSP3430(MSP3430Ptr m)
 void MSP3430SetVolume (MSP3430Ptr m, CARD8 value)
 {
     CARD8 result;
-    CARD8 old_volume;
-
 #if 0
+    CARD8 old_volume;
     GetMSP3430Data(m, RD_DSP, 0x00, 0x00, &old_volume, &result);   
     xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP3430 result 0x%02x\n", result);
 #endif
@@ -608,7 +609,6 @@ void CheckModeMSP34x5D(MSP3430Ptr m) {
     const char dual_off=-stereo_off;
     char detect;
     CARD8 matrix, fmmatrix, source, high, low;
-    char *msg;
 
     fmmatrix=0;		/*no matrix*/
     source=0;		/*FM*/
@@ -702,6 +702,7 @@ void CheckModeMSP34x5D(MSP3430Ptr m) {
 			SetMSP3430Data (m, WR_DEM, 0x00, 0x21, 0, 1);
 
 #if __MSPDEBUG__ > 0
+		    char *msg;
 		    switch (matrix) {
 			case 0x30: /*MONO*/
 			    msg="MONO";
diff --git a/hw/xfree86/i2c/uda1380.c b/hw/xfree86/i2c/uda1380.c
index bd3eef0f7..a30675083 100644
--- a/hw/xfree86/i2c/uda1380.c
+++ b/hw/xfree86/i2c/uda1380.c
@@ -22,22 +22,6 @@
  * otherwise to promote the sale, use or other dealings in this Software without prior written 
  * authorization from the author.
  *
- * $Log$
- * Revision 1.5  2005/09/24 21:56:00  bogdand
- * Changed the license to a X/MIT one
- *
- * Revision 1.4  2005/07/13 20:19:37  sandmann
- * xc/programs/Xserver/hw/xfree86/drivers/i2c/*.c: include xorg-config.h
- * instead of config.h
- * xserver/xorg/hw/xfree86/i2c/Makefile.am: Add i2c drivers
- *
- * Revision 1.3  2005/07/11 02:29:50  ajax
- * Prep for modular builds by adding guarded #include "config.h" everywhere.
- *
- * Revision 1.2  2005/07/01 22:43:11  daniels
- * Change all misc.h and os.h references to <X11/foo.h>.
- *
- *
  ************************************************************************************/
 
 #ifdef HAVE_XORG_CONFIG_H
diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c
index 43f626f70..0c48de4c8 100644
--- a/hw/xfree86/xf4bpp/ppcGetSp.c
+++ b/hw/xfree86/xf4bpp/ppcGetSp.c
@@ -76,6 +76,7 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
 #include "xf4bpp.h"
 #include "OScompiler.h"
 #include "mfbmap.h"
diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c
index d7e6665d9..00b7b6052 100644
--- a/hw/xfree86/xf8_16bpp/cfbscrinit.c
+++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c
@@ -153,11 +153,11 @@ cfb8_16SetupScreen(
     pScreen->UnrealizeFont = mfbUnrealizeFont;
     pScreen->CreateGC = cfb8_16CreateGC;
     pScreen->CreateColormap = miInitializeColormap;
-    pScreen->DestroyColormap = (void (*)())NoopDDA;
+    pScreen->DestroyColormap = (DestroyColormapProcPtr)NoopDDA;
     pScreen->InstallColormap = miInstallColormap;
     pScreen->UninstallColormap = miUninstallColormap;
     pScreen->ListInstalledColormaps = miListInstalledColormaps;
-    pScreen->StoreColors = (void (*)())NoopDDA;
+    pScreen->StoreColors = (StoreColorsProcPtr)NoopDDA;
     pScreen->ResolveColor = miResolveColor;
     pScreen->BitmapToRegion = mfbPixmapToRegion;
 
diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c
index 8220636a1..629d6bf6a 100644
--- a/hw/xfree86/xf8_32bpp/cfbimage.c
+++ b/hw/xfree86/xf8_32bpp/cfbimage.c
@@ -5,6 +5,7 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <X11/X.h>
 #include "windowstr.h"
@@ -60,7 +61,7 @@ cfb8_32GetImage (
         if (!pPixmap)
             return;
         if ((planemask & 0xff) != 0xff)
-            bzero((char *)pdstLine, pPixmap->devKind * h);
+            memset((char *)pdstLine, 0, pPixmap->devKind * h);
         ptSrc.x = sx + pDraw->x;
         ptSrc.y = sy + pDraw->y;
         box.x1 = 0;