Skip to content

Avoid static std::string #2103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2025
Merged

Avoid static std::string #2103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions httplib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2050,6 +2050,10 @@ inline void duration_to_sec_and_usec(const T &duration, U callback) {
callback(static_cast<time_t>(sec), static_cast<time_t>(usec));
}

template <size_t N> inline constexpr size_t str_len(const char (&)[N]) {
return N - 1;
}

inline bool is_numeric(const std::string &str) {
return !str.empty() && std::all_of(str.begin(), str.end(), ::isdigit);
}
Expand Down Expand Up @@ -2209,9 +2213,9 @@ inline const char *status_message(int status) {

inline std::string get_bearer_token_auth(const Request &req) {
if (req.has_header("Authorization")) {
static std::string BearerHeaderPrefix = "Bearer ";
constexpr auto bearer_header_prefix_len = detail::str_len("Bearer ");
return req.get_header_value("Authorization")
.substr(BearerHeaderPrefix.length());
.substr(bearer_header_prefix_len);
}
return "";
}
Expand Down Expand Up @@ -4637,10 +4641,8 @@ write_content_chunked(Stream &strm, const ContentProvider &content_provider,
}
}

static const std::string done_marker("0\r\n");
if (!write_data(strm, done_marker.data(), done_marker.size())) {
ok = false;
}
constexpr const char done_marker[] = "0\r\n";
if (!write_data(strm, done_marker, str_len(done_marker))) { ok = false; }

// Trailer
if (trailer) {
Expand All @@ -4652,8 +4654,8 @@ write_content_chunked(Stream &strm, const ContentProvider &content_provider,
}
}

static const std::string crlf("\r\n");
if (!write_data(strm, crlf.data(), crlf.size())) { ok = false; }
constexpr const char crlf[] = "\r\n";
if (!write_data(strm, crlf, str_len(crlf))) { ok = false; }
};

data_sink.done = [&](void) { done_with_trailer(nullptr); };
Expand Down Expand Up @@ -4895,11 +4897,11 @@ class MultipartFormDataParser {
return false;
}

static const std::string header_content_type = "Content-Type:";
constexpr const char header_content_type[] = "Content-Type:";

if (start_with_case_ignore(header, header_content_type)) {
file_.content_type =
trim_copy(header.substr(header_content_type.size()));
trim_copy(header.substr(str_len(header_content_type)));
} else {
static const std::regex re_content_disposition(
R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~",
Expand Down Expand Up @@ -4996,10 +4998,10 @@ class MultipartFormDataParser {
file_.content_type.clear();
}

bool start_with_case_ignore(const std::string &a,
const std::string &b) const {
if (a.size() < b.size()) { return false; }
for (size_t i = 0; i < b.size(); i++) {
bool start_with_case_ignore(const std::string &a, const char *b) const {
const auto b_len = strlen(b);
if (a.size() < b_len) { return false; }
for (size_t i = 0; i < b_len; i++) {
if (case_ignore::to_lower(a[i]) != case_ignore::to_lower(b[i])) {
return false;
}
Expand Down Expand Up @@ -5086,7 +5088,7 @@ class MultipartFormDataParser {
};

inline std::string random_string(size_t length) {
static const char data[] =
constexpr const char data[] =
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

// std::random_device might actually be deterministic on some
Expand Down Expand Up @@ -6085,7 +6087,7 @@ inline time_t BufferStream::duration() const { return 0; }
inline const std::string &BufferStream::get_buffer() const { return buffer; }

inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) {
static constexpr char marker[] = "/:";
constexpr const char marker[] = "/:";

// One past the last ending position of a path param substring
std::size_t last_param_end = 0;
Expand All @@ -6106,7 +6108,7 @@ inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) {
static_fragments_.push_back(
pattern.substr(last_param_end, marker_pos - last_param_end + 1));

const auto param_name_start = marker_pos + 2;
const auto param_name_start = marker_pos + str_len(marker);

auto sep_pos = pattern.find(separator, param_name_start);
if (sep_pos == std::string::npos) { sep_pos = pattern.length(); }
Expand Down
Loading