From: Niels Möller Date: Thu, 20 Aug 2020 20:15:28 +0000 (+0200) Subject: Indentation fixes X-Git-Tag: nettle_3.7rc1~76^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d5351e18ca7fc86b62e85558e7b84c5e0850317;p=thirdparty%2Fnettle.git Indentation fixes --- diff --git a/fat-ppc.c b/fat-ppc.c index d3482033..2bc50481 100644 --- a/fat-ppc.c +++ b/fat-ppc.c @@ -41,15 +41,15 @@ #include #if defined(_AIX) -#include +# include #elif defined(__linux__) -#include +# include #elif defined(__FreeBSD__) -#if __FreeBSD__ >= 12 -#include -#else -#include -#endif +# if __FreeBSD__ >= 12 +# include +# else +# include +# endif #endif #include "nettle-types.h" @@ -81,35 +81,35 @@ get_ppc_features (struct ppc_features *features) if (s) for (;;) { - const char *sep = strchr (s, ','); - size_t length = sep ? (size_t) (sep - s) : strlen(s); - - if (MATCH (s, length, "crypto_ext", 10)) - features->have_crypto_ext = 1; - if (!sep) - break; - s = sep + 1; + const char *sep = strchr (s, ','); + size_t length = sep ? (size_t) (sep - s) : strlen(s); + + if (MATCH (s, length, "crypto_ext", 10)) + features->have_crypto_ext = 1; + if (!sep) + break; + s = sep + 1; } else - { + { #if defined(_AIX) && defined(__power_8_andup) - features->have_crypto_ext = __power_8_andup() != 0 ? 1 : 0; -#else - unsigned long hwcap2 = 0; -#if defined(__linux__) - hwcap2 = getauxval(AT_HWCAP2); -#elif defined(__FreeBSD__) -#if __FreeBSD__ >= 12 - elf_aux_info(AT_HWCAP2, &hwcap2, sizeof(hwcap2)); + features->have_crypto_ext = __power_8_andup() != 0 ? 1 : 0; #else - size_t len = sizeof(hwcap2); - sysctlbyname("hw.cpu_features2", &hwcap2, &len, NULL, 0); -#endif -#endif - features->have_crypto_ext = - (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) == PPC_FEATURE2_VEC_CRYPTO ? 1 : 0; + unsigned long hwcap2 = 0; +# if defined(__linux__) + hwcap2 = getauxval(AT_HWCAP2); +# elif defined(__FreeBSD__) +# if __FreeBSD__ >= 12 + elf_aux_info(AT_HWCAP2, &hwcap2, sizeof(hwcap2)); +# else + size_t len = sizeof(hwcap2); + sysctlbyname("hw.cpu_features2", &hwcap2, &len, NULL, 0); +# endif +# endif + features->have_crypto_ext = + (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) == PPC_FEATURE2_VEC_CRYPTO ? 1 : 0; #endif - } + } } DECLARE_FAT_FUNC(_nettle_aes_encrypt, aes_crypt_internal_func) @@ -131,20 +131,20 @@ fat_init (void) verbose = getenv (ENV_VERBOSE) != NULL; if (verbose) fprintf (stderr, "libnettle: cpu features: %s\n", - features.have_crypto_ext ? "crypto extensions" : ""); + features.have_crypto_ext ? "crypto extensions" : ""); if (features.have_crypto_ext) - { - if (verbose) - fprintf (stderr, "libnettle: enabling arch 2.07 code.\n"); - _nettle_aes_encrypt_vec = _nettle_aes_encrypt_ppc64; - _nettle_aes_decrypt_vec = _nettle_aes_decrypt_ppc64; - } + { + if (verbose) + fprintf (stderr, "libnettle: enabling arch 2.07 code.\n"); + _nettle_aes_encrypt_vec = _nettle_aes_encrypt_ppc64; + _nettle_aes_decrypt_vec = _nettle_aes_decrypt_ppc64; + } else - { - _nettle_aes_encrypt_vec = _nettle_aes_encrypt_c; - _nettle_aes_decrypt_vec = _nettle_aes_decrypt_c; - } + { + _nettle_aes_encrypt_vec = _nettle_aes_encrypt_c; + _nettle_aes_decrypt_vec = _nettle_aes_decrypt_c; + } } DEFINE_FAT_FUNC(_nettle_aes_encrypt, void,