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 commitd3b49b6675)0255a974revise .clang-format and add a C formatting script in utile851ed0bapply the modified style
This commit is contained in:
@@ -30,15 +30,13 @@ ISC_PLATFORM_NORETURN_PRE static inline void
|
||||
fatal(const char *message) ISC_PLATFORM_NORETURN_POST;
|
||||
|
||||
static inline void
|
||||
fatal(const char *message)
|
||||
{
|
||||
fatal(const char *message) {
|
||||
fprintf(stderr, "%s\n", message);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static inline void
|
||||
check_result(isc_result_t result, const char *message)
|
||||
{
|
||||
check_result(isc_result_t result, const char *message) {
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
fprintf(stderr, "%s: %s\n", message, isc_result_totext(result));
|
||||
exit(1);
|
||||
@@ -46,12 +44,11 @@ check_result(isc_result_t result, const char *message)
|
||||
}
|
||||
|
||||
static inline bool
|
||||
active_node(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node)
|
||||
{
|
||||
active_node(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node) {
|
||||
dns_rdatasetiter_t *rdsiter;
|
||||
bool active = false;
|
||||
isc_result_t result;
|
||||
dns_rdataset_t rdataset;
|
||||
bool active = false;
|
||||
isc_result_t result;
|
||||
dns_rdataset_t rdataset;
|
||||
|
||||
dns_rdataset_init(&rdataset);
|
||||
rdsiter = NULL;
|
||||
@@ -92,10 +89,9 @@ active_node(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node)
|
||||
|
||||
static inline isc_result_t
|
||||
next_active(dns_db_t *db, dns_dbversion_t *version, dns_dbiterator_t *dbiter,
|
||||
dns_name_t *name, dns_dbnode_t **nodep)
|
||||
{
|
||||
dns_name_t *name, dns_dbnode_t **nodep) {
|
||||
isc_result_t result;
|
||||
bool active;
|
||||
bool active;
|
||||
|
||||
do {
|
||||
active = false;
|
||||
@@ -113,19 +109,18 @@ next_active(dns_db_t *db, dns_dbversion_t *version, dns_dbiterator_t *dbiter,
|
||||
}
|
||||
|
||||
static void
|
||||
nsecify(char *filename)
|
||||
{
|
||||
isc_result_t result;
|
||||
dns_db_t * db;
|
||||
dns_dbversion_t * wversion;
|
||||
dns_dbnode_t * node, *nextnode;
|
||||
const char * origintext;
|
||||
dns_fixedname_t fname, fnextname;
|
||||
dns_name_t * name, *nextname, *target;
|
||||
isc_buffer_t b;
|
||||
size_t len;
|
||||
nsecify(char *filename) {
|
||||
isc_result_t result;
|
||||
dns_db_t *db;
|
||||
dns_dbversion_t *wversion;
|
||||
dns_dbnode_t *node, *nextnode;
|
||||
const char *origintext;
|
||||
dns_fixedname_t fname, fnextname;
|
||||
dns_name_t *name, *nextname, *target;
|
||||
isc_buffer_t b;
|
||||
size_t len;
|
||||
dns_dbiterator_t *dbiter;
|
||||
char newfilename[1024];
|
||||
char newfilename[1024];
|
||||
|
||||
name = dns_fixedname_initname(&fname);
|
||||
nextname = dns_fixedname_initname(&fnextname);
|
||||
@@ -199,8 +194,7 @@ nsecify(char *filename)
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
main(int argc, char *argv[]) {
|
||||
int i;
|
||||
|
||||
dns_result_register();
|
||||
|
||||
Reference in New Issue
Block a user