@@ -505,7 +505,7 @@ class TaskQueue {
505
505
virtual void enqueue (std::function<void ()> fn) = 0;
506
506
virtual void shutdown () = 0;
507
507
508
- virtual void on_idle (){}
508
+ virtual void on_idle () {}
509
509
};
510
510
511
511
class ThreadPool : public TaskQueue {
@@ -1663,14 +1663,12 @@ bool process_client_socket(socket_t sock, time_t read_timeout_sec,
1663
1663
time_t write_timeout_usec,
1664
1664
std::function<bool (Stream &)> callback);
1665
1665
1666
- socket_t create_client_socket (const char *host, const char *ip, int port, int address_family,
1667
- bool tcp_nodelay, SocketOptions socket_options,
1668
- time_t connection_timeout_sec,
1669
- time_t connection_timeout_usec,
1670
- time_t read_timeout_sec, time_t read_timeout_usec,
1671
- time_t write_timeout_sec,
1672
- time_t write_timeout_usec,
1673
- const std::string &intf, Error &error);
1666
+ socket_t create_client_socket (
1667
+ const char *host, const char *ip, int port, int address_family,
1668
+ bool tcp_nodelay, SocketOptions socket_options,
1669
+ time_t connection_timeout_sec, time_t connection_timeout_usec,
1670
+ time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
1671
+ time_t write_timeout_usec, const std::string &intf, Error &error);
1674
1672
1675
1673
const char *get_header_value (const Headers &headers, const char *key,
1676
1674
size_t id = 0 , const char *def = nullptr );
@@ -2209,25 +2207,22 @@ inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) {
2209
2207
return handle_EINTR ([&]() {
2210
2208
return recv (sock,
2211
2209
#ifdef _WIN32
2212
- static_cast <char *>(ptr),
2213
- static_cast <int >(size),
2210
+ static_cast <char *>(ptr), static_cast <int >(size),
2214
2211
#else
2215
- ptr,
2216
- size,
2212
+ ptr, size,
2217
2213
#endif
2218
2214
flags);
2219
2215
});
2220
2216
}
2221
2217
2222
- inline ssize_t send_socket (socket_t sock, const void *ptr, size_t size, int flags) {
2218
+ inline ssize_t send_socket (socket_t sock, const void *ptr, size_t size,
2219
+ int flags) {
2223
2220
return handle_EINTR ([&]() {
2224
2221
return send (sock,
2225
2222
#ifdef _WIN32
2226
- static_cast <const char *>(ptr),
2227
- static_cast <int >(size),
2223
+ static_cast <const char *>(ptr), static_cast <int >(size),
2228
2224
#else
2229
- ptr,
2230
- size,
2225
+ ptr, size,
2231
2226
#endif
2232
2227
flags);
2233
2228
});
@@ -2460,8 +2455,8 @@ inline int shutdown_socket(socket_t sock) {
2460
2455
}
2461
2456
2462
2457
template <typename BindOrConnect>
2463
- socket_t create_socket (const char *host, const char *ip, int port, int address_family,
2464
- int socket_flags, bool tcp_nodelay,
2458
+ socket_t create_socket (const char *host, const char *ip, int port,
2459
+ int address_family, int socket_flags, bool tcp_nodelay,
2465
2460
SocketOptions socket_options,
2466
2461
BindOrConnect bind_or_connect) {
2467
2462
// Get address info
@@ -2475,16 +2470,15 @@ socket_t create_socket(const char *host, const char *ip, int port, int address_f
2475
2470
hints.ai_protocol = 0 ;
2476
2471
2477
2472
// Ask getaddrinfo to convert IP in c-string to address
2478
- if (ip[0 ] != ' \0 ' ) {
2473
+ if (ip[0 ] != ' \0 ' ) {
2479
2474
hints.ai_family = AF_UNSPEC;
2480
2475
hints.ai_flags = AI_NUMERICHOST;
2481
2476
}
2482
2477
2483
2478
auto service = std::to_string (port);
2484
2479
2485
- if (ip[0 ] != ' \0 ' ?
2486
- getaddrinfo (ip, service.c_str (), &hints, &result) :
2487
- getaddrinfo (host, service.c_str (), &hints, &result)) {
2480
+ if (ip[0 ] != ' \0 ' ? getaddrinfo (ip, service.c_str (), &hints, &result)
2481
+ : getaddrinfo (host, service.c_str (), &hints, &result)) {
2488
2482
#if defined __linux__ && !defined __ANDROID__
2489
2483
res_init ();
2490
2484
#endif
@@ -2619,10 +2613,10 @@ inline std::string if2ip(const std::string &ifn) {
2619
2613
#endif
2620
2614
2621
2615
inline socket_t create_client_socket (
2622
- const char *host, const char *ip, int port, int address_family, bool tcp_nodelay,
2623
- SocketOptions socket_options, time_t connection_timeout_sec ,
2624
- time_t connection_timeout_usec , time_t read_timeout_sec ,
2625
- time_t read_timeout_usec, time_t write_timeout_sec,
2616
+ const char *host, const char *ip, int port, int address_family,
2617
+ bool tcp_nodelay, SocketOptions socket_options ,
2618
+ time_t connection_timeout_sec , time_t connection_timeout_usec ,
2619
+ time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
2626
2620
time_t write_timeout_usec, const std::string &intf, Error &error) {
2627
2621
auto sock = create_socket (
2628
2622
host, ip, port, address_family, 0 , tcp_nodelay, std::move (socket_options),
@@ -2996,9 +2990,7 @@ inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
2996
2990
2997
2991
ret = inflate (&strm_, Z_NO_FLUSH);
2998
2992
2999
- if (prev_avail_in - strm_.avail_in == 0 ) {
3000
- return false ;
3001
- }
2993
+ if (prev_avail_in - strm_.avail_in == 0 ) { return false ; }
3002
2994
3003
2995
assert (ret != Z_STREAM_ERROR);
3004
2996
switch (ret) {
@@ -4442,8 +4434,7 @@ inline SocketStream::SocketStream(socket_t sock, time_t read_timeout_sec,
4442
4434
: sock_(sock), read_timeout_sec_(read_timeout_sec),
4443
4435
read_timeout_usec_(read_timeout_usec),
4444
4436
write_timeout_sec_(write_timeout_sec),
4445
- write_timeout_usec_(write_timeout_usec),
4446
- read_buff_(read_buff_size_, 0 ) {}
4437
+ write_timeout_usec_(write_timeout_usec), read_buff_(read_buff_size_, 0 ) {}
4447
4438
4448
4439
inline SocketStream::~SocketStream () {}
4449
4440
@@ -4457,9 +4448,11 @@ inline bool SocketStream::is_writable() const {
4457
4448
4458
4449
inline ssize_t SocketStream::read (char *ptr, size_t size) {
4459
4450
#ifdef _WIN32
4460
- size = (std::min)(size, static_cast <size_t >((std::numeric_limits<int >::max)()));
4451
+ size =
4452
+ (std::min)(size, static_cast <size_t >((std::numeric_limits<int >::max)()));
4461
4453
#else
4462
- size = (std::min)(size, static_cast <size_t >((std::numeric_limits<ssize_t >::max)()));
4454
+ size = (std::min)(size,
4455
+ static_cast <size_t >((std::numeric_limits<ssize_t >::max)()));
4463
4456
#endif
4464
4457
4465
4458
if (read_buff_off_ < read_buff_content_size_) {
@@ -4481,7 +4474,8 @@ inline ssize_t SocketStream::read(char *ptr, size_t size) {
4481
4474
read_buff_content_size_ = 0 ;
4482
4475
4483
4476
if (size < read_buff_size_) {
4484
- auto n = read_socket (sock_, read_buff_.data (), read_buff_size_, CPPHTTPLIB_RECV_FLAGS);
4477
+ auto n = read_socket (sock_, read_buff_.data (), read_buff_size_,
4478
+ CPPHTTPLIB_RECV_FLAGS);
4485
4479
if (n <= 0 ) {
4486
4480
return n;
4487
4481
} else if (n <= static_cast <ssize_t >(size)) {
@@ -4502,7 +4496,8 @@ inline ssize_t SocketStream::write(const char *ptr, size_t size) {
4502
4496
if (!is_writable ()) { return -1 ; }
4503
4497
4504
4498
#ifdef _WIN32
4505
- size = (std::min)(size, static_cast <size_t >((std::numeric_limits<int >::max)()));
4499
+ size =
4500
+ (std::min)(size, static_cast <size_t >((std::numeric_limits<int >::max)()));
4506
4501
#endif
4507
4502
4508
4503
return send_socket (sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS);
@@ -5634,14 +5629,13 @@ inline socket_t ClientImpl::create_client_socket(Error &error) const {
5634
5629
// Check is custom IP specified for host_
5635
5630
std::string ip;
5636
5631
auto it = addr_map_.find (host_);
5637
- if (it != addr_map_.end ())
5638
- ip = it->second ;
5632
+ if (it != addr_map_.end ()) ip = it->second ;
5639
5633
5640
5634
return detail::create_client_socket (
5641
- host_.c_str (), ip.c_str (), port_, address_family_, tcp_nodelay_, socket_options_,
5642
- connection_timeout_sec_, connection_timeout_usec_, read_timeout_sec_ ,
5643
- read_timeout_usec_, write_timeout_sec_, write_timeout_usec_, interface_ ,
5644
- error);
5635
+ host_.c_str (), ip.c_str (), port_, address_family_, tcp_nodelay_,
5636
+ socket_options_, connection_timeout_sec_, connection_timeout_usec_ ,
5637
+ read_timeout_sec_, read_timeout_usec_, write_timeout_sec_ ,
5638
+ write_timeout_usec_, interface_, error);
5645
5639
}
5646
5640
5647
5641
inline bool ClientImpl::create_and_connect_socket (Socket &socket,
@@ -6766,7 +6760,8 @@ inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; }
6766
6760
6767
6761
inline void ClientImpl::set_url_encode (bool on) { url_encode_ = on; }
6768
6762
6769
- inline void ClientImpl::set_hostname_addr_map (const std::map<std::string, std::string> addr_map) {
6763
+ inline void ClientImpl::set_hostname_addr_map (
6764
+ const std::map<std::string, std::string> addr_map) {
6770
6765
addr_map_ = std::move (addr_map);
6771
6766
}
6772
6767
@@ -7895,7 +7890,8 @@ inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); }
7895
7890
7896
7891
inline void Client::stop () { cli_->stop (); }
7897
7892
7898
- inline void Client::set_hostname_addr_map (const std::map<std::string, std::string> addr_map) {
7893
+ inline void Client::set_hostname_addr_map (
7894
+ const std::map<std::string, std::string> addr_map) {
7899
7895
cli_->set_hostname_addr_map (std::move (addr_map));
7900
7896
}
7901
7897
0 commit comments