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:
@@ -31,9 +31,9 @@
|
||||
#include "log.h"
|
||||
#include "util.h"
|
||||
|
||||
dns_dyndb_destroy_t dyndb_destroy;
|
||||
dns_dyndb_destroy_t dyndb_destroy;
|
||||
dns_dyndb_register_t dyndb_init;
|
||||
dns_dyndb_version_t dyndb_version;
|
||||
dns_dyndb_version_t dyndb_version;
|
||||
|
||||
/*
|
||||
* Driver init is called for each dyndb section in named.conf
|
||||
@@ -58,12 +58,11 @@ dns_dyndb_version_t dyndb_version;
|
||||
isc_result_t
|
||||
dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters,
|
||||
const char *file, unsigned long line, const dns_dyndbctx_t *dctx,
|
||||
void **instp)
|
||||
{
|
||||
isc_result_t result;
|
||||
unsigned int argc;
|
||||
char ** argv = NULL;
|
||||
char * s = NULL;
|
||||
void **instp) {
|
||||
isc_result_t result;
|
||||
unsigned int argc;
|
||||
char **argv = NULL;
|
||||
char *s = NULL;
|
||||
sample_instance_t *sample_inst = NULL;
|
||||
|
||||
REQUIRE(name != NULL);
|
||||
@@ -95,8 +94,8 @@ dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters,
|
||||
name, file, line);
|
||||
|
||||
/* Finally, create the instance. */
|
||||
result =
|
||||
new_sample_instance(mctx, name, argc, argv, dctx, &sample_inst);
|
||||
result = new_sample_instance(mctx, name, argc, argv, dctx,
|
||||
&sample_inst);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
log_write(ISC_LOG_ERROR,
|
||||
"dyndb_init: new_sample_instance -> %s\n",
|
||||
@@ -134,8 +133,7 @@ cleanup:
|
||||
* @param[out] instp Pointer to instance-specific data (for one dyndb section).
|
||||
*/
|
||||
void
|
||||
dyndb_destroy(void **instp)
|
||||
{
|
||||
dyndb_destroy(void **instp) {
|
||||
destroy_sample_instance((sample_instance_t **)instp);
|
||||
}
|
||||
|
||||
@@ -144,8 +142,7 @@ dyndb_destroy(void **instp)
|
||||
* is no API mismatch betwen the driver and the caller.
|
||||
*/
|
||||
int
|
||||
dyndb_version(unsigned int *flags)
|
||||
{
|
||||
dyndb_version(unsigned int *flags) {
|
||||
UNUSED(flags);
|
||||
|
||||
return (DNS_DYNDB_VERSION);
|
||||
|
||||
Reference in New Issue
Block a user