blob: c9c9066449ded659a6d07a31ae530ef1dcb8b0ef (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
From 5fa10ff6b1b60abee172296d9c1dec8dfc10615c Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
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 <bernd.kuhls@t-online.de>
---
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
|
