Andrew Talbot : oleaut32: Remove unused variables.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ba742868e50244e300c2c0a5f7d21ce2adcd04bf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ba742868e50244e300c2c0a5f7...

Author: Andrew Talbot 
Date:   Tue Apr 22 22:05:10 2008 +0100

oleaut32: Remove unused variables.

---

dlls/oleaut32/typelib.c   |   15 +++++++--------
 dlls/oleaut32/varformat.c |    2 --
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 123810b..4c710c6 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -2024,7 +2024,6 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs,
 static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL,
                           int offset)
 {
-    int j;
     TLBRefType *ref;

TRACE_(typelib)("TLB context %p, TLB offset %x\n", pcx, offset);
@@ -2046,7 +2045,7 @@ static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL,

MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx,
                           pcx->pTblDir->pImpInfo.offset + (offset & 0xfffffffc));
-        for(j=0;pImpLib;j++){   /* search the known offsets of all import libraries */
+        while (pImpLib){   /* search the known offsets of all import libraries */
             if(pImpLib->offset==impinfo.oImpFile) break;
             pImpLib=pImpLib->next;
         }
@@ -3284,7 +3283,7 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI,
    			char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
    			SLTG_TypeInfoTail *pTITail)
 {
-    char *pFirstItem, *pNextItem;
+    char *pFirstItem;
     sltg_ref_lookup_t *ref_lookup = NULL;

if(pTIHeader->href_table != 0xffffffff) {
@@ -3292,10 +3291,10 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI,
    	    pNameTable);
     }

-    pFirstItem = pNextItem = pBlk;
+    pFirstItem = pBlk;

if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) {
-        pNextItem = SLTG_DoImpls(pFirstItem, pTI, FALSE, ref_lookup);
+        SLTG_DoImpls(pFirstItem, pTI, FALSE, ref_lookup);
     }
     HeapFree(GetProcessHeap(), 0, ref_lookup);
 }
@@ -3305,7 +3304,7 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
    			  char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
    			  const SLTG_TypeInfoTail *pTITail)
 {
-    char *pFirstItem, *pNextItem;
+    char *pFirstItem;
     sltg_ref_lookup_t *ref_lookup = NULL;

if(pTIHeader->href_table != 0xffffffff) {
@@ -3313,10 +3312,10 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
    	    pNameTable);
     }

-    pFirstItem = pNextItem = pBlk;
+    pFirstItem = pBlk;

if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) {
-        pNextItem = SLTG_DoImpls(pFirstItem, pTI, TRUE, ref_lookup);
+        SLTG_DoImpls(pFirstItem, pTI, TRUE, ref_lookup);
     }

if (pTITail->funcs_off != 0xffff)
diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c
index 399009c..3b35d38 100644
--- a/dlls/oleaut32/varformat.c
+++ b/dlls/oleaut32/varformat.c
@@ -522,7 +522,6 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
   FMT_HEADER *header = (FMT_HEADER*)rgbTok;
   FMT_STRING_HEADER *str_header = (FMT_STRING_HEADER*)(rgbTok + sizeof(FMT_HEADER));
   FMT_NUMBER_HEADER *num_header = (FMT_NUMBER_HEADER*)str_header;
-  FMT_DATE_HEADER *date_header = (FMT_DATE_HEADER*)str_header;
   BYTE* pOut = rgbTok + sizeof(FMT_HEADER) + sizeof(FMT_STRING_HEADER);
   BYTE* pLastHours = NULL;
   BYTE fmt_number = 0;
@@ -591,7 +590,6 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
         header->starts[fmt_number] = pOut - rgbTok;
         str_header = (FMT_STRING_HEADER*)pOut;
         num_header = (FMT_NUMBER_HEADER*)pOut;
-        date_header = (FMT_DATE_HEADER*)pOut;
         memset(str_header, 0, sizeof(FMT_STRING_HEADER));
         pOut += sizeof(FMT_STRING_HEADER);
         fmt_state = 0;