[addonlib] Change 'char*' return value to 'const char*' to fix compil…

…er warnings on addon lib
opdenkamp · Feb 15, 2015 · 6497342 · 6497342
1 parent 973f62f
commit 6497342
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/addons/pvr.dvbviewer/src/DvbData.cpp b/addons/pvr.dvbviewer/src/DvbData.cpp
@@ -1283,7 +1283,7 @@ CStdString Dvb::BuildExtURL(const CStdString& baseURL, const char* path, ...)
 
 CStdString Dvb::ConvertToUtf8(const CStdString& src)
 {
-  char *tmp = XBMC->UnknownToUTF8(src);
+  const char *tmp = XBMC->UnknownToUTF8(src);
   CStdString dest(tmp);
   XBMC->FreeString(tmp);
   return dest;

diff --git a/addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp b/addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp
@@ -1372,7 +1372,7 @@ int cPVRClientNextPVR::ReadLiveStream(unsigned char *pBuffer, unsigned int iBuff
       // is it taking too long?
       if (read_timeouts > 200)
       {
-        char *str = XBMC->GetLocalizedString(30053);
+        const char *str = XBMC->GetLocalizedString(30053);
         bufferMore = false;
         if (str != NULL)
         {

diff --git a/addons/pvr.vdr.vnsi/src/VNSIData.cpp b/addons/pvr.vdr.vnsi/src/VNSIData.cpp
@@ -1041,8 +1041,8 @@ void *cVNSIData::Process()
       if (vresp->getRequestID() == VNSI_STATUS_MESSAGE)
       {
         uint32_t type = vresp->extract_U32();
-        char* msgstr  = vresp->extract_String();
-        char* strMessageTranslated(NULL);
+        const char* msgstr  = vresp->extract_String();
+        const char* strMessageTranslated(NULL);
 
         if (g_bCharsetConv)
           strMessageTranslated = XBMC->UnknownToUTF8(msgstr);

diff --git a/xbmc/libXBMC_addon.h b/xbmc/libXBMC_addon.h
@@ -166,19 +166,19 @@ namespace ADDON
         dlsym(m_libXBMC_addon, "XBMC_wake_on_lan");
       if (XBMC_wake_on_lan == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
 
-      XBMC_unknown_to_utf8 = (char* (*)(void* HANDLE, void* CB, const char* str))
+      XBMC_unknown_to_utf8 = (const char* (*)(void* HANDLE, void* CB, const char* str))
         dlsym(m_libXBMC_addon, "XBMC_unknown_to_utf8");
       if (XBMC_unknown_to_utf8 == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
 
-      XBMC_get_localized_string = (char* (*)(void* HANDLE, void* CB, int dwCode))
+      XBMC_get_localized_string = (const char* (*)(void* HANDLE, void* CB, int dwCode))
         dlsym(m_libXBMC_addon, "XBMC_get_localized_string");
       if (XBMC_get_localized_string == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
 
-      XBMC_free_string = (void (*)(void* HANDLE, void* CB, char* str))
+      XBMC_free_string = (void (*)(void* HANDLE, void* CB, const char* str))
         dlsym(m_libXBMC_addon, "XBMC_free_string");
       if (XBMC_free_string == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
 
-      XBMC_get_dvd_menu_language = (char* (*)(void* HANDLE, void* CB))
+      XBMC_get_dvd_menu_language = (const char* (*)(void* HANDLE, void* CB))
         dlsym(m_libXBMC_addon, "XBMC_get_dvd_menu_language");
       if (XBMC_get_dvd_menu_language == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
 
@@ -318,7 +318,7 @@ namespace ADDON
      * @param str The string to translate.
      * @return The string translated to UTF8. Must be freed by calling FreeString() when done.
      */
-    char* UnknownToUTF8(const char* str)
+    const char* UnknownToUTF8(const char* str)
     {
       return XBMC_unknown_to_utf8(m_Handle, m_Callbacks, str);
     }
@@ -328,7 +328,7 @@ namespace ADDON
      * @param dwCode The code of the message to get.
      * @return The message. Must be freed by calling FreeString() when done.
      */
-    char* GetLocalizedString(int dwCode)
+    const char* GetLocalizedString(int dwCode)
     {
       return XBMC_get_localized_string(m_Handle, m_Callbacks, dwCode);
     }
@@ -338,7 +338,7 @@ namespace ADDON
      * @brief Get the DVD menu language.
      * @return The language. Must be freed by calling FreeString() when done.
      */
-    char* GetDVDMenuLanguage()
+    const char* GetDVDMenuLanguage()
     {
       return XBMC_get_dvd_menu_language(m_Handle, m_Callbacks);
     }
@@ -347,7 +347,7 @@ namespace ADDON
      * @brief Free the memory used by str
      * @param str The string to free
      */
-    void FreeString(char* str)
+    void FreeString(const char* str)
     {
       return XBMC_free_string(m_Handle, m_Callbacks, str);
     }
@@ -564,10 +564,10 @@ namespace ADDON
     bool (*XBMC_get_setting)(void *HANDLE, void* CB, const char* settingName, void *settingValue);
     void (*XBMC_queue_notification)(void *HANDLE, void* CB, const queue_msg_t type, const char *msg);
     bool (*XBMC_wake_on_lan)(void *HANDLE, void* CB, const char* mac);
-    char* (*XBMC_unknown_to_utf8)(void *HANDLE, void* CB, const char* str);
-    char* (*XBMC_get_localized_string)(void *HANDLE, void* CB, int dwCode);
-    char* (*XBMC_get_dvd_menu_language)(void *HANDLE, void* CB);
-    void (*XBMC_free_string)(void *HANDLE, void* CB, char* str);
+    const char* (*XBMC_unknown_to_utf8)(void *HANDLE, void* CB, const char* str);
+    const char* (*XBMC_get_localized_string)(void *HANDLE, void* CB, int dwCode);
+    const char* (*XBMC_get_dvd_menu_language)(void *HANDLE, void* CB);
+    void (*XBMC_free_string)(void *HANDLE, void* CB, const char* str);
     void* (*XBMC_open_file)(void *HANDLE, void* CB, const char* strFileName, unsigned int flags);
     void* (*XBMC_open_file_for_write)(void *HANDLE, void* CB, const char* strFileName, bool bOverWrite);
     ssize_t (*XBMC_read_file)(void *HANDLE, void* CB, void* file, void* lpBuf, size_t uiBufSize);