From 362cd67d3b689b26d91db6974f2fd7da4b176ee8 Mon Sep 17 00:00:00 2001
From: Andrew Talbot <andrew.talbot@talbotville.com>
Date: Thu, 24 Apr 2008 21:43:51 +0100
Subject: [PATCH] setupapi: Remove unused variables.

---
 dlls/setupapi/parser.c      |  4 ++--
 dlls/setupapi/setupx_main.c | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index a00e06862f3..8c8a5184fbc 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -778,7 +778,7 @@ static const WCHAR *eol_backslash_state( struct parser *parser, const WCHAR *pos
 /* handler for parser QUOTES state */
 static const WCHAR *quotes_state( struct parser *parser, const WCHAR *pos )
 {
-    const WCHAR *p, *token_end = parser->start;
+    const WCHAR *p;
 
     for (p = pos; !is_eol( parser, p ); p++)
     {
@@ -787,7 +787,7 @@ static const WCHAR *quotes_state( struct parser *parser, const WCHAR *pos )
             if (p+1 < parser->end && p[1] == '"')  /* double quotes */
             {
                 push_token( parser, p + 1 );
-                parser->start = token_end = p + 2;
+                parser->start = p + 2;
                 p++;
             }
             else  /* end of quotes */
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index 606ffb8fa05..82593f37973 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -401,7 +401,7 @@ RETERR16 WINAPI CtlDelLdd16(LOGDISKID16 ldid)
  */
 RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd)
 {
-    LDD_LIST *pCurr, *pPrev = NULL;
+    LDD_LIST *pCurr;
 
     TRACE("(%p)\n", pldd);
 
@@ -414,10 +414,7 @@ RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd)
     pCurr = pFirstLDD;
     /* search until we find the appropriate LDD or hit the end */
     while ((pCurr != NULL) && (pldd->ldid > pCurr->pldd->ldid))
-    {
-	pPrev = pCurr;
 	pCurr = pCurr->next;
-    }
     if ( (pCurr == NULL) /* hit end of list */
       || (pldd->ldid != pCurr->pldd->ldid) )
 	return ERR_VCP_LDDFIND; /* correct ? */
@@ -534,7 +531,7 @@ RETERR16 WINAPI CtlAddLdd16(LPLOGDISKDESC pldd)
  */
 static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd)
 {
-    LDD_LIST *pCurr, *pPrev = NULL;
+    LDD_LIST *pCurr;
 
     if (!std_LDDs_done)
 	SETUPX_CreateStandardLDDs();
@@ -545,10 +542,7 @@ static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd)
     pCurr = pFirstLDD;
     /* search until we find the appropriate LDD or hit the end */
     while ((pCurr != NULL) && (pldd->ldid > pCurr->pldd->ldid))
-    {
-	 pPrev = pCurr;
-	 pCurr = pCurr->next;
-    }
+	pCurr = pCurr->next;
     if (pCurr == NULL) /* hit end of list */
 	return ERR_VCP_LDDFIND; /* correct ? */