summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Muratov <gpm@hotplug.ru>2023-05-02 10:42:31 +0200
committerEmil Muratov <gpm@hotplug.ru>2023-05-02 10:42:31 +0200
commit242e8e9d43cb4d7e9ddc6852152efa7c2e243fdf (patch)
tree8a407148aa7415ca8031586f487655b9e535a5c1
parentMerge pull request #16 from SCratORS/master (diff)
downloadFTPCLientServer-242e8e9d43cb4d7e9ddc6852152efa7c2e243fdf.tar
FTPCLientServer-242e8e9d43cb4d7e9ddc6852152efa7c2e243fdf.tar.gz
FTPCLientServer-242e8e9d43cb4d7e9ddc6852152efa7c2e243fdf.tar.bz2
FTPCLientServer-242e8e9d43cb4d7e9ddc6852152efa7c2e243fdf.tar.lz
FTPCLientServer-242e8e9d43cb4d7e9ddc6852152efa7c2e243fdf.tar.xz
FTPCLientServer-242e8e9d43cb4d7e9ddc6852152efa7c2e243fdf.tar.zst
FTPCLientServer-242e8e9d43cb4d7e9ddc6852152efa7c2e243fdf.zip
-rw-r--r--FTPClient.cpp2
-rw-r--r--FTPClient.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/FTPClient.cpp b/FTPClient.cpp
index 4ea31be..dd3457c 100644
--- a/FTPClient.cpp
+++ b/FTPClient.cpp
@@ -220,7 +220,7 @@ int8_t FTPClient::controlConnect()
return -1;
}
-bool FTPClient::waitFor(const int16_t respCode, const __FlashStringHelper *errorString, uint32_t timeOutMs)
+bool FTPClient::waitFor(const int16_t respCode, const String &errorString, uint32_t timeOutMs)
{
// initalize waiting
if (!aTimeout.canExpire())
diff --git a/FTPClient.h b/FTPClient.h
index 05a1bf3..228d975 100644
--- a/FTPClient.h
+++ b/FTPClient.h
@@ -110,7 +110,7 @@ protected:
int8_t controlConnect(); // connects to ServerInfo, returns -1: no connection possible, +1: connection established
- bool waitFor(const int16_t respCode, const __FlashStringHelper *errorString = nullptr, uint32_t timeOut = 10000);
+ bool waitFor(const int16_t respCode, const String &errorString = (const char*)NULL, uint32_t timeOut = 10000);
};
#endif // FTP_CLIENT_H