feedc0de/esphttpdutils
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Replace fmt::format with std::format

Browse Source
This commit is contained in:
0xFEEDC0DE64
2024-09-18 16:43:29 +02:00
parent 405224bffe
commit 1ef76d38e0
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -15,7 +15,6 @@ set(dependencies
cpputils cpputils
espchrono espchrono
espcpputils espcpputils
fmt
) )
idf_component_register( idf_component_register(

10
src/esphttpdutils.cpp
View File

@ -2,14 +2,12 @@
// system includes // system includes
#include <utility> #include <utility>
#include <format>
// esp-idf includes // esp-idf includes
#include <esp_log.h> #include <esp_log.h>
#include <http_parser.h> #include <http_parser.h>
// 3rdparty lib includes
#include <fmt/core.h>
// 3rdparty lib includes // 3rdparty lib includes
#include "espcppmacros.h" #include "espcppmacros.h"
@ -62,7 +60,7 @@ std::expected<void, std::string> urlverify(std::string_view str)
http_parser_url puri; http_parser_url puri;
http_parser_url_init(&puri); http_parser_url_init(&puri);
if (const auto result = http_parser_parse_url(str.data(), str.size(), 0, &puri); result != 0) if (const auto result = http_parser_parse_url(str.data(), str.size(), 0, &puri); result != 0)
return std::unexpected(fmt::format("http_parser_parse_url() failed with {}", result)); return std::unexpected(std::format("http_parser_parse_url() failed with {}", result));
return {}; return {};
} }
@ -91,7 +89,7 @@ std::expected<std::string, std::string> webserver_get_query(httpd_req_t *req)
{ {
query.resize(queryLength); query.resize(queryLength);
if (const auto result = httpd_req_get_url_query_str(req, query.data(), query.size() + 1); result != ESP_OK) if (const auto result = httpd_req_get_url_query_str(req, query.data(), query.size() + 1); result != ESP_OK)
return std::unexpected(fmt::format("httpd_req_get_url_query_str() failed with {}", esp_err_to_name(result))); return std::unexpected(std::format("httpd_req_get_url_query_str() failed with {}", esp_err_to_name(result)));
} }
return query; return query;
@ -109,7 +107,7 @@ std::string toString(httpd_ws_type_t val)
case HTTPD_WS_TYPE_PONG: return "HTTPD_WS_TYPE_PONG"; break; case HTTPD_WS_TYPE_PONG: return "HTTPD_WS_TYPE_PONG"; break;
} }
ESP_LOGW(TAG, "Unknown httpd_ws_type_t(%i)", std::to_underlying(val)); ESP_LOGW(TAG, "Unknown httpd_ws_type_t(%i)", std::to_underlying(val));
return fmt::format("Unknown httpd_ws_type_t({})", std::to_underlying(val)); return std::format("Unknown httpd_ws_type_t({})", std::to_underlying(val));
} }
} // namespace esphttpdutils } // namespace esphttpdutils