Update sources to Clang 18 formatting

(cherry picked from commit f454fa6dea)
This commit is contained in:
Michal Nowak 2024-04-23 16:33:07 +02:00
parent d5ebd68295
commit 99eb2ebaa9
No known key found for this signature in database
17 changed files with 20 additions and 42 deletions

View file

@ -152,11 +152,11 @@
#endif /* HAVE_LMDB */
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
#define SIZE_MAX ((size_t) - 1)
#endif /* ifndef SIZE_MAX */
#ifndef SIZE_AS_PERCENT
#define SIZE_AS_PERCENT ((size_t)-2)
#define SIZE_AS_PERCENT ((size_t) - 2)
#endif /* ifndef SIZE_AS_PERCENT */
#ifdef TUNE_LARGE

View file

@ -874,7 +874,7 @@ bulk_write(char type, DB *database, DBC *dbcursor, DBT *bdbkey, DBT *bdbdata) {
printf("d %.*s\n", (int)retdlen, retdata);
}
} /* end of for (DB_MULTIPLE_INIT....) */
} /* end of for (;;) */
} /* end of for (;;) */
/* free the buffer we created earlier */
free(bdbdata->data);

View file

@ -726,7 +726,7 @@ ldap_get_results(const char *zone, const char *record, const char *client,
goto cleanup;
break;
} /* close switch(ldap_result) */
} /* end for (int i = 0 i < 3; i++) */
} /* end for (int i = 0 i < 3; i++) */
if (result != ISC_R_SUCCESS) {
goto cleanup;

View file

@ -813,7 +813,7 @@ odbc_process_rs(dns_sdlzlookup_t *lookup, dbinstance_t *dbi) {
ttl, data);
}
} /* closes bid if () */
} /* closes switch(fields) */
} /* closes switch(fields) */
/* clean up mem */
if (ttl_s != NULL) {

View file

@ -19,7 +19,7 @@
* Called when we enter the DLL
*/
__declspec(dllexport) BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
/*
* The DLL is loading due to process

View file

@ -18,7 +18,7 @@
* Called when we enter the DLL
*/
__declspec(dllexport) BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
/*
* The DLL is loading due to process

View file

@ -157,7 +157,7 @@ typedef struct {
typedef uint32_t librpz_idx_t;
#define LIBRPZ_IDX_NULL 0
#define LIBRPZ_IDX_MIN 1
#define LIBRPZ_IDX_BAD ((librpz_idx_t)-1)
#define LIBRPZ_IDX_BAD ((librpz_idx_t) - 1)
/**
* Partial decoded results of a set of RPZ queries for a single DNS response
* or iteration through the mapped file.

View file

@ -88,7 +88,7 @@ typedef uint8_t dns_rpz_num_t;
*/
typedef uint64_t dns_rpz_zbits_t;
#define DNS_RPZ_ALL_ZBITS ((dns_rpz_zbits_t)-1)
#define DNS_RPZ_ALL_ZBITS ((dns_rpz_zbits_t) - 1)
#define DNS_RPZ_INVALID_NUM DNS_RPZ_MAX_ZONES

View file

@ -53,30 +53,8 @@ log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, bool early, char *log_buf,
static int
hash_divisor(unsigned int initial) {
static uint16_t primes[] = {
3,
5,
7,
11,
13,
17,
19,
23,
29,
31,
37,
41,
43,
47,
53,
59,
61,
67,
71,
73,
79,
83,
89,
97,
3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41,
43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97,
#if 0
101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157,
163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227,

View file

@ -18,7 +18,7 @@
* Called when we enter the DLL
*/
__declspec(dllexport) BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
/*
* The DLL is loading due to process

View file

@ -1008,7 +1008,7 @@ static const char *dbargv_default[] = { "rbt" };
do { \
isc_interval_t _i; \
uint32_t _j; \
_j = (b)-isc_random_uniform((b) / 4); \
_j = (b) - isc_random_uniform((b) / 4); \
isc_interval_set(&_i, _j, 0); \
if (isc_time_add((a), &_i, (c)) != ISC_R_SUCCESS) { \
dns_zone_log(zone, ISC_LOG_WARNING, \

View file

@ -18,7 +18,7 @@
* Called when we enter the DLL
*/
__declspec(dllexport) BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
/*
* The DLL is loading due to process

View file

@ -369,9 +369,9 @@ mock_assert(const int result, const char *const expression,
* Alignment
*/
#ifdef __GNUC__
#define ISC_ALIGN(x, a) (((x) + (a)-1) & ~((typeof(x))(a)-1))
#define ISC_ALIGN(x, a) (((x) + (a) - 1) & ~((typeof(x))(a) - 1))
#else /* ifdef __GNUC__ */
#define ISC_ALIGN(x, a) (((x) + (a)-1) & ~((uintmax_t)(a)-1))
#define ISC_ALIGN(x, a) (((x) + (a) - 1) & ~((uintmax_t)(a) - 1))
#endif /* ifdef __GNUC__ */
#if HAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL

View file

@ -23,7 +23,7 @@
* Called when we enter the DLL
*/
__declspec(dllexport) BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
/*
* The DLL is loading due to process initialization or a call to

View file

@ -18,7 +18,7 @@
* Called when we enter the DLL
*/
__declspec(dllexport) BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
/*
* The DLL is loading due to process

View file

@ -18,7 +18,7 @@
* Called when we enter the DLL
*/
__declspec(dllexport) BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
/*
* The DLL is loading due to process

View file

@ -18,7 +18,7 @@
* Called when we enter the DLL
*/
__declspec(dllexport) BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
/*
* The DLL is loading due to process