GetMIMEDescription should return const char *

https://bugs.webkit.org/show_bug.cgi?id=77297

Patch by John Yani <vanuan@gmail.com> on 2012-02-01
Reviewed by Alexey Proskuryakov.

No new tests. No change in behaviour.

* plugins/blackberry/PluginPackageBlackBerry.cpp:
(WebCore::PluginPackage::fetchInfo):
* plugins/efl/PluginPackageEfl.cpp:
(WebCore):
(WebCore::PluginPackage::fetchInfo):
* plugins/npapi.h:
* plugins/npfunctions.h:
* plugins/qt/PluginPackageQt.cpp:
(WebCore::PluginPackage::fetchInfo):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4d1b6f7..28d7841 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2012-02-01  John Yani  <vanuan@gmail.com>
+
+        GetMIMEDescription should return const char *
+        https://bugs.webkit.org/show_bug.cgi?id=77297
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests. No change in behaviour.
+
+        * plugins/blackberry/PluginPackageBlackBerry.cpp:
+        (WebCore::PluginPackage::fetchInfo):
+        * plugins/efl/PluginPackageEfl.cpp:
+        (WebCore):
+        (WebCore::PluginPackage::fetchInfo):
+        * plugins/npapi.h:
+        * plugins/npfunctions.h:
+        * plugins/qt/PluginPackageQt.cpp:
+        (WebCore::PluginPackage::fetchInfo):
+
 2012-02-01  Timothy Hatcher  <timothy@apple.com>
 
         Consolidate duplicate "willHide" functions in DetailedHeapshotView.js to fix

diff --git a/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp b/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp
index 8fd2435..33b5a7b 100644 (file)
--- a/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp
+++ b/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp
@@ -79,8 +79,7 @@ bool PluginPackage::fetchInfo()
     // We are fetching the info. Technically we have not loaded the plugin. PluginView::Init will load the plugin so decrement the counter
     m_loadCount--;
 
-    typedef char *(*NPP_GetMIMEDescriptionProcPtr)();
-    NPP_GetMIMEDescriptionProcPtr getDescription = (NPP_GetMIMEDescriptionProcPtr) dlsym(m_module, "NP_GetMIMEDescription");
+    NP_GetMIMEDescriptionFuncPtr getDescription = (NP_GetMIMEDescriptionFuncPtr) dlsym(m_module, "NP_GetMIMEDescription");
     NPP_GetValueProcPtr getValue = (NPP_GetValueProcPtr) dlsym(m_module, "NP_GetValue");
 
     if (!getDescription || !getValue)

diff --git a/Source/WebCore/plugins/efl/PluginPackageEfl.cpp b/Source/WebCore/plugins/efl/PluginPackageEfl.cpp
index a7b0a0b..a6016d9 100644 (file)
--- a/Source/WebCore/plugins/efl/PluginPackageEfl.cpp
+++ b/Source/WebCore/plugins/efl/PluginPackageEfl.cpp
@@ -43,8 +43,6 @@
 
 namespace WebCore {
 
-typedef char* (*NPP_GetMIMEDescriptionProcPtr)();
-
 bool PluginPackage::fetchInfo()
 {
     const char *errmsg;
@@ -53,7 +51,7 @@ bool PluginPackage::fetchInfo()
         return false;
 
     NPP_GetValueProcPtr getValue = 0;
-    NPP_GetMIMEDescriptionProcPtr getMIMEDescription = 0;
+    NP_GetMIMEDescriptionFuncPtr getMIMEDescription = 0;
 
     getValue = reinterpret_cast<NPP_GetValueProcPtr>(dlsym(m_module, "NP_GetValue"));
     if ((errmsg = dlerror())) {
@@ -61,7 +59,7 @@ bool PluginPackage::fetchInfo()
         return false;
     }
 
-    getMIMEDescription = reinterpret_cast<NPP_GetMIMEDescriptionProcPtr>(dlsym(m_module, "NP_GetMIMEDescription"));
+    getMIMEDescription = reinterpret_cast<NP_GetMIMEDescriptionFuncPtr>(dlsym(m_module, "NP_GetMIMEDescription"));
     if ((errmsg = dlerror())) {
         EINA_LOG_ERR("Could not get symbol NP_GetMIMEDescription: %s", errmsg);
         return false;

diff --git a/Source/WebCore/plugins/npapi.h b/Source/WebCore/plugins/npapi.h
index 00c68de..1de47e8 100644 (file)
--- a/Source/WebCore/plugins/npapi.h
+++ b/Source/WebCore/plugins/npapi.h
@@ -791,7 +791,7 @@ extern "C" {
 /* NPP_* functions are provided by the plugin and called by the navigator. */
 
 #if defined(XP_UNIX)
-char* NPP_GetMIMEDescription(void);
+const char* NPP_GetMIMEDescription(void);
 #endif
 
 NPError NP_LOADDS NPP_Initialize(void);

diff --git a/Source/WebCore/plugins/npfunctions.h b/Source/WebCore/plugins/npfunctions.h
index c54e473..0d4f3fc 100644 (file)
--- a/Source/WebCore/plugins/npfunctions.h
+++ b/Source/WebCore/plugins/npfunctions.h
@@ -211,7 +211,7 @@ typedef NPError (*MainFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*, NPP_ShutdownPro
 
 #if defined(XP_UNIX)
 typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*);
-typedef EXPORTED_CALLBACK(char*, NP_GetMIMEDescriptionFuncPtr)(void);
+typedef EXPORTED_CALLBACK(const char*, NP_GetMIMEDescriptionFuncPtr)(void);
 #else
 typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*);
 #endif

diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
index 3a9d96a..72d83c4 100644 (file)
--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
@@ -41,9 +41,8 @@ bool PluginPackage::fetchInfo()
         return false;
 
     NPP_GetValueProcPtr gv = (NPP_GetValueProcPtr)m_module->resolve("NP_GetValue");
-    typedef char *(*NPP_GetMIMEDescriptionProcPtr)();
-    NPP_GetMIMEDescriptionProcPtr gm =
-        (NPP_GetMIMEDescriptionProcPtr)m_module->resolve("NP_GetMIMEDescription");
+    NP_GetMIMEDescriptionFuncPtr gm =
+        (NP_GetMIMEDescriptionFuncPtr)m_module->resolve("NP_GetMIMEDescription");
     if (!gm || !gv)
         return false;