mirror of
https://github.com/yhirose/cpp-httplib.git
synced 2026-10-29 12:50:51 +00:00
Run clang-format on httplib.h and test.cc
Fixes formatting introduced in199d7eeandd5f8858that clang-format 18.1.3 (the version used by CI) disagrees with.
This commit is contained in:
1 parent
d5f8858731
commit
6303a99ce1
2 files changed
+23
-24
No files matched your search
@@ -4603,8 +4603,8 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
template <class Rep, class Period>
|
template <class Rep, class Period>
|
||||||
inline void
|
inline void WebSocket::set_read_timeout(
|
||||||
WebSocket::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
|
const std::chrono::duration<Rep, Period> &duration) {
|
||||||
detail::duration_to_sec_and_usec(
|
detail::duration_to_sec_and_usec(
|
||||||
duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
|
duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
|
||||||
}
|
}
|
||||||
@@ -6402,8 +6402,7 @@ inline ssize_t select_impl(socket_t sock, short events, time_t sec,
|
|||||||
|
|
||||||
// A negative timeout waits forever, poll's own convention. 0 keeps meaning
|
// A negative timeout waits forever, poll's own convention. 0 keeps meaning
|
||||||
// "return immediately", which callers here rely on to probe a socket.
|
// "return immediately", which callers here rely on to probe a socket.
|
||||||
auto timeout =
|
auto timeout = sec < 0 ? -1 : static_cast<int>(sec * 1000 + usec / 1000);
|
||||||
sec < 0 ? -1 : static_cast<int>(sec * 1000 + usec / 1000);
|
|
||||||
|
|
||||||
return handle_EINTR([&]() { return poll_wrapper(&pfd, 1, timeout); });
|
return handle_EINTR([&]() { return poll_wrapper(&pfd, 1, timeout); });
|
||||||
}
|
}
|
||||||
|
|||||||
+20
-20
@@ -22341,8 +22341,8 @@ TEST(WebSocketTest, RSVBitsMustBeZero) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Fail);
|
ws::impl::FrameRead::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22353,8 +22353,8 @@ TEST(WebSocketTest, RSVBitsMustBeZero) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Fail);
|
ws::impl::FrameRead::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22365,8 +22365,8 @@ TEST(WebSocketTest, RSVBitsMustBeZero) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Fail);
|
ws::impl::FrameRead::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22377,8 +22377,8 @@ TEST(WebSocketTest, RSVBitsMustBeZero) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Ok);
|
ws::impl::FrameRead::Ok);
|
||||||
EXPECT_EQ(ws::Opcode::Text, opcode);
|
EXPECT_EQ(ws::Opcode::Text, opcode);
|
||||||
EXPECT_EQ("Hello", payload);
|
EXPECT_EQ("Hello", payload);
|
||||||
@@ -22400,8 +22400,8 @@ TEST(WebSocketTest, ControlFrameValidation) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Fail);
|
ws::impl::FrameRead::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22415,8 +22415,8 @@ TEST(WebSocketTest, ControlFrameValidation) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Fail);
|
ws::impl::FrameRead::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22433,8 +22433,8 @@ TEST(WebSocketTest, ControlFrameValidation) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Fail);
|
ws::impl::FrameRead::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22449,8 +22449,8 @@ TEST(WebSocketTest, ControlFrameValidation) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Ok);
|
ws::impl::FrameRead::Ok);
|
||||||
EXPECT_EQ(ws::Opcode::Ping, opcode);
|
EXPECT_EQ(ws::Opcode::Ping, opcode);
|
||||||
EXPECT_EQ(125u, payload.size());
|
EXPECT_EQ(125u, payload.size());
|
||||||
@@ -22474,8 +22474,8 @@ TEST(WebSocketTest, PayloadLength64BitMSBMustBeZero) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Fail);
|
ws::impl::FrameRead::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22493,8 +22493,8 @@ TEST(WebSocketTest, PayloadLength64BitMSBMustBeZero) {
|
|||||||
ws::Opcode opcode;
|
ws::Opcode opcode;
|
||||||
std::string payload;
|
std::string payload;
|
||||||
bool fin;
|
bool fin;
|
||||||
EXPECT_EQ(ws::impl::read_websocket_frame(strm, opcode, payload, fin, false,
|
EXPECT_EQ(
|
||||||
1024),
|
ws::impl::read_websocket_frame(strm, opcode, payload, fin, false, 1024),
|
||||||
ws::impl::FrameRead::Ok);
|
ws::impl::FrameRead::Ok);
|
||||||
EXPECT_EQ(ws::Opcode::Text, opcode);
|
EXPECT_EQ(ws::Opcode::Text, opcode);
|
||||||
EXPECT_EQ("abc", payload);
|
EXPECT_EQ("abc", payload);
|
||||||
|
|||||||
Reference in new issue
Block a user