diff --git a/cmdline/mingw.h b/cmdline/mingw.h index 2129fedf..43f85c7a 100644 --- a/cmdline/mingw.h +++ b/cmdline/mingw.h @@ -414,7 +414,7 @@ int windows_key_create(windows_key_t* key, void (*destructor)(void*)); int windows_key_delete(windows_key_t key); void* windows_getspecific(windows_key_t key); int windows_setspecific(windows_key_t key, void* value); -int windows_create(thread_id_t* thread, void* attr, void* (*func)(void*), void *arg); +int windows_create(thread_id_t* thread, void* attr, void* (*func)(void*), void* arg); int windows_join(thread_id_t thread, void** retval); #endif diff --git a/cmdline/speed.c b/cmdline/speed.c index b3c8a4bb..65b80784 100644 --- a/cmdline/speed.c +++ b/cmdline/speed.c @@ -28,7 +28,7 @@ /** * Differential us of two timeval. */ -static int64_t diffgettimeofday(struct timeval *start, struct timeval *stop) +static int64_t diffgettimeofday(struct timeval* start, struct timeval* stop) { int64_t d; @@ -144,9 +144,9 @@ void speed(int period, int nd, int size) printf("CPU is not a x86/x64\n"); #endif #if WORDS_BIGENDIAN - printf("Memory is big-endian %d-bit\n", (int)sizeof(void *) * 8); + printf("Memory is big-endian %d-bit\n", (int)sizeof(void*) * 8); #else - printf("Memory is little-endian %d-bit\n", (int)sizeof(void *) * 8); + printf("Memory is little-endian %d-bit\n", (int)sizeof(void*) * 8); #endif #if HAVE_FUTIMENS diff --git a/cmdline/support.c b/cmdline/support.c index 6cfa7404..205d358e 100644 --- a/cmdline/support.c +++ b/cmdline/support.c @@ -955,7 +955,7 @@ char* worddigitstr(const char* haystack, const char* needle) if (s == haystack || isspace((unsigned char)s[-1]) || isdigit((unsigned char)s[-1])) { /* right boundary */ if (s[len] == '\0' || isspace((unsigned char)s[len]) || isdigit((unsigned char)s[len])) { - return (char *)s; + return (char*)s; } } } @@ -2430,7 +2430,7 @@ void thread_cond_broadcast_and_unlock(thread_cond_t* cond, thread_mutex_t* mutex } } -void thread_create(thread_id_t* thread, void* (*func)(void*), void *arg) +void thread_create(thread_id_t* thread, void* (*func)(void*), void* arg) { if (pthread_create(thread, 0, func, arg) != 0) { /* LCOV_EXCL_START */ diff --git a/cmdline/support.h b/cmdline/support.h index 3007caa8..624ae789 100644 --- a/cmdline/support.h +++ b/cmdline/support.h @@ -507,7 +507,7 @@ void thread_cond_broadcast(thread_cond_t* cond); void thread_cond_wait(thread_cond_t* cond, thread_mutex_t* mutex); void thread_cond_signal_and_unlock(thread_cond_t* cond, thread_mutex_t* mutex); void thread_cond_broadcast_and_unlock(thread_cond_t* cond, thread_mutex_t* mutex); -void thread_create(thread_id_t* thread, void* (* func)(void *), void *arg); +void thread_create(thread_id_t* thread, void* (*func)(void*), void* arg); void thread_join(thread_id_t thread, void** retval); void thread_yield(void); #endif diff --git a/cmdline/unix.c b/cmdline/unix.c index 6b57b846..52c1c611 100644 --- a/cmdline/unix.c +++ b/cmdline/unix.c @@ -2336,7 +2336,7 @@ void os_abort(void) #ifdef __GNUC__ printf(", gcc " __VERSION__); #endif - printf(", %d-bit", (int)sizeof(void *) * 8); + printf(", %d-bit", (int)sizeof(void*) * 8); printf(", PATH_MAX=%d", PATH_MAX); printf("\n"); diff --git a/cmdline/util.c b/cmdline/util.c index 8f5e4779..2395390c 100644 --- a/cmdline/util.c +++ b/cmdline/util.c @@ -576,7 +576,7 @@ static inline void util_write64(void* ptr, uint64_t v) * Overwrites B contents with C's high 64 bits. */ #if defined(__x86_64__) || defined(_M_X64) -static inline void util_mum(uint64_t *A, uint64_t *B) +static inline void util_mum(uint64_t* A, uint64_t* B) { uint64_t a = *A; uint64_t b = *B; @@ -593,7 +593,7 @@ static inline void util_mum(uint64_t *A, uint64_t *B) *B = high; } #elif defined(__aarch64__) || defined(_M_ARM64) -static inline void util_mum(uint64_t *A, uint64_t *B) +static inline void util_mum(uint64_t* A, uint64_t* B) { uint64_t a = *A; uint64_t b = *B; @@ -608,14 +608,14 @@ static inline void util_mum(uint64_t *A, uint64_t *B) *B = high; } #elif defined(__SIZEOF_INT128__) -static inline void util_mum(uint64_t *A, uint64_t *B) +static inline void util_mum(uint64_t* A, uint64_t* B) { __uint128_t product = ((__uint128_t)*A) * ((__uint128_t)*B); *A = (uint64_t)product; *B = (uint64_t)(product >> 64); } #else -static inline void util_mum(uint64_t *A, uint64_t *B) +static inline void util_mum(uint64_t* A, uint64_t* B) { uint64_t a = *A; uint64_t b = *B; diff --git a/uncrustify.cfg b/uncrustify.cfg index 24fe26bb..ae1f0053 100644 --- a/uncrustify.cfg +++ b/uncrustify.cfg @@ -192,11 +192,11 @@ sp_paren_brace = ignore # ignore/add/remove/force sp_brace_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*'. -sp_before_ptr_star = ignore # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a # variable name. If set to ignore, sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = remove # ignore/add/remove/force # Add or remove space before pointer star '*' that is followed by a qualifier. # If set to ignore, sp_before_unnamed_ptr_star is used instead. @@ -220,7 +220,7 @@ sp_before_global_scope_ptr_star = ignore # ignore/add/remove/force # Add or remove space between a qualifier and a pointer star '*' that isn't # followed by a variable name, as in '(char const *)'. If set to ignore, # sp_before_ptr_star is used instead. -sp_qualifier_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_qualifier_unnamed_ptr_star = remove # ignore/add/remove/force # Add or remove space between pointer stars '*', as in 'int ***a;'. sp_between_ptr_star = ignore # ignore/add/remove/force @@ -231,19 +231,19 @@ sp_between_ptr_ref = ignore # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. # # Overrides sp_type_func. -sp_after_ptr_star = ignore # ignore/add/remove/force +sp_after_ptr_star = force # ignore/add/remove/force # Add or remove space after pointer caret '^', if followed by a word. sp_after_ptr_block_caret = ignore # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a qualifier. -sp_after_ptr_star_qualifier = ignore # ignore/add/remove/force +sp_after_ptr_star_qualifier = force # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a function # prototype or function definition. # # Overrides sp_after_ptr_star and sp_type_func. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = force # ignore/add/remove/force # Add or remove space after a pointer star '*' in the trailing return of a # function prototype or function definition. @@ -251,7 +251,7 @@ sp_after_ptr_star_trailing = ignore # ignore/add/remove/force # Add or remove space between the pointer star '*' and the name of the variable # in a function pointer definition. -sp_ptr_star_func_var = ignore # ignore/add/remove/force +sp_ptr_star_func_var = remove # ignore/add/remove/force # Add or remove space between the pointer star '*' and the name of the type # in a function pointer type definition. @@ -264,7 +264,7 @@ sp_ptr_star_paren = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a function # prototype or function definition. If set to ignore, sp_before_ptr_star is # used instead. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = remove # ignore/add/remove/force # Add or remove space between a qualifier and a pointer star '*' followed by # the name of the function in a function prototype or definition, as in