Changeset 86153 in webkit

Timestamp:

May 10, 2011 8:25:02 AM (13 years ago)

Author:

alexis.menard@openbossa.org

Message:

2011-05-10 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Antonio Gomes.

Warning fix on PluginPackage.cpp.
​https://bugs.webkit.org/show_bug.cgi?id=60371

Warning fix on conversion from time_t to unsigned on Linux with GCC 4.6.0.
Let's use a struct rather than an array so we can pass everything to StringHasher.

• plugins/PluginPackage.cpp: (WebCore::PluginPackage::hash):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginPackage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-10  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Antonio Gomes.
+
+        Warning fix on PluginPackage.cpp.
+        https://bugs.webkit.org/show_bug.cgi?id=60371
+
+        Warning fix on conversion from time_t to unsigned on Linux with GCC 4.6.0.
+        Let's use a struct rather than an array so we can pass everything to StringHasher.
+
+        * plugins/PluginPackage.cpp:
+        (WebCore::PluginPackage::hash):
+
 2011-05-10  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/Source/WebCore/plugins/PluginPackage.cpp

@@ -344 +344 @@
 unsigned PluginPackage::hash() const
 {
-    unsigned hashCodes[] = {
-        m_path.impl()->hash(),
-        m_lastModified
-    };
-
-    return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
+    struct HashCodes {
+        unsigned hash;
+        time_t modifiedDate;
+    } hashCodes;
+
+    hashCodes.hash = m_path.impl()->hash();
+    hashCodes.modifiedDate = m_lastModified;
+
+    return StringHasher::hashMemory<sizeof(hashCodes)>(&hashCodes);
 }