From 5fa19386916d96d36e7e2ae9669c57b3bb6f99b7 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 14 Oct 2017 11:45:41 +0900 Subject: [PATCH] clang-format --- src/memchunk.h | 4 ++-- src/util.cc | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/memchunk.h b/src/memchunk.h index 9b5e014ac8..84602619e9 100644 --- a/src/memchunk.h +++ b/src/memchunk.h @@ -31,8 +31,8 @@ #ifdef _WIN32 /* Structure for scatter/gather I/O. */ struct iovec { - void *iov_base; /* Pointer to data. */ - size_t iov_len; /* Length of data. */ + void *iov_base; /* Pointer to data. */ + size_t iov_len; /* Length of data. */ }; #else #include diff --git a/src/util.cc b/src/util.cc index 8837274b03..6686149a62 100644 --- a/src/util.cc +++ b/src/util.cc @@ -72,26 +72,24 @@ namespace util { #ifdef _WIN32 // 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 - return InetPtonA(af, src, dst); + return InetPtonA(af, src, dst); #else // the function takes a 'char*', so we need to make a copy char addr[INET6_ADDRSTRLEN + 1]; strncpy(addr, src, sizeof(addr)); - addr[sizeof(addr)-1] = 0; + addr[sizeof(addr) - 1] = 0; int size = sizeof(struct in6_addr); if (WSAStringToAddress(addr, af, NULL, (LPSOCKADDR)dst, &size) == 0) - return 1; + return 1; return 0; #endif } #endif // _WIN32 - const char UPPER_XDIGITS[] = "0123456789ABCDEF"; 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; // 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) -static const std::locale ptime_locale(std::locale::classic(), - new bt::time_input_facet("%a, %d %b %Y %H:%M:%S GMT")); +static const std::locale + ptime_locale(std::locale::classic(), + new bt::time_input_facet("%a, %d %b %Y %H:%M:%S GMT")); #endif //_WIN32 time_t parse_http_date(const StringRef &s) { @@ -395,7 +394,7 @@ time_t parse_http_date(const StringRef &s) { bt::ptime ltime; sstr >> ltime; if (!sstr) - return 0; + return 0; return boost::posix_time::to_time_t(ltime); #else @@ -936,7 +935,7 @@ int create_nonblock_socket(int family) { bool check_socket_connected(int fd) { int 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; } @@ -946,7 +945,7 @@ bool check_socket_connected(int fd) { int get_socket_error(int fd) { int 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; }