Author: glen Date: Tue May 19 12:34:37 2009 GMT Module: packages Tag: HEAD ---- Log message: - rather const start to "const char" - upstream bug is https://bugs.kde.org/show_bug.cgi?id=193242
---- Files affected: packages/kdelibs: kdelibs-gcc44.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/kdelibs/kdelibs-gcc44.patch diff -u packages/kdelibs/kdelibs-gcc44.patch:1.1 packages/kdelibs/kdelibs-gcc44.patch:1.2 --- packages/kdelibs/kdelibs-gcc44.patch:1.1 Tue May 19 14:01:36 2009 +++ packages/kdelibs/kdelibs-gcc44.patch Tue May 19 14:34:32 2009 @@ -1,23 +1,20 @@ +Upstream URL: https://bugs.kde.org/show_bug.cgi?id=193242 +Signed off by: Elan Ruusamäe <[email protected]> --- kdelibs-3.5.10/kioslave/ftp/ftp.cc~ 2009-05-19 14:57:21.000000000 +0300 +++ kdelibs-3.5.10/kioslave/ftp/ftp.cc 2009-05-19 14:57:24.016475767 +0300 -@@ -876,9 +876,9 @@ +@@ -876,5 +876,5 @@ // The usual answer is '227 Entering Passive Mode. (160,39,200,55,6,245)' // but anonftpd gives '227 =160,39,200,55,6,245' int i[6]; - char *start = strchr(ftpResponse(3), '('); -+ char *start = strchr((char *)ftpResponse(3), '('); ++ const char *start = strchr(ftpResponse(3), '('); if ( !start ) -- start = strchr(ftpResponse(3), '='); -+ start = strchr((char *)ftpResponse(3), '='); - if ( !start || - ( sscanf(start, "(%d,%d,%d,%d,%d,%d)",&i[0], &i[1], &i[2], &i[3], &i[4], &i[5]) != 6 && - sscanf(start, "=%d,%d,%d,%d,%d,%d", &i[0], &i[1], &i[2], &i[3], &i[4], &i[5]) != 6 ) ) @@ -931,7 +931,7 @@ return ERR_INTERNAL; } - char *start = strchr(ftpResponse(3), '|'); -+ char *start = strchr((char *)ftpResponse(3), '|'); ++ const char *start = strchr(ftpResponse(3), '|'); if ( !start || sscanf(start, "|||%d|", &portnum) != 1) return ERR_INTERNAL; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs-gcc44.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
