ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

67
bin/tests/optional/zone_test.c
View File

@@ -34,17 +34,17 @@
#include <sys/time.h>
#include <sys/types.h>
static int debug = 0;
static int quiet = 0;
static int stats = 0;
static int debug = 0;
static int quiet = 0;
static int stats = 0;
static isc_mem_t *mctx = NULL;
dns_zone_t * zone = NULL;
isc_taskmgr_t * taskmgr = NULL;
isc_timermgr_t * timermgr = NULL;
isc_socketmgr_t * socketmgr = NULL;
dns_zonemgr_t * zonemgr = NULL;
dns_zonetype_t zonetype = dns_zone_master;
isc_sockaddr_t addr;
dns_zone_t *zone = NULL;
isc_taskmgr_t *taskmgr = NULL;
isc_timermgr_t *timermgr = NULL;
isc_socketmgr_t *socketmgr = NULL;
dns_zonemgr_t *zonemgr = NULL;
dns_zonetype_t zonetype = dns_zone_master;
isc_sockaddr_t addr;
#define ERRRET(result, function) \
do { \
@@ -64,23 +64,21 @@ isc_sockaddr_t addr;
(void)NULL
static void
usage(void)
{
usage(void) {
fprintf(stderr, "usage: zone_test [-dqsSM] [-c class] [-f file] "
"zone\n");
exit(1);
}
static void
setup(const char *zonename, const char *filename, const char *classname)
{
isc_result_t result;
dns_rdataclass_t rdclass;
setup(const char *zonename, const char *filename, const char *classname) {
isc_result_t result;
dns_rdataclass_t rdclass;
isc_consttextregion_t region;
isc_buffer_t buffer;
dns_fixedname_t fixorigin;
dns_name_t * origin;
const char * rbt = "rbt";
isc_buffer_t buffer;
dns_fixedname_t fixorigin;
dns_name_t *origin;
const char *rbt = "rbt";
if (debug) {
fprintf(stderr, "loading \"%s\" from \"%s\" class \"%s\"\n",
@@ -128,10 +126,9 @@ setup(const char *zonename, const char *filename, const char *classname)
}
static void
print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset)
{
print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) {
isc_buffer_t text;
char t[1000];
char t[1000];
isc_result_t result;
isc_region_t r;
@@ -146,17 +143,16 @@ print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset)
}
static void
query(void)
{
char buf[1024];
query(void) {
char buf[1024];
dns_fixedname_t name;
dns_fixedname_t found;
dns_db_t * db;
isc_buffer_t buffer;
isc_result_t result;
dns_rdataset_t rdataset;
dns_rdataset_t sigset;
fd_set rfdset = { { 0 } };
dns_db_t *db;
isc_buffer_t buffer;
isc_result_t result;
dns_rdataset_t rdataset;
dns_rdataset_t sigset;
fd_set rfdset = { { 0 } };
db = NULL;
result = dns_zone_getdb(zone, &db);
@@ -237,10 +233,9 @@ query(void)
}
int
main(int argc, char **argv)
{
int c;
char * filename = NULL;
main(int argc, char **argv) {
int c;
char *filename = NULL;
const char *classname = "IN";
while ((c = isc_commandline_parse(argc, argv, "cdf:m:qsMS")) != EOF) {