Merge branch 'each-style-tweak' into 'master'

adjust clang-format options to get closer to ISC style

See merge request isc-projects/bind9!3061

(cherry picked from commit d3b49b6675)

0255a974 revise .clang-format and add a C formatting script in util
e851ed0b apply the modified style
This commit is contained in:
Ondřej Surý
2020-02-14 05:35:17 +00:00
parent c646c20e79
commit cdef20bb66
672 changed files with 36044 additions and 42228 deletions

View File

@@ -27,8 +27,7 @@
/* convert result to identifier string */
static void
isc_result_toid_test(void **state)
{
isc_result_toid_test(void **state) {
const char *id;
UNUSED(state);
@@ -42,8 +41,7 @@ isc_result_toid_test(void **state)
/* convert result to description string */
static void
isc_result_totext_test(void **state)
{
isc_result_totext_test(void **state) {
const char *str;
UNUSED(state);
@@ -57,9 +55,8 @@ isc_result_totext_test(void **state)
/* check tables are populated */
static void
tables(void **state)
{
const char * str;
tables(void **state) {
const char *str;
isc_result_t result;
UNUSED(state);
@@ -87,7 +84,8 @@ tables(void **state)
assert_string_equal(str, "(result code text not available)");
for (result = ISC_RESULTCLASS_PK11;
result < (ISC_RESULTCLASS_PK11 + PK11_R_NRESULTS); result++) {
result < (ISC_RESULTCLASS_PK11 + PK11_R_NRESULTS); result++)
{
str = isc_result_toid(result);
assert_non_null(str);
assert_string_not_equal(str, "(result code text not "
@@ -109,8 +107,7 @@ tables(void **state)
}
int
main(void)
{
main(void) {
const struct CMUnitTest tests[] = {
cmocka_unit_test(isc_result_toid_test),
cmocka_unit_test(isc_result_totext_test),
@@ -125,8 +122,7 @@ main(void)
#include <stdio.h>
int
main(void)
{
main(void) {
printf("1..0 # Skipped: cmocka not available\n");
return (0);
}