walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

clang-format

This commit is contained in:
Tatsuhiro Tsujikawa 2017-10-14 11:45:41 +09:00
parent 56ee3d4820
commit 5fa1938691
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/memchunk.h
View File

@ -31,8 +31,8 @@
#ifdef _WIN32 #ifdef _WIN32
/* Structure for scatter/gather I/O. */ /* Structure for scatter/gather I/O. */
struct iovec { struct iovec {
void *iov_base; /* Pointer to data. */ void *iov_base; /* Pointer to data. */
size_t iov_len; /* Length of data. */ size_t iov_len; /* Length of data. */
}; };
#else #else
#include <sys/uio.h> #include <sys/uio.h>

21
src/util.cc
View File

@ -72,26 +72,24 @@ namespace util {
#ifdef _WIN32 #ifdef _WIN32
// inet_pton-wrapper for Windows // inet_pton-wrapper for Windows
static int inet_pton(int af, const char *src, void *dst) static int inet_pton(int af, const char *src, void *dst) {
{
#if _WIN32_WINNT >= 0x0600 #if _WIN32_WINNT >= 0x0600
return InetPtonA(af, src, dst); return InetPtonA(af, src, dst);
#else #else
// the function takes a 'char*', so we need to make a copy // the function takes a 'char*', so we need to make a copy
char addr[INET6_ADDRSTRLEN + 1]; char addr[INET6_ADDRSTRLEN + 1];
strncpy(addr, src, sizeof(addr)); strncpy(addr, src, sizeof(addr));
addr[sizeof(addr)-1] = 0; addr[sizeof(addr) - 1] = 0;
int size = sizeof(struct in6_addr); int size = sizeof(struct in6_addr);
if (WSAStringToAddress(addr, af, NULL, (LPSOCKADDR)dst, &size) == 0) if (WSAStringToAddress(addr, af, NULL, (LPSOCKADDR)dst, &size) == 0)
return 1; return 1;
return 0; return 0;
#endif #endif
} }
#endif // _WIN32 #endif // _WIN32
const char UPPER_XDIGITS[] = "0123456789ABCDEF"; const char UPPER_XDIGITS[] = "0123456789ABCDEF";
bool in_rfc3986_unreserved_chars(const char c) { bool in_rfc3986_unreserved_chars(const char c) {
@ -383,8 +381,9 @@ char *iso8601_date(char *res, int64_t ms) {
namespace bt = boost::posix_time; namespace bt = boost::posix_time;
// one-time definition of the locale that is used to parse UTC strings // one-time definition of the locale that is used to parse UTC strings
// (note that the time_input_facet is ref-counted and deleted automatically) // (note that the time_input_facet is ref-counted and deleted automatically)
static const std::locale ptime_locale(std::locale::classic(), static const std::locale
new bt::time_input_facet("%a, %d %b %Y %H:%M:%S GMT")); ptime_locale(std::locale::classic(),
new bt::time_input_facet("%a, %d %b %Y %H:%M:%S GMT"));
#endif //_WIN32 #endif //_WIN32
time_t parse_http_date(const StringRef &s) { time_t parse_http_date(const StringRef &s) {
@ -395,7 +394,7 @@ time_t parse_http_date(const StringRef &s) {
bt::ptime ltime; bt::ptime ltime;
sstr >> ltime; sstr >> ltime;
if (!sstr) if (!sstr)
return 0; return 0;
return boost::posix_time::to_time_t(ltime); return boost::posix_time::to_time_t(ltime);
#else #else
@ -936,7 +935,7 @@ int create_nonblock_socket(int family) {
bool check_socket_connected(int fd) { bool check_socket_connected(int fd) {
int error; int error;
socklen_t len = sizeof(error); socklen_t len = sizeof(error);
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len) != 0) { if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len) != 0) {
return false; return false;
} }
@ -946,7 +945,7 @@ bool check_socket_connected(int fd) {
int get_socket_error(int fd) { int get_socket_error(int fd) {
int error; int error;
socklen_t len = sizeof(error); socklen_t len = sizeof(error);
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len) != 0) { if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len) != 0) {
return -1; return -1;
} }