github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-24 13:34:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure new stringref functions work

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-17 08:42:11 -10:00
parent 18c3dd8af7
commit 1550a6af72
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/string_ref.h
+8 -8
View File
@@ -81,26 +81,26 @@ class StringRef {
operator std::string() const { return str(); }
/// Find first occurrence of substring, returns npos if not found
static constexpr size_type npos = static_cast<size_type>(-1);
/// Find first occurrence of substring, returns NPOS if not found
static constexpr size_type NPOS = static_cast<size_type>(-1);
size_type find(const char *s, size_type pos = 0) const {
if (pos >= len_)
return npos;
return NPOS;
const char *result = std::strstr(base_ + pos, s);
return result ? static_cast<size_type>(result - base_) : npos;
return result ? static_cast<size_type>(result - base_) : NPOS;
}
size_type find(char c, size_type pos = 0) const {
if (pos >= len_)
return npos;
return NPOS;
const char *result = std::strchr(base_ + pos, c);
return (result && result < base_ + len_) ? static_cast<size_type>(result - base_) : npos;
return (result && result < base_ + len_) ? static_cast<size_type>(result - base_) : NPOS;
}
/// Return substring as std::string
std::string substr(size_type pos = 0, size_type count = npos) const {
std::string substr(size_type pos = 0, size_type count = NPOS) const {
if (pos >= len_)
return std::string();
size_type actual_count = (count == npos || pos + count > len_) ? len_ - pos : count;
size_type actual_count = (count == NPOS || pos + count > len_) ? len_ - pos : count;
return std::string(base_ + pos, actual_count);
}