diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2017-02-03 00:46:44 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2017-02-03 00:46:44 +0000 |
commit | fabeb6eea8b895335f427f3acbe0e3310c5c0c91 (patch) | |
tree | 5907ce0b16c53ec088332d363bbcab0582d8b8cb /audio/zinf/files/patch-base_src_downloadmanager.cpp | |
parent | Update to upstream bugfix revision #1. (diff) |
audio/zinf: unbreak with libc++ 3.9
src/Http.cpp:771:11: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
char* cp = strstr(buffer, "Content-Length:");
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/downloadmanager.cpp:401:15: error: cannot initialize a variable of type 'char *' with an rvalue
of type 'const char *'
char* extension = strrchr(url, '.');
^ ~~~~~~~~~~~~~~~~~
src/downloadmanager.cpp:561:11: error: cannot initialize a variable of type 'char *' with an rvalue
of type 'const char *'
char* cp = strstr(buffer, "Content-Length:");
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/downloadmanager.cpp:575:11: error: cannot initialize a variable of type 'char *' with an rvalue
of type 'const char *'
char* cp = strstr(buffer, "Last-Modified:");
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/downloadmanager.cpp:799:24: error: assigning to 'char *' from incompatible type 'const char *'
file = strchr(item->SourceURL().c_str() + 7, '/');
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/player.cpp:552:21: error: assigning to 'char *' from incompatible type 'const char *'
extension = strrchr(url.c_str(), '.');
^~~~~~~~~~~~~~~~~~~~~~~~~
src/player.cpp:1109:17: error: assigning to 'char *' from incompatible type 'const char *'
temp_proto = strstr(title, "://");
^~~~~~~~~~~~~~~~~~~~
src/player.cpp:1129:15: error: assigning to 'char *' from incompatible type 'const char *'
temp_ext = strrchr(title, '.');
^~~~~~~~~~~~~~~~~~~
src/player.cpp:1964:14: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char *port = strchr(buffer.c_str(),':');
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~
src/playlist.cpp:1964:15: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char* extension = strrchr(url, '.');
^ ~~~~~~~~~~~~~~~~~
src/playlist.cpp:2045:15: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char* extension = strrchr(url, '.');
^ ~~~~~~~~~~~~~~~~~
src/ThemeZip.cpp:150:15: error: assigning to 'char *' from incompatible type 'const char *'
pPtr = strrchr(oFile.c_str(), DIR_MARKER);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/wavoutpmo.cpp:127:10: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char *pPtr = strrchr(GetUrl().c_str(), DIR_MARKER);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ZinfTheme.cpp:1768:26: error: assigning to 'char *' from incompatible type 'const char *'
pExtension = strrchr((*i).c_str(), '.');
^~~~~~~~~~~~~~~~~~~~~~~~~~
pPtr = strrchr(m_oPath.c_str(), '/');
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
unix/src/cdpmo.cpp:116:10: error: cannot initialize a variable of type 'char *' with an rvalue of
type 'const char *'
char *tracknumber = strrchr(url, '/');
^ ~~~~~~~~~~~~~~~~~
unix/src/GTKPreferenceWindow.cpp:1755:20: error: cannot initialize a variable of type 'char *' with
an rvalue of type 'const char *'
char *name = strrchr((*i).second.c_str(), '/');
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
unix/src/gtkmusicbrowser.cpp:1206:11: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
char *ext = strrchr(m_currentListName.c_str(), '.');
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
misc.cpp:109:14: error: assigning to 'char *' from incompatible type 'const char *'
cp = strrchr(url, '.');
^~~~~~~~~~~~~~~~~
id3lib.cpp:366:11: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char *ptr = strrchr(url, '.');
^ ~~~~~~~~~~~~~~~~~
id3lib.cpp:426:11: error: assigning to 'char *' from incompatible type 'const char *'
ptr = strrchr(url, '.');
^~~~~~~~~~~~~~~~~
id3lib.cpp:488:11: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char *ptr = strrchr(url.c_str(), '.');
^ ~~~~~~~~~~~~~~~~~~~~~~~~~
vorbis.cpp:151:11: error: assigning to 'char *' from incompatible type 'const char *'
ptr = strrchr(url, '.');
^~~~~~~~~~~~~~~~~
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=433187
Diffstat (limited to 'audio/zinf/files/patch-base_src_downloadmanager.cpp')
-rw-r--r-- | audio/zinf/files/patch-base_src_downloadmanager.cpp | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/audio/zinf/files/patch-base_src_downloadmanager.cpp b/audio/zinf/files/patch-base_src_downloadmanager.cpp new file mode 100644 index 000000000000..eaebd03877b8 --- /dev/null +++ b/audio/zinf/files/patch-base_src_downloadmanager.cpp @@ -0,0 +1,38 @@ +--- base/src/downloadmanager.cpp.orig 2003-09-16 17:34:53 UTC ++++ base/src/downloadmanager.cpp +@@ -398,7 +398,7 @@ Error DownloadManager::ReadDownloadFile( + { + // find a suitable plugin + result = kError_FormatNotSupported; +- char* extension = strrchr(url, '.'); ++ const char* extension = strrchr(url, '.'); + + if(extension) + { +@@ -558,7 +558,7 @@ static int32_t GetContentLengthFromHeade + { + int32_t result = -1; + +- char* cp = strstr(buffer, "Content-Length:"); ++ const char* cp = strstr(buffer, "Content-Length:"); + + if(cp) + { +@@ -572,7 +572,7 @@ static int32_t GetContentLengthFromHeade + + static void GetContentTimeFromHeader(const char* buffer, string &mTime) + { +- char* cp = strstr(buffer, "Last-Modified:"); ++ const char* cp = strstr(buffer, "Last-Modified:"); + if(cp) + { + string::size_type pos; +@@ -748,7 +748,7 @@ Error DownloadManager::Download(Download + struct sockaddr_in addr; + struct hostent host; + SOCKET s = -1; +- char* file = NULL; ++ const char* file = NULL; + bool useProxy; + struct stat st; + string destPath; |