Fix a couple of compiler warnings.
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 20:52:38 +0000 (20:52 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 20:52:38 +0000 (20:52 +0000)
        Reviewed by Mitz.

        * platform/win/ThreadingWin.cpp:
        * platform/win/UniscribeController.cpp: Remove unused function.
        (WebCore::UniscribeController::advance): Fix bogus warning about un-initialized variable.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29316 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/win/ThreadingWin.cpp
WebCore/platform/win/UniscribeController.cpp

index 84f495274c62b4b2b40c7cef7487741d887ab408..a967bde7aae5a570e9750c860c3dc1296388b27d 100644 (file)
@@ -1,3 +1,13 @@
+2008-01-08  Steve Falkenburg  <sfalken@apple.com>
+
+        Fix a couple of compiler warnings.
+        
+        Reviewed by Mitz.
+
+        * platform/win/ThreadingWin.cpp:
+        * platform/win/UniscribeController.cpp: Remove unused function.
+        (WebCore::UniscribeController::advance): Fix bogus warning about un-initialized variable.
+
 2008-01-08  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.
 2008-01-08  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.
index 9890e8ef023ee5aee5a7a97ef3abe4d4c962c0a3..5bfdefe872425707c4a7da36a426a83e7d89e8e4 100644 (file)
@@ -61,19 +61,6 @@ static void storeThreadHandleByIdentifier(DWORD threadID, HANDLE threadHandle)
     threadMap().add(threadID, threadHandle);
 }
 
     threadMap().add(threadID, threadHandle);
 }
 
-static ThreadIdentifier identifierByThreadHandle(HANDLE threadHandle)
-{
-    MutexLocker locker(threadMapMutex());
-
-    HashMap<DWORD, HANDLE>::iterator i = threadMap().begin();
-    for (; i != threadMap().end(); ++i) {
-        if (i->second == threadHandle)
-            return i->first;
-    }
-
-    return 0;
-}
-
 static HANDLE threadHandleForIdentifier(ThreadIdentifier id)
 {
     MutexLocker locker(threadMapMutex());
 static HANDLE threadHandleForIdentifier(ThreadIdentifier id)
 {
     MutexLocker locker(threadMapMutex());
index 938dc2c59f8573a76e0dc41f5a8ae94fb46d991a..689f5ca2a5075f413b25eca8cfda90535f36f56f 100644 (file)
@@ -119,7 +119,7 @@ void UniscribeController::advance(unsigned offset, GlyphBuffer* glyphBuffer)
     const SimpleFontData* fontData;
     const SimpleFontData* nextFontData = m_font.glyphDataForCharacter(*curr, false).fontData;
 
     const SimpleFontData* fontData;
     const SimpleFontData* nextFontData = m_font.glyphDataForCharacter(*curr, false).fontData;
 
-    UChar newC;
+    UChar newC = 0;
 
     bool isSmallCaps;
     bool nextIsSmallCaps = m_font.isSmallCaps() && !(U_GET_GC_MASK(*curr) & U_GC_M_MASK) && (newC = u_toupper(*curr)) != *curr;
 
     bool isSmallCaps;
     bool nextIsSmallCaps = m_font.isSmallCaps() && !(U_GET_GC_MASK(*curr) & U_GC_M_MASK) && (newC = u_toupper(*curr)) != *curr;