mirror of
https://git.freebsd.org/ports.git
synced 2025-07-14 15:59:18 -04:00
fabeb6eea8
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
34 lines
959 B
C++
34 lines
959 B
C++
--- plm/metadata/misc/misc.cpp.orig 2003-09-16 17:35:19 UTC
|
|
+++ plm/metadata/misc/misc.cpp
|
|
@@ -104,26 +104,11 @@ bool Misc::ReadMetaData(const char* url,
|
|
if(!strncasecmp(url, "file://", 7) && !metadata->Time())
|
|
{
|
|
RegistryItem *lmcItem = NULL;
|
|
- char* cp;
|
|
-
|
|
- cp = strrchr(url, '.');
|
|
- if(cp)
|
|
- {
|
|
- cp++;
|
|
-
|
|
- char temp[256];
|
|
-
|
|
- strcpy(temp, cp);
|
|
-
|
|
- cp = temp;
|
|
-
|
|
- while(*cp)
|
|
- {
|
|
- *cp = toupper(*cp);
|
|
- cp++;
|
|
- }
|
|
-
|
|
- string ext = temp;
|
|
+ const string temp(url);
|
|
+ size_t pos = temp.rfind('.');
|
|
+ if (pos != string::npos) {
|
|
+ string ext = temp.substr(++pos);
|
|
+ transform(ext.begin(), ext.end(), ext.begin(), ::toupper);
|
|
|
|
ExtensionMap::const_iterator iter = m_extensions.find(ext);
|
|
if(iter != m_extensions.end())
|