From 5fa10ff6b1b60abee172296d9c1dec8dfc10615c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 7 May 2017 17:30:47 +0300 Subject: [PATCH] FTPParse.cpp: use std::string Fixes build with newer gcc versions. Taken from [1] Upstream-Status: Backport [2] [1] https://git.busybox.net/buildroot/plain/package/kodi/0003-FTPParse.cpp-use-std-string.patch?id=e2f03a6bde19766a1ac047c5ccfb049b5c4f61ca [2] https://github.com/xbmc/xbmc/commit/5fa10ff6b1b60abee172296d9c1dec8dfc10615c Signed-off-by: Bernd Kuhls --- xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp index cfcc7c64ed..b0f676ae1a 100644 --- a/xbmc/filesystem/FTPParse.cpp +++ b/xbmc/filesystem/FTPParse.cpp @@ -34,7 +34,7 @@ CFTPParse::CFTPParse() m_time = 0; } -string CFTPParse::getName() +std::string CFTPParse::getName() { return m_name; } @@ -59,16 +59,16 @@ time_t CFTPParse::getTime() return m_time; } -void CFTPParse::setTime(string str) +void CFTPParse::setTime(std::string str) { /* Variables used to capture patterns via the regexes */ - string month; - string day; - string year; - string hour; - string minute; - string second; - string am_or_pm; + std::string month; + std::string day; + std::string year; + std::string hour; + std::string minute; + std::string second; + std::string am_or_pm; /* time struct used to set the time_t variable */ struct tm time_struct = {}; @@ -338,21 +338,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year) return day_of_week; } -int CFTPParse::FTPParse(string str) +int CFTPParse::FTPParse(std::string str) { /* Various variable to capture patterns via the regexes */ - string permissions; - string link_count; - string owner; - string group; - string size; - string date; - string name; - string type; - string stuff; - string facts; - string version; - string file_id; + std::string permissions; + std::string link_count; + std::string owner; + std::string group; + std::string size; + std::string date; + std::string name; + std::string type; + std::string stuff; + std::string facts; + std::string version; + std::string file_id; /* Regex for standard Unix listing formats */ pcrecpp::RE unix_re("^([-bcdlps])" // type -- 2.11.0