kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/audio/zinf/files/patch-io_wavout_src_wavoutpmo.cpp

20 lines
612 B
C++
Raw Normal View History

Cleanup patches, a* categories. Rename them to follow the make makepatch naming, and regenerate them. With hat: portmgr Sponsored by: Absolight
2016-07-26 18:51:15 +02:00
--- io/wavout/src/wavoutpmo.cpp.orig 2003-09-16 17:35:07 UTC
+++ io/wavout/src/wavoutpmo.cpp
@@ -28,7 +28,6 @@ ________________________________________
#endif
#include <stdio.h>
#include <stdlib.h>
-#include <malloc.h>
#include <string>
/* project headers */
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
2017-02-03 01:46:44 +01:00
@@ -124,7 +124,7 @@ Init(OutputInfo* info)
// it, appending an ! to the filename, and changing the extention
// to wav
std::string path;
- char *pPtr = strrchr(GetUrl().c_str(), DIR_MARKER);
+ const char *pPtr = strrchr(GetUrl().c_str(), DIR_MARKER);
if (pPtr){
path = pPtr+1;
pPtr = strrchr(path.c_str(), '.');
Reference in a new issue Copy permalink