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

src: Prefer #ifdef for a single condition

This commit is contained in:
Tatsuhiro Tsujikawa 2021-10-15 22:29:05 +09:00
parent 9fb05d5ea2
commit c790ee64a4
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shrpx_config.cc
View File

@ -304,7 +304,7 @@ read_quic_secret_file(const StringRef &path) {
FILE *open_file_for_write(const char *filename) { FILE *open_file_for_write(const char *filename) {
std::array<char, STRERROR_BUFSIZE> errbuf; std::array<char, STRERROR_BUFSIZE> errbuf;
#if defined O_CLOEXEC #ifdef O_CLOEXEC
auto fd = open(filename, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC, auto fd = open(filename, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
#else #else

12
src/shrpx_connection.cc
View File

@ -503,9 +503,9 @@ int Connection::tls_handshake() {
// routine. We have to check HTTP/2 requirement if HTTP/2 was // routine. We have to check HTTP/2 requirement if HTTP/2 was
// negotiated before sending finished message to the peer. // negotiated before sending finished message to the peer.
if ((rv != 1 if ((rv != 1
#if defined(OPENSSL_IS_BORINGSSL) #ifdef OPENSSL_IS_BORINGSSL
|| SSL_in_init(tls.ssl) || SSL_in_init(tls.ssl)
#endif // defined(OPENSSL_IS_BORINGSSL) #endif // OPENSSL_IS_BORINGSSL
) && ) &&
tls.wbuf.rleft()) { tls.wbuf.rleft()) {
// First write indicates that resumption stuff has done. // First write indicates that resumption stuff has done.
@ -543,7 +543,7 @@ int Connection::tls_handshake() {
return SHRPX_ERR_INPROGRESS; return SHRPX_ERR_INPROGRESS;
} }
#if defined(OPENSSL_IS_BORINGSSL) #ifdef OPENSSL_IS_BORINGSSL
if (!tlsconf.no_postpone_early_data && SSL_in_early_data(tls.ssl) && if (!tlsconf.no_postpone_early_data && SSL_in_early_data(tls.ssl) &&
SSL_in_init(tls.ssl)) { SSL_in_init(tls.ssl)) {
auto nread = SSL_read(tls.ssl, buf.data(), buf.size()); auto nread = SSL_read(tls.ssl, buf.data(), buf.size());
@ -575,7 +575,7 @@ int Connection::tls_handshake() {
return SHRPX_ERR_INPROGRESS; return SHRPX_ERR_INPROGRESS;
} }
} }
#endif // defined(OPENSSL_IS_BORINGSSL) #endif // OPENSSL_IS_BORINGSSL
// Handshake was done // Handshake was done
@ -613,7 +613,7 @@ int Connection::write_tls_pending_handshake() {
tls.wbuf.drain(nwrite); tls.wbuf.drain(nwrite);
} }
#if defined(OPENSSL_IS_BORINGSSL) #ifdef OPENSSL_IS_BORINGSSL
if (!SSL_in_init(tls.ssl)) { if (!SSL_in_init(tls.ssl)) {
// This will send a session ticket. // This will send a session ticket.
auto nwrite = SSL_write(tls.ssl, "", 0); auto nwrite = SSL_write(tls.ssl, "", 0);
@ -641,7 +641,7 @@ int Connection::write_tls_pending_handshake() {
} }
} }
} }
#endif // defined(OPENSSL_IS_BORINGSSL) #endif // OPENSSL_IS_BORINGSSL
// We have to start read watcher, since later stage of code expects // We have to start read watcher, since later stage of code expects
// this. // this.

2
src/shrpx_log.cc
View File

@ -964,7 +964,7 @@ int open_log_file(const char *path) {
strcmp(path, "/proc/self/fd/2") == 0) { strcmp(path, "/proc/self/fd/2") == 0) {
return STDERR_COPY; return STDERR_COPY;
} }
#if defined O_CLOEXEC #ifdef O_CLOEXEC
auto fd = open(path, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, auto fd = open(path, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC,
S_IRUSR | S_IWUSR | S_IRGRP); S_IRUSR | S_IWUSR | S_IRGRP);

2
src/shrpx_tls.cc
View File

@ -2648,7 +2648,7 @@ int time_t_from_asn1_time(time_t &t, const ASN1_TIME *at) {
return -1; return -1;
} }
# if defined(OPENSSL_IS_BORINGSSL) # ifdef OPENSSL_IS_BORINGSSL
char *s; char *s;
# else # else
unsigned char *s; unsigned char *s;

6
src/ssl_compat.h
View File

@ -26,20 +26,20 @@
# include <openssl/opensslv.h> # include <openssl/opensslv.h>
# if defined(LIBRESSL_VERSION_NUMBER) # ifdef LIBRESSL_VERSION_NUMBER
# define OPENSSL_1_1_API 0 # define OPENSSL_1_1_API 0
# define OPENSSL_1_1_1_API 0 # define OPENSSL_1_1_1_API 0
# define OPENSSL_3_0_0_API 0 # define OPENSSL_3_0_0_API 0
# define LIBRESSL_IN_USE 1 # define LIBRESSL_IN_USE 1
# define LIBRESSL_LEGACY_API (LIBRESSL_VERSION_NUMBER < 0x20700000L) # define LIBRESSL_LEGACY_API (LIBRESSL_VERSION_NUMBER < 0x20700000L)
# define LIBRESSL_2_7_API (LIBRESSL_VERSION_NUMBER >= 0x20700000L) # define LIBRESSL_2_7_API (LIBRESSL_VERSION_NUMBER >= 0x20700000L)
# else // !defined(LIBRESSL_VERSION_NUMBER) # else // !LIBRESSL_VERSION_NUMBER
# define OPENSSL_1_1_API (OPENSSL_VERSION_NUMBER >= 0x1010000fL) # define OPENSSL_1_1_API (OPENSSL_VERSION_NUMBER >= 0x1010000fL)
# define OPENSSL_1_1_1_API (OPENSSL_VERSION_NUMBER >= 0x10101000L) # define OPENSSL_1_1_1_API (OPENSSL_VERSION_NUMBER >= 0x10101000L)
# define OPENSSL_3_0_0_API (OPENSSL_VERSION_NUMBER >= 0x30000000L) # define OPENSSL_3_0_0_API (OPENSSL_VERSION_NUMBER >= 0x30000000L)
# define LIBRESSL_IN_USE 0 # define LIBRESSL_IN_USE 0
# define LIBRESSL_LEGACY_API 0 # define LIBRESSL_LEGACY_API 0
# define LIBRESSL_2_7_API 0 # define LIBRESSL_2_7_API 0
# endif // !defined(LIBRESSL_VERSION_NUMBER) # endif // !LIBRESSL_VERSION_NUMBER
#endif // OPENSSL_COMPAT_H #endif // OPENSSL_COMPAT_H

6
src/util.cc
View File

@ -1649,7 +1649,7 @@ std::mt19937 make_mt19937() {
} }
int daemonize(int nochdir, int noclose) { int daemonize(int nochdir, int noclose) {
#if defined(__APPLE__) #ifdef __APPLE__
pid_t pid; pid_t pid;
pid = fork(); pid = fork();
if (pid == -1) { if (pid == -1) {
@ -1683,9 +1683,9 @@ int daemonize(int nochdir, int noclose) {
} }
} }
return 0; return 0;
#else // !defined(__APPLE__) #else // !__APPLE__
return daemon(nochdir, noclose); return daemon(nochdir, noclose);
#endif // !defined(__APPLE__) #endif // !__APPLE__
} }
#ifdef ENABLE_HTTP3 #ifdef ENABLE_HTTP3