From 3d769b81faea6a066c07c4e5ee0df9cf12870b92 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Fri, 7 May 2004 22:43:52 +0000
Subject: [PATCH] Warning clean-ups.

---
 src/mesa/drivers/dri/i830/i830_debug.c | 6 +++---
 src/mesa/drivers/dri/i830/i830_state.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i830/i830_debug.c b/src/mesa/drivers/dri/i830/i830_debug.c
index 56940e223cf..84f3216dc04 100644
--- a/src/mesa/drivers/dri/i830/i830_debug.c
+++ b/src/mesa/drivers/dri/i830/i830_debug.c
@@ -325,15 +325,15 @@ void i830EmitHwStateLockedDebug( i830ContextPtr imesa )
 	 switch( i ) {
 	 case 0:
 	 case 1:
-	    TexState = & imesa->sarea->TexState[i];
+	    TexState = imesa->sarea->TexState[i];
 	    break;
 
 	 case 2:
-	    TexState = & imesa->sarea->TexState2;
+	    TexState = imesa->sarea->TexState2;
 	    break;
 
 	 case 3:
-	    TexState = & imesa->sarea->TexState3;
+	    TexState = imesa->sarea->TexState3;
 	    break;
 	 }
 
diff --git a/src/mesa/drivers/dri/i830/i830_state.c b/src/mesa/drivers/dri/i830/i830_state.c
index 9bd97379cac..8bfe392682b 100644
--- a/src/mesa/drivers/dri/i830/i830_state.c
+++ b/src/mesa/drivers/dri/i830/i830_state.c
@@ -1410,7 +1410,7 @@ void i830DDInitState( GLcontext *ctx )
 {
    i830ContextPtr imesa = I830_CONTEXT(ctx);   
    i830ScreenPrivate *i830Screen = imesa->i830Screen;
-   int i, j;
+   int i;
 
    imesa->clear_red = 0;
    imesa->clear_green = 0;