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

clang-format-3.5

This commit is contained in:
Tatsuhiro Tsujikawa 2015-10-15 21:42:11 +09:00
parent bb43b8e4c1
commit 54bf225692
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shrpx_log.cc
View File

@ -364,8 +364,8 @@ int reopen_log_files() {
lgconf->accesslog_fd = new_accesslog_fd; lgconf->accesslog_fd = new_accesslog_fd;
lgconf->errorlog_fd = new_errorlog_fd; lgconf->errorlog_fd = new_errorlog_fd;
lgconf->errorlog_tty = (new_errorlog_fd == -1) ? lgconf->errorlog_tty =
false : isatty(new_errorlog_fd); (new_errorlog_fd == -1) ? false : isatty(new_errorlog_fd);
return res; return res;
} }

21
src/util.cc
View File

@ -659,9 +659,7 @@ void store_original_fds() {
make_socket_closeonexec(STDERR_COPY); make_socket_closeonexec(STDERR_COPY);
} }
void restore_original_fds() { void restore_original_fds() { dup2(STDERR_COPY, STDERR_FILENO); }
dup2(STDERR_COPY, STDERR_FILENO);
}
void close_log_file(int &fd) { void close_log_file(int &fd) {
if (fd != STDERR_COPY && fd != STDOUT_COPY && fd != -1) { if (fd != STDERR_COPY && fd != STDOUT_COPY && fd != -1) {
@ -771,8 +769,8 @@ bool check_h2_is_selected(const unsigned char *proto, size_t len) {
namespace { namespace {
bool select_proto(const unsigned char **out, unsigned char *outlen, bool select_proto(const unsigned char **out, unsigned char *outlen,
const unsigned char *in, unsigned int inlen, const char *key, const unsigned char *in, unsigned int inlen, const char *key,
unsigned int keylen) { unsigned int keylen) {
for (auto p = in, end = in + inlen; p + keylen <= end; p += *p + 1) { for (auto p = in, end = in + inlen; p + keylen <= end; p += *p + 1) {
if (std::equal(key, key + keylen, p)) { if (std::equal(key, key + keylen, p)) {
*out = p + 1; *out = p + 1;
@ -787,17 +785,19 @@ bool select_proto(const unsigned char **out, unsigned char *outlen,
bool select_h2(const unsigned char **out, unsigned char *outlen, bool select_h2(const unsigned char **out, unsigned char *outlen,
const unsigned char *in, unsigned int inlen) { const unsigned char *in, unsigned int inlen) {
return select_proto(out, outlen, in, inlen, NGHTTP2_PROTO_ALPN, return select_proto(out, outlen, in, inlen, NGHTTP2_PROTO_ALPN,
str_size(NGHTTP2_PROTO_ALPN)) || str_size(NGHTTP2_PROTO_ALPN)) ||
select_proto(out, outlen, in, inlen, NGHTTP2_H2_16_ALPN, select_proto(out, outlen, in, inlen, NGHTTP2_H2_16_ALPN,
str_size(NGHTTP2_H2_16_ALPN)) || str_size(NGHTTP2_H2_16_ALPN)) ||
select_proto(out, outlen, in, inlen, NGHTTP2_H2_14_ALPN, select_proto(out, outlen, in, inlen, NGHTTP2_H2_14_ALPN,
str_size(NGHTTP2_H2_14_ALPN)); str_size(NGHTTP2_H2_14_ALPN));
} }
bool select_protocol(const unsigned char **out, unsigned char *outlen, bool select_protocol(const unsigned char **out, unsigned char *outlen,
const unsigned char *in, unsigned int inlen, std::vector<std::string> proto_list) { const unsigned char *in, unsigned int inlen,
std::vector<std::string> proto_list) {
for (const auto &proto : proto_list) { for (const auto &proto : proto_list) {
if (select_proto(out, outlen, in, inlen, proto.c_str(), static_cast<unsigned int>(proto.size()))) { if (select_proto(out, outlen, in, inlen, proto.c_str(),
static_cast<unsigned int>(proto.size()))) {
return true; return true;
} }
} }
@ -818,7 +818,6 @@ std::vector<unsigned char> get_default_alpn() {
return res; return res;
} }
std::vector<Range<const char *>> split_config_str_list(const char *s, std::vector<Range<const char *>> split_config_str_list(const char *s,
char delim) { char delim) {
size_t len = 1; size_t len = 1;

3
src/util.h
View File

@ -579,7 +579,8 @@ bool select_h2(const unsigned char **out, unsigned char *outlen,
// present in |in| of length inlen. Returns true if identifier is // present in |in| of length inlen. Returns true if identifier is
// selected. // selected.
bool select_protocol(const unsigned char **out, unsigned char *outlen, bool select_protocol(const unsigned char **out, unsigned char *outlen,
const unsigned char *in, unsigned int inlen, std::vector<std::string> proto_list); const unsigned char *in, unsigned int inlen,
std::vector<std::string> proto_list);
// Returns default ALPN protocol list, which only contains supported // Returns default ALPN protocol list, which only contains supported
// HTTP/2 protocol identifier. // HTTP/2 protocol identifier.