Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bump clang-format pre-commit hooks

Browse source 
This brings in slightly better formatting around uniform initialization,
and comments after blocks not surrounded by `{ .. }`.
This commit is contained in:
Benjamin Bannier 2024-12-09 15:50:49 +01:00
parent 0ebcd9608f
commit 97c0df29d4
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pre-commit-config.yaml
View file

@ -3,7 +3,7 @@
# #
repos: repos:
- repo: https://github.com/pre-commit/mirrors-clang-format - repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v18.1.8' rev: 'v19.1.4'
hooks: hooks:
- id: clang-format - id: clang-format
types_or: types_or:

6
src/DNS_Mgr.cc
View file

@ -318,7 +318,7 @@ static void addrinfo_cb(void* arg, int status, int timeouts, struct ares_addrinf
// Push a null on the end so the addr list has a final point during later parsing. // Push a null on the end so the addr list has a final point during later parsing.
addrs.push_back(NULL); addrs.push_back(NULL);
struct hostent he {}; struct hostent he{};
he.h_name = util::copy_string(result->name); he.h_name = util::copy_string(result->name);
he.h_addrtype = AF_INET; he.h_addrtype = AF_INET;
he.h_length = sizeof(in_addr); he.h_length = sizeof(in_addr);
@ -333,7 +333,7 @@ static void addrinfo_cb(void* arg, int status, int timeouts, struct ares_addrinf
// Push a null on the end so the addr list has a final point during later parsing. // Push a null on the end so the addr list has a final point during later parsing.
addrs6.push_back(NULL); addrs6.push_back(NULL);
struct hostent he {}; struct hostent he{};
he.h_name = util::copy_string(result->name); he.h_name = util::copy_string(result->name);
he.h_addrtype = AF_INET6; he.h_addrtype = AF_INET6;
he.h_length = sizeof(in6_addr); he.h_length = sizeof(in6_addr);
@ -370,7 +370,7 @@ static void query_cb(void* arg, ares_status_t status, size_t timeouts, const are
} }
} }
else { else {
struct hostent he {}; struct hostent he{};
uint32_t ttl = 0; uint32_t ttl = 0;
size_t rr_cnt = ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER); size_t rr_cnt = ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER);

2
src/Debug.cc
View file

@ -417,7 +417,7 @@ int dbg_init_debugger(const char* cmdfile) {
// ### Implement this // ### Implement this
debug_msg("Command files not supported. Using interactive mode.\n"); debug_msg("Command files not supported. Using interactive mode.\n");
// ### if ( interactive ) (i.e., not reading cmds from a file) // ### if ( interactive ) (i.e., not reading cmds from a file)
#ifdef HAVE_READLINE #ifdef HAVE_READLINE
init_readline(); init_readline();
#endif #endif

6
src/file_analysis/analyzer/x509/X509.cc
View file

@ -308,9 +308,9 @@ void X509::ParseExtensionsSpecific(X509_EXTENSION* ex, bool global, ASN1_OBJECT*
else if ( OBJ_obj2nid(ext_asn) == NID_subject_alt_name ) else if ( OBJ_obj2nid(ext_asn) == NID_subject_alt_name )
ParseSAN(ex); ParseSAN(ex);
// In OpenSSL 1.0.2+, we can get the extension by using NID_ct_precert_scts. // In OpenSSL 1.0.2+, we can get the extension by using NID_ct_precert_scts.
// In OpenSSL <= 1.0.1, this is not yet defined yet, so we have to manually // In OpenSSL <= 1.0.1, this is not yet defined yet, so we have to manually
// look it up by performing a string comparison on the oid. // look it up by performing a string comparison on the oid.
#ifdef NID_ct_precert_scts #ifdef NID_ct_precert_scts
else if ( OBJ_obj2nid(ext_asn) == NID_ct_precert_scts ) else if ( OBJ_obj2nid(ext_asn) == NID_ct_precert_scts )
#else #else

3
src/script_opt/CPP/RuntimeVec.cc
View file

@ -82,8 +82,7 @@ static VectorTypePtr base_vector_type__CPP(const VectorTypePtr& vt, bool is_bool
// Instantiates a double_kernel for a given operation. // Instantiates a double_kernel for a given operation.
#define VEC_OP1_WITH_DOUBLE(name, op) \ #define VEC_OP1_WITH_DOUBLE(name, op) \
VEC_OP1( \ VEC_OP1( \
name, op, case TYPE_INTERNAL_DOUBLE \ name, op, case TYPE_INTERNAL_DOUBLE : { \
: { \
VEC_OP1_KERNEL(AsDouble, DoubleVal, op) \ VEC_OP1_KERNEL(AsDouble, DoubleVal, op) \
break; \ break; \
}) })