database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

fix(build): MCOL-5612 const func pointer assignement must happen after func definition to satisfy modern compilers static analyzer (#3039)

Browse Source 
Co-authored-by: Roman Nozdrin <rnozdrin@mariadb.com>
This commit is contained in:
drrtuy
2023-11-29 18:34:10 +02:00
committed by GitHub
parent cbbffb63f4
commit aa0cf1399b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/passwd/secrets.cpp
View File

@ -36,12 +36,11 @@
using std::string; using std::string;
#ifdef OPENSSL_VERSION_PREREQ #ifdef OPENSSL_VERSION_PREREQ
#if OPENSSL_VERSION_PREREQ(3,0) #if OPENSSL_VERSION_PREREQ(3, 0)
#define EVP_CIPHER_key_length EVP_CIPHER_get_key_length #define EVP_CIPHER_key_length EVP_CIPHER_get_key_length
#define EVP_CIPHER_iv_length EVP_CIPHER_get_iv_length #define EVP_CIPHER_iv_length EVP_CIPHER_get_iv_length
#define EVP_CIPHER_blocksize EVP_CIPHER_get_blocksize #define EVP_CIPHER_blocksize EVP_CIPHER_get_blocksize
#endif #endif
#endif #endif
@ -97,10 +96,6 @@ void CSPasswdLogging::log(int priority, const char* format, ...)
namespace namespace
{ {
using HexLookupTable = std::array<uint8_t, 256>; using HexLookupTable = std::array<uint8_t, 256>;
HexLookupTable init_hex_lookup_table() noexcept;
// Hex char -> byte val lookup table.
const HexLookupTable hex_lookup_table = init_hex_lookup_table();
/* used in the bin2hex function */ /* used in the bin2hex function */
const char hex_upper[] = "0123456789ABCDEF"; const char hex_upper[] = "0123456789ABCDEF";
@ -135,6 +130,9 @@ HexLookupTable init_hex_lookup_table() noexcept
return rval; return rval;
} }
// Hex char -> byte val lookup table.
const HexLookupTable hex_lookup_table = init_hex_lookup_table();
bool hex2bin(const char* in, unsigned int in_len, uint8_t* out) bool hex2bin(const char* in, unsigned int in_len, uint8_t* out)
{ {
// Input length must be multiple of two. // Input length must be multiple of two.