sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-01 15:41:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'strftime_overkill' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-25 11:24:03 -07:00
parent e41abce40e ace2fce3a2
commit 183e1268d9
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
esphome/core/time.cpp
View File

@@ -46,23 +46,17 @@ struct tm ESPTime::to_c_tm() {
return c_tm; return c_tm;
} }
std::string ESPTime::strftime(const std::string &format) { std::string ESPTime::strftime(const char *format, size_t format_len) {
std::string timestr;
timestr.resize(format.size() * 4);
struct tm c_tm = this->to_c_tm(); struct tm c_tm = this->to_c_tm();
size_t len = ::strftime(&timestr[0], timestr.size(), format.c_str(), &c_tm); char buf[128];
while (len == 0) { size_t len = ::strftime(buf, sizeof(buf), format, &c_tm);
if (timestr.size() >= 128) { if (len > 0) {
// strftime has failed for reasons unrelated to the size of the buffer return std::string(buf, len);
// so return a formatting error }
return "ERROR"; return "ERROR";
} }
timestr.resize(timestr.size() * 2);
len = ::strftime(&timestr[0], timestr.size(), format.c_str(), &c_tm); std::string ESPTime::strftime(const std::string &format) { return this->strftime(format.c_str(), format.size()); }
}
timestr.resize(len);
return timestr;
}
bool ESPTime::strptime(const std::string &time_to_parse, ESPTime &esp_time) { bool ESPTime::strptime(const std::string &time_to_parse, ESPTime &esp_time) {
uint16_t year; uint16_t year;

12
esphome/core/time.h
View File

@@ -44,17 +44,19 @@ struct ESPTime {
size_t strftime(char *buffer, size_t buffer_len, const char *format); size_t strftime(char *buffer, size_t buffer_len, const char *format);
/** Convert this ESPTime struct to a string as specified by the format argument. /** Convert this ESPTime struct to a string as specified by the format argument.
* @see https://www.gnu.org/software/libc/manual/html_node/Formatting-Calendar-Time.html#index-strftime * @see https://en.cppreference.com/w/c/chrono/strftime
* *
* @warning This method uses dynamically allocated strings which can cause heap fragmentation with some * @warning This method returns a dynamically allocated string which can cause heap fragmentation with some
* microcontrollers. * microcontrollers.
* *
* @warning This method can return "ERROR" when the underlying strftime() call fails, e.g. when the * @warning This method can return "ERROR" when the underlying strftime() call fails or when the
* format string contains unsupported specifiers or when the format string doesn't produce any * output exceeds 128 bytes.
* output.
*/ */
std::string strftime(const std::string &format); std::string strftime(const std::string &format);
/// @copydoc strftime(const std::string &format)
std::string strftime(const char *format, size_t format_len = 0);
/// Check if this ESPTime is valid (all fields in range and year is greater than 2018) /// Check if this ESPTime is valid (all fields in range and year is greater than 2018)
bool is_valid() const { return this->year >= 2019 && this->fields_in_range(); } bool is_valid() const { return this->year >= 2019 && this->fields_in_range(); }