refactor: simplify #if (!)defined directives to #ifdef or #ifndef

leoossa · leoossa · commit fa7d9c43ea6e · 2025-11-10T21:39:45.000+01:00
Signed-off-by: Leonard Ossa &lt;leonard.ossa@openvpn.com&gt;
diff --git a/client/ovpncli.cpp b/client/ovpncli.cpp
@@ -21,7 +21,7 @@
 
 // Set up export of our public interface unless
 // OPENVPN_CORE_API_VISIBILITY_HIDDEN is defined
-#if defined(__GNUC__)
+#ifdef __GNUC__
 #define OPENVPN_CLIENT_EXPORT
 #ifndef OPENVPN_CORE_API_VISIBILITY_HIDDEN
 #pragma GCC visibility push(default)
@@ -860,7 +860,7 @@ OPENVPN_CLIENT_EXPORT void OpenVPNClient::process_epki_cert_chain(const External
 
 OPENVPN_CLIENT_EXPORT Status OpenVPNClient::connect()
 {
-#if !defined(OPENVPN_OVPNCLI_SINGLE_THREAD)
+#ifndef OPENVPN_OVPNCLI_SINGLE_THREAD
     openvpn_io::detail::signal_blocker signal_blocker; // signals should be handled by parent thread
 #endif
 #if defined(OPENVPN_LOG_LOGTHREAD_H) && !defined(OPENVPN_LOG_LOGBASE_H)
@@ -882,7 +882,7 @@ OPENVPN_CLIENT_EXPORT Status OpenVPNClient::do_connect()
     try
     {
         connect_attach();
-#if defined(OPENVPN_OVPNCLI_ASYNC_SETUP)
+#ifdef OPENVPN_OVPNCLI_ASYNC_SETUP
         openvpn_io::post(*state->io_context(), [this]()
                          { do_connect_async(); });
 #else
@@ -953,18 +953,18 @@ OPENVPN_CLIENT_EXPORT void OpenVPNClient::connect_setup(Status &status, bool &se
     cc.extra_peer_info = state->extra_peer_info;
     cc.stop = state->async_stop_local();
     cc.socket_protect = &state->socket_protect;
-#if defined(USE_TUN_BUILDER)
+#ifdef USE_TUN_BUILDER
     cc.builder = this;
 #endif
-#if defined(OPENVPN_EXTERNAL_TUN_FACTORY)
+#ifdef OPENVPN_EXTERNAL_TUN_FACTORY
     cc.extern_tun_factory = this;
 #endif
-#if defined(OPENVPN_EXTERNAL_TRANSPORT_FACTORY)
+#ifdef OPENVPN_EXTERNAL_TRANSPORT_FACTORY
     cc.extern_transport_factory = this;
 #endif
 
     // external PKI
-#if !defined(USE_APPLE_SSL)
+#ifndef USE_APPLE_SSL
     if (state->eval.externalPki && !state->clientconf.disableClientCert)
     {
         if (!state->clientconf.external_pki_alias.empty())
diff --git a/openvpn/client/cliopt.hpp b/openvpn/client/cliopt.hpp
@@ -57,16 +57,16 @@
 #include <openvpn/transport/gremlin.hpp>
 #endif
 
-#if defined(OPENVPN_PLATFORM_ANDROID)
+#ifdef OPENVPN_PLATFORM_ANDROID
 #include <openvpn/client/cliemuexr.hpp>
 #endif
 
-#if defined(OPENVPN_EXTERNAL_TRANSPORT_FACTORY)
+#ifdef OPENVPN_EXTERNAL_TRANSPORT_FACTORY
 #include <openvpn/transport/client/extern/config.hpp>
 #include <openvpn/transport/client/extern/fw.hpp>
 #endif
 
-#if defined(OPENVPN_EXTERNAL_TUN_FACTORY)
+#ifdef OPENVPN_EXTERNAL_TUN_FACTORY
 // requires that client implements ExternalTun::Factory::new_tun_factory
 #include <openvpn/tun/extern/config.hpp>
 #elif defined(USE_TUN_BUILDER)
@@ -180,15 +180,15 @@ class ClientOptions : public RC<thread_unsafe_refcount>
         ReconnectNotify *reconnect_notify = nullptr;
         RemoteList::RemoteOverride *remote_override = nullptr;
 
-#if defined(USE_TUN_BUILDER)
+#ifdef USE_TUN_BUILDER
         TunBuilderBase *builder = nullptr;
 #endif
 
-#if defined(OPENVPN_EXTERNAL_TUN_FACTORY)
+#ifdef OPENVPN_EXTERNAL_TUN_FACTORY
         ExternalTun::Factory *extern_tun_factory = nullptr;
 #endif
 
-#if defined(OPENVPN_EXTERNAL_TRANSPORT_FACTORY)
+#ifdef OPENVPN_EXTERNAL_TRANSPORT_FACTORY
         ExternalTransport::Factory *extern_transport_factory = nullptr;
 #endif
     };
@@ -360,15 +360,15 @@ class ClientOptions : public RC<thread_unsafe_refcount>
             tunconf.tun_prop.remote_list = remote_list;
             tunconf.stop = config.stop;
             tunconf.allow_local_dns_resolvers = config.clientconf.allowLocalDnsResolvers;
-#if defined(OPENVPN_PLATFORM_WIN)
+#ifdef OPENVPN_PLATFORM_WIN
             if (config.clientconf.tunPersist)
                 tunconf.tun_persist.reset(new TunWin::DcoTunPersist(true, TunWrapObjRetain::NO_RETAIN_NO_REPLACE, nullptr));
 #endif
             tun_factory = dco->new_tun_factory(tunconf, opt);
         }
         else
         {
-#if defined(OPENVPN_EXTERNAL_TUN_FACTORY)
+#ifdef OPENVPN_EXTERNAL_TUN_FACTORY
             {
                 ExternalTun::Config tunconf;
                 tunconf.tun_prop.layer = layer;
@@ -598,7 +598,7 @@ class ClientOptions : public RC<thread_unsafe_refcount>
      * string property (if applicable)  */
     static std::tuple<bool, std::string> check_dco_compatibility(const ClientAPI::ConfigCommon &config, const OptionList &opt)
     {
-#if defined(ENABLE_KOVPN)
+#ifdef ENABLE_KOVPN
         // only care about dco/dco-win
         return std::make_tuple(true, "");
 #else
diff --git a/openvpn/common/endian.hpp b/openvpn/common/endian.hpp
@@ -14,7 +14,7 @@
 #include <openvpn/common/endian_platform.hpp>
 
 namespace openvpn::Endian {
-#if defined(OPENVPN_LITTLE_ENDIAN)
+#ifdef OPENVPN_LITTLE_ENDIAN
 inline size_t e16(const size_t v)
 {
     return v;
diff --git a/openvpn/common/endian64.hpp b/openvpn/common/endian64.hpp
@@ -32,7 +32,7 @@ inline std::uint64_t mingw_bswap64(const std::uint64_t val)
 inline std::uint64_t rev64(const std::uint64_t value)
 {
 #ifdef OPENVPN_LITTLE_ENDIAN
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
     return _byteswap_uint64(value);
 #elif defined(__MINGW32__)
     return mingw_bswap64(value);
diff --git a/openvpn/common/ffs.hpp b/openvpn/common/ffs.hpp
@@ -20,7 +20,7 @@
 
 namespace openvpn {
 
-#if defined(__GNUC__)
+#ifdef __GNUC__
 
 template <typename T>
 inline constexpr int n_bits_type()
diff --git a/openvpn/common/file.hpp b/openvpn/common/file.hpp
@@ -25,7 +25,7 @@
 #include <openvpn/buffer/bufstr.hpp>
 #include <openvpn/buffer/buflist.hpp>
 
-#if defined(OPENVPN_PLATFORM_WIN)
+#ifdef OPENVPN_PLATFORM_WIN
 #include <filesystem>
 #include <openvpn/win/unicode.hpp>
 #endif
@@ -57,7 +57,7 @@ inline BufferPtr read_binary(const std::string &filename,
                              const std::uint64_t max_size = 0,
                              const BufferFlags buffer_flags = BufAllocFlags::NO_FLAGS)
 {
-#if defined(OPENVPN_PLATFORM_WIN)
+#ifdef OPENVPN_PLATFORM_WIN
     Win::UTF16 filenamew(Win::utf16(filename));
     std::filesystem::path path(filenamew.get());
     std::ifstream ifs(path, std::ios::binary);
diff --git a/openvpn/common/getopt.hpp b/openvpn/common/getopt.hpp
@@ -36,7 +36,7 @@
 #include <openvpn/common/size.hpp>
 #include <openvpn/common/exception.hpp>
 
-#if !defined(OPENVPN_PLATFORM_WIN)
+#ifndef OPENVPN_PLATFORM_WIN
 #include <getopt.h>
 #else
 
diff --git a/openvpn/common/getpw.hpp b/openvpn/common/getpw.hpp
@@ -14,7 +14,7 @@
 
 #include <openvpn/common/platform.hpp>
 
-#if !defined(OPENVPN_PLATFORM_WIN)
+#ifndef OPENVPN_PLATFORM_WIN
 #include <pwd.h>
 #include <unistd.h>
 #else
@@ -28,7 +28,7 @@
 namespace openvpn {
 inline std::string get_password(const char *prompt)
 {
-#if !defined(OPENVPN_PLATFORM_WIN)
+#ifndef OPENVPN_PLATFORM_WIN
     char *ret = getpass(prompt);
     return ret;
 #else
diff --git a/openvpn/common/jsonlib.hpp b/openvpn/common/jsonlib.hpp
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#if defined(HAVE_JSONCPP)
+#ifdef HAVE_JSONCPP
 #define HAVE_JSON
 #include "json/json.h" // JsonCpp library
 #elif defined(HAVE_OPENVPN_COMMON)
diff --git a/openvpn/common/likely.hpp b/openvpn/common/likely.hpp
@@ -14,7 +14,7 @@
 
 // Branch prediction hints (these make a difference on ARM)
 #if !defined(likely) && !defined(unlikely)
-#if defined(__GNUC__)
+#ifdef __GNUC__
 #define likely(x) __builtin_expect((x), 1)
 #define unlikely(x) __builtin_expect((x), 0)
 #else
diff --git a/openvpn/common/memneq.hpp b/openvpn/common/memneq.hpp
@@ -15,7 +15,7 @@
 #include <openvpn/common/size.hpp>
 #include <atomic>
 
-#if defined(USE_OPENSSL)
+#ifdef USE_OPENSSL
 #include <openssl/crypto.h>
 #endif
 
@@ -27,7 +27,7 @@
 
 // Define a portable compiler memory access fence (from Boost).
 
-#if defined(__INTEL_COMPILER)
+#ifdef __INTEL_COMPILER
 
 #define OPENVPN_COMPILER_FENCE __memory_barrier();
 
@@ -67,7 +67,7 @@ namespace openvpn::crypto {
  */
 inline bool memneq(const void *a, const void *b, size_t size);
 
-#if defined(USE_OPENSSL)
+#ifdef USE_OPENSSL
 inline bool memneq(const void *a, const void *b, size_t size)
 {
     // memcmp does return 0 (=false) when the memory is equal. It normally
diff --git a/openvpn/common/platform.hpp b/openvpn/common/platform.hpp
@@ -14,7 +14,7 @@
 #ifndef OPENVPN_COMMON_PLATFORM_H
 #define OPENVPN_COMMON_PLATFORM_H
 
-#if defined(_WIN32)
+#ifdef _WIN32
 #define OPENVPN_PLATFORM_WIN
 #if defined(__cplusplus_winrt)
 #include <winapifamily.h>
@@ -41,7 +41,7 @@
 #define OPENVPN_PLATFORM_LINUX
 #endif
 
-#if !defined(_WIN32)
+#ifndef _WIN32
 #define OPENVPN_PLATFORM_TYPE_UNIX
 #endif
 
diff --git a/openvpn/common/platform_name.hpp b/openvpn/common/platform_name.hpp
@@ -20,7 +20,7 @@ namespace openvpn {
 // return a string that describes our platform
 inline const char *platform_name()
 {
-#if defined(OPENVPN_PLATFORM_WIN)
+#ifdef OPENVPN_PLATFORM_WIN
 #if defined(OPENVPN_PLATFORM_UWP)
     return "uwp";
 #else
diff --git a/openvpn/common/platform_string.hpp b/openvpn/common/platform_string.hpp
@@ -27,11 +27,11 @@ inline std::string platform_string(const std::string &title, const std::string &
     if (!app_version.empty())
         os << app_version << '/';
     os << OPENVPN_VERSION;
-#if defined OPENVPN_CORE_GIT_VERSION
+#ifdef OPENVPN_CORE_GIT_VERSION
     os << "(" << OPENVPN_CORE_GIT_VERSION << ")";
 #endif
     os << ' ' << platform_name();
-#if defined(OPENVPN_ARCH_x86_64)
+#ifdef OPENVPN_ARCH_x86_64
     os << " x86_64";
 #elif defined(OPENVPN_ARCH_i386)
     os << " i386";
diff --git a/openvpn/common/process.hpp b/openvpn/common/process.hpp
@@ -46,7 +46,7 @@ inline pid_t system_cmd_async(const std::string &cmd,
     auto av = argv_wrap.c_argv();
     auto ev = env_wrap ? env_wrap->c_argv() : ::environ;
 
-#if defined(__APPLE__)
+#ifdef __APPLE__
     /* macOS vfork is deprecated and behaves identical to fork() */
     const pid_t pid = ::fork();
 #else
diff --git a/openvpn/common/signal.hpp b/openvpn/common/signal.hpp
@@ -14,7 +14,7 @@
 
 #include <openvpn/common/platform.hpp>
 
-#if !defined(OPENVPN_PLATFORM_WIN)
+#ifndef OPENVPN_PLATFORM_WIN
 
 #include <signal.h>
 
diff --git a/openvpn/common/tempfile.hpp b/openvpn/common/tempfile.hpp
@@ -14,7 +14,7 @@
 
 #include <openvpn/common/platform.hpp>
 
-#if defined(OPENVPN_PLATFORM_WIN)
+#ifdef OPENVPN_PLATFORM_WIN
 #error temporary file methods not supported on Windows
 #endif
 
diff --git a/openvpn/common/unreachable.hpp b/openvpn/common/unreachable.hpp
@@ -21,7 +21,7 @@ namespace openvpn {
     // Uses compiler specific extensions if possible.
     // Even if no extension is used, undefined behavior is still raised by
     // an empty function body and the noreturn attribute.
-#if defined(__GNUC__)
+#ifdef __GNUC__
     __builtin_unreachable();
 #elif defined(_MSC_VER)
     __assume(false);
diff --git a/openvpn/compress/compress.hpp b/openvpn/compress/compress.hpp
@@ -27,7 +27,7 @@
 namespace openvpn {
 
 //! Debugging level for message emitted from compression
-#if !defined(OPENVPN_DEBUG_COMPRESS)
+#ifndef OPENVPN_DEBUG_COMPRESS
 #define OPENVPN_DEBUG_COMPRESS 1
 #endif
 
diff --git a/openvpn/compress/lzoselect.hpp b/openvpn/compress/lzoselect.hpp
@@ -15,14 +15,14 @@
 #ifndef OPENVPN_COMPRESS_LZOSELECT_H
 #define OPENVPN_COMPRESS_LZOSELECT_H
 
-#if defined(HAVE_LZO)
+#ifdef HAVE_LZO
 #include <openvpn/compress/lzo.hpp>
 #else
 #include <openvpn/compress/lzoasym.hpp>
 #endif
 
 namespace openvpn {
-#if !defined(HAVE_LZO)
+#ifndef HAVE_LZO
 using CompressLZO = CompressLZOAsym;
 #endif
 } // namespace openvpn
diff --git a/openvpn/crypto/cryptochoose.hpp b/openvpn/crypto/cryptochoose.hpp
@@ -40,7 +40,7 @@
 #endif
 
 namespace openvpn::SSLLib {
-#if defined(USE_MBEDTLS)
+#ifdef USE_MBEDTLS
 #define SSL_LIB_NAME "MbedTLS"
 using CryptoAPI = MbedTLSCryptoAPI;
 #if defined OPENVPN_PLATFORM_UWP
diff --git a/openvpn/init/engineinit.hpp b/openvpn/init/engineinit.hpp
@@ -18,7 +18,7 @@
 
 #include <openvpn/common/arch.hpp>
 
-#if defined(USE_OPENSSL)
+#ifdef USE_OPENSSL
 #include <openvpn/openssl/util/engine.hpp>
 #include <openvpn/openssl/ssl/sslctx.hpp>
 #endif
@@ -34,7 +34,7 @@ namespace openvpn {
 
 inline void init_openssl(const std::string &engine)
 {
-#if defined(USE_OPENSSL)
+#ifdef USE_OPENSSL
     openssl_setup_engine(engine);
     OpenSSLContext::SSL::init_static();
 #elif defined(USE_MINICRYPTO) && (defined(OPENVPN_ARCH_x86_64) || defined(OPENVPN_ARCH_i386))
diff --git a/openvpn/ip/ping6.hpp b/openvpn/ip/ping6.hpp
@@ -30,7 +30,7 @@ namespace openvpn::Ping6 {
 
 inline static const std::uint16_t *get_addr16(const struct in6_addr *addr)
 {
-#if defined(_WIN32)
+#ifdef _WIN32
     return addr->u.Word;
 #elif defined(__APPLE__) || defined(__FreeBSD__)
     return addr->__u6_addr.__u6_addr16;
diff --git a/openvpn/openssl/ssl/sslctx.hpp b/openvpn/openssl/ssl/sslctx.hpp
@@ -721,7 +721,7 @@ class OpenSSLContext : public SSLFactoryAPI
             // Return maximum TLS version supported by OpenSSL.
             // Assume that presence of SSL_OP_NO_TLSvX macro indicates
             // that local OpenSSL library implements TLSvX.
-#if defined(SSL_OP_NO_TLSv1_3)
+#ifdef SSL_OP_NO_TLSv1_3
             return TLSVersion::Type::V1_3;
 #elif defined(SSL_OP_NO_TLSv1_2)
             return TLSVersion::Type::V1_2;
@@ -1388,7 +1388,7 @@ class OpenSSLContext : public SSLFactoryAPI
         {
             set_openssl_tls_groups(config->tls_groups);
         }
-#if defined(TLS1_3_VERSION)
+#ifdef TLS1_3_VERSION
         if (!config->tls_ciphersuite_list.empty())
         {
             if (!SSL_CTX_set_ciphersuites(ctx.get(), config->tls_ciphersuite_list.c_str()))
diff --git a/openvpn/openssl/util/error.hpp b/openvpn/openssl/util/error.hpp
@@ -160,7 +160,7 @@ class OpenSSLException : public ExceptionCode
             case SSL_R_CA_KEY_TOO_SMALL:
                 set_code(Error::SSL_CA_KEY_TOO_SMALL, true);
                 break;
-#if defined(SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED)
+#ifdef SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED
                 /* This error code has been added in OpenSSL 3.0.8 */
             case SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED:
                 set_code(Error::TLS_SIGALG_DISALLOWED_OR_UNSUPPORTED, true);
diff --git a/openvpn/openssl/xkey/xkey_common.h b/openvpn/openssl/xkey/xkey_common.h
diff --git a/openvpn/ssl/sslchoose.hpp b/openvpn/ssl/sslchoose.hpp
diff --git a/openvpn/time/cputime.hpp b/openvpn/time/cputime.hpp
diff --git a/openvpn/time/timestr.hpp b/openvpn/time/timestr.hpp
diff --git a/openvpn/transport/dco.hpp b/openvpn/transport/dco.hpp
diff --git a/openvpn/tun/extern/fw.hpp b/openvpn/tun/extern/fw.hpp
diff --git a/openvpn/tun/linux/client/tuncli.hpp b/openvpn/tun/linux/client/tuncli.hpp
diff --git a/test/ovpncli/cli.cpp b/test/ovpncli/cli.cpp
diff --git a/test/unittests/test_comp.cpp b/test/unittests/test_comp.cpp
diff --git a/test/unittests/test_proto.cpp b/test/unittests/test_proto.cpp
diff --git a/test/unittests/test_ssl.cpp b/test/unittests/test_ssl.cpp

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#include <openvpn/common/endian_platform.hpp>`
`15`	`15`
`16`	`16`	`namespace openvpn::Endian {`
`17`		`-#if defined(OPENVPN_LITTLE_ENDIAN)`
	`17`	`+#ifdef OPENVPN_LITTLE_ENDIAN`
`18`	`18`	`inline size_t e16(const size_t v)`
`19`	`19`	`{`
`20`	`20`	`return v;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ inline std::uint64_t mingw_bswap64(const std::uint64_t val)`
`32`	`32`	`inline std::uint64_t rev64(const std::uint64_t value)`
`33`	`33`	`{`
`34`	`34`	`#ifdef OPENVPN_LITTLE_ENDIAN`
`35`		`-#if defined(_MSC_VER)`
	`35`	`+#ifdef _MSC_VER`
`36`	`36`	`return _byteswap_uint64(value);`
`37`	`37`	`#elif defined(__MINGW32__)`
`38`	`38`	`return mingw_bswap64(value);`