ports/devel/gcvs/files/patch-common_CvsArgs.cpp
Jan Beich 9ad196a4cb devel/gcvs: unbreak with libc++ 3.9
AppGlue.cpp:263:9: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
                char *login = strchr(ccvsroot, '@');
                      ^       ~~~~~~~~~~~~~~~~~~~~~
CvsArgs.cpp:201:16: error: call to 'strchr' is ambiguous
                bool hasLF = strchr(newarg, '\n') != 0L;
                             ^~~~~~
CvsArgs.cpp:210:19: error: call to 'strchr' is ambiguous
                bool hasSpace = strchr(newarg, ' ') != 0L;
                                ^~~~~~
TextBinary.cpp:466:8: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
        char *tmp = strrchr(file, '.');
              ^     ~~~~~~~~~~~~~~~~~~
UCvsFiles.cpp:2020:12: error: call to 'strchr' is ambiguous
        if((tmp = strchr(r1, '.')) != 0L)
                  ^~~~~~
UCvsFiles.cpp:2028:12: error: call to 'strchr' is ambiguous
        if((tmp = strchr(r2, '.')) != 0L)
                  ^~~~~~
umenu.cpp:257:12: error: call to 'strchr' is ambiguous
        if((tmp = strchr(copy, '\t')) != 0L)
                  ^~~~~~
umenu.cpp:280:12: error: call to 'strchr' is ambiguous
        if((tmp = strchr(title, '&')) != 0L)
                  ^~~~~~

Reported by:	pkg-fallout
2017-02-01 20:23:02 +00:00

20 lines
632 B
C++

--- common/CvsArgs.cpp.orig 2002-06-27 19:02:08 UTC
+++ common/CvsArgs.cpp
@@ -198,7 +198,7 @@ void CvsArgs::print(const char *indirect
{
CStr newarg;
newarg = argv[i];
- bool hasLF = strchr(newarg, '\n') != 0L;
+ bool hasLF = strchr((const char*)newarg, '\n') != 0L;
size_t len = newarg.length();
if(len > MAX_PRINT_ARG)
@@ -207,7 +207,7 @@ void CvsArgs::print(const char *indirect
if(hasLF)
newarg = expandLF(newarg, buf);
- bool hasSpace = strchr(newarg, ' ') != 0L;
+ bool hasSpace = strchr((const char*)newarg, ' ') != 0L;
if(hasSpace)
cvs_out("\"");
cvs_outstr(newarg, newarg.length());