patch-xbmc_filesystem_FTPParse_cpp 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071
  1. --- xbmc-17.3-Krypton.orig/xbmc/filesystem/FTPParse.cpp 2017-05-24 22:49:32.000000000 +0200
  2. +++ xbmc-17.3-Krypton/xbmc/filesystem/FTPParse.cpp 2017-07-22 21:01:29.538581226 +0200
  3. @@ -34,7 +34,7 @@ CFTPParse::CFTPParse()
  4. m_time = 0;
  5. }
  6. -string CFTPParse::getName()
  7. +std::string CFTPParse::getName()
  8. {
  9. return m_name;
  10. }
  11. @@ -59,16 +59,16 @@ time_t CFTPParse::getTime()
  12. return m_time;
  13. }
  14. -void CFTPParse::setTime(string str)
  15. +void CFTPParse::setTime(std::string str)
  16. {
  17. /* Variables used to capture patterns via the regexes */
  18. - string month;
  19. - string day;
  20. - string year;
  21. - string hour;
  22. - string minute;
  23. - string second;
  24. - string am_or_pm;
  25. + std::string month;
  26. + std::string day;
  27. + std::string year;
  28. + std::string hour;
  29. + std::string minute;
  30. + std::string second;
  31. + std::string am_or_pm;
  32. /* time struct used to set the time_t variable */
  33. struct tm time_struct = {};
  34. @@ -338,21 +338,21 @@ int CFTPParse::getDayOfWeek(int month, i
  35. return day_of_week;
  36. }
  37. -int CFTPParse::FTPParse(string str)
  38. +int CFTPParse::FTPParse(std::string str)
  39. {
  40. /* Various variable to capture patterns via the regexes */
  41. - string permissions;
  42. - string link_count;
  43. - string owner;
  44. - string group;
  45. - string size;
  46. - string date;
  47. - string name;
  48. - string type;
  49. - string stuff;
  50. - string facts;
  51. - string version;
  52. - string file_id;
  53. + std::string permissions;
  54. + std::string link_count;
  55. + std::string owner;
  56. + std::string group;
  57. + std::string size;
  58. + std::string date;
  59. + std::string name;
  60. + std::string type;
  61. + std::string stuff;
  62. + std::string facts;
  63. + std::string version;
  64. + std::string file_id;
  65. /* Regex for standard Unix listing formats */
  66. pcrecpp::RE unix_re("^([-bcdlps])" // type