From 0002377dca22d6072508bd3c1b31a6ace82283fd Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 17 Feb 2020 12:05:39 -0800 Subject: [PATCH] adjust the clang-format penalties to reduce string breaking this corrects some style glitches such as: ``` long_function_call(arg, arg2, arg3, arg4, arg5, "str" "ing"); ``` ...by adjusting the penalties for breaking strings and call parameter lists. --- .clang-format | 2 +- .clang-format.headers | 2 +- bin/dig/dig.c | 7 ++- bin/named/config.c | 4 +- bin/named/controlconf.c | 12 ++--- bin/named/logconf.c | 8 +-- bin/named/main.c | 15 ++---- bin/named/server.c | 106 +++++++++++++++------------------------ bin/named/statschannel.c | 26 ++++------ bin/nsupdate/nsupdate.c | 5 +- bin/tools/dnstap-read.c | 5 +- bin/tools/mdig.c | 7 ++- lib/dns/rootns.c | 10 ++-- lib/isc/mem.c | 5 +- lib/isc/unix/socket.c | 32 ++++++------ lib/isc/win32/socket.c | 54 +++++++++----------- lib/isccfg/aclconf.c | 9 ++-- lib/ns/query.c | 4 +- 18 files changed, 129 insertions(+), 184 deletions(-) diff --git a/.clang-format b/.clang-format index bb3a6218ed..3e13625f08 100644 --- a/.clang-format +++ b/.clang-format @@ -55,7 +55,7 @@ MaxEmptyLinesToKeep: 1 PenaltyBreakAssignment: 30 PenaltyBreakComment: 10 PenaltyBreakFirstLessLess: 0 -PenaltyBreakString: 10 +PenaltyBreakString: 80 PenaltyExcessCharacter: 100 Standard: Cpp11 ContinuationIndentWidth: 8 diff --git a/.clang-format.headers b/.clang-format.headers index 0e36bb427b..a488e811f4 100644 --- a/.clang-format.headers +++ b/.clang-format.headers @@ -55,7 +55,7 @@ MaxEmptyLinesToKeep: 1 PenaltyBreakAssignment: 30 PenaltyBreakComment: 10 PenaltyBreakFirstLessLess: 0 -PenaltyBreakString: 10 +PenaltyBreakString: 80 PenaltyExcessCharacter: 100 Standard: Cpp11 ContinuationIndentWidth: 8 diff --git a/bin/dig/dig.c b/bin/dig/dig.c index c447aab77f..8157009403 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -1206,10 +1206,9 @@ plus_option(char *option, bool is_batchfile, dig_lookup_t *lookup) { lookup->ednsflags = 0; break; } - result = parse_xint(&num, value, - 0xffff, - "ednsflag" - "s"); + result = parse_xint( + &num, value, 0xffff, + "ednsflags"); if (result != ISC_R_SUCCESS) { warn("Couldn't parse " "ednsflags"); diff --git a/bin/named/config.c b/bin/named/config.c index 478429a4a5..fbf29cf7a8 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -670,8 +670,8 @@ resume: const char *keystr; isc_buffer_t b; - addr = cfg_tuple_get(cfg_listelt_value(element), "masterselemen" - "t"); + addr = cfg_tuple_get(cfg_listelt_value(element), + "masterselement"); key = cfg_tuple_get(cfg_listelt_value(element), "key"); if (!cfg_obj_issockaddr(addr)) { diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index 7a760c9e76..e12ac6895a 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -1223,12 +1223,12 @@ add_listener(named_controls_t *cp, controllistener_t **listenerp, } if (result == ISC_R_SUCCESS && type == isc_sockettype_unix) { - listener->perm = cfg_obj_asuint32(cfg_tuple_get(control, "per" - "m")); - listener->owner = cfg_obj_asuint32(cfg_tuple_get(control, "owne" - "r")); - listener->group = cfg_obj_asuint32(cfg_tuple_get(control, "grou" - "p")); + listener->perm = + cfg_obj_asuint32(cfg_tuple_get(control, "perm")); + listener->owner = + cfg_obj_asuint32(cfg_tuple_get(control, "owner")); + listener->group = + cfg_obj_asuint32(cfg_tuple_get(control, "group")); result = isc_socket_permunix(&listener->address, listener->perm, listener->owner, listener->group); } diff --git a/bin/named/logconf.c b/bin/named/logconf.c index 798033fbe1..8759a2a623 100644 --- a/bin/named/logconf.c +++ b/bin/named/logconf.c @@ -139,8 +139,8 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { if (fileobj != NULL) { const cfg_obj_t *pathobj = cfg_tuple_get(fileobj, "file"); const cfg_obj_t *sizeobj = cfg_tuple_get(fileobj, "size"); - const cfg_obj_t *versionsobj = cfg_tuple_get(fileobj, "version" - "s"); + const cfg_obj_t *versionsobj = cfg_tuple_get(fileobj, + "versions"); const cfg_obj_t *suffixobj = cfg_tuple_get(fileobj, "suffix"); int32_t versions = ISC_LOG_ROLLNEVER; isc_log_rollsuffix_t suffix = isc_log_rollsuffix_increment; @@ -169,8 +169,8 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { versions = cfg_obj_asuint32(versionsobj); } else if (versionsobj != NULL && cfg_obj_isstring(versionsobj) && - strcasecmp(cfg_obj_asstring(versionsobj), "unlimite" - "d") == 0) + strcasecmp(cfg_obj_asstring(versionsobj), + "unlimited") == 0) { versions = ISC_LOG_ROLLINFINITE; } diff --git a/bin/named/main.c b/bin/named/main.c index 919b589f03..53426f2723 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -782,12 +782,8 @@ parse_command_line(int argc, char *argv[]) { break; case 'N': /* Deprecated. */ case 'n': - named_g_cpus = parse_int(isc_commandline_argument, "num" - "ber" - " of" - " cp" - "u" - "s"); + named_g_cpus = parse_int(isc_commandline_argument, + "number of cpus"); if (named_g_cpus == 0) { named_g_cpus = 1; } @@ -805,11 +801,8 @@ parse_command_line(int argc, char *argv[]) { want_stats = true; break; case 'S': - maxsocks = parse_int(isc_commandline_argument, "max " - "number " - "of " - "socket" - "s"); + maxsocks = parse_int(isc_commandline_argument, + "max number of sockets"); break; case 't': /* XXXJAB should we make a copy? */ diff --git a/bin/named/server.c b/bin/named/server.c index 78402fa442..5e6cfa50f6 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -2143,8 +2143,8 @@ conf_dnsrps(dns_view_t *view, const cfg_obj_t **maps, bool nsip_enabled, s = cfg_obj_asstring(cfg_tuple_get(obj, "policy name")); conf_dnsrps_sadd(&ctx, " policy %s", s); if (strcasecmp(s, "cname") == 0) { - s = cfg_obj_asstring(cfg_tuple_get(obj, "cnam" - "e")); + s = cfg_obj_asstring( + cfg_tuple_get(obj, "cname")); conf_dnsrps_sadd(&ctx, " %s", s); } } @@ -3421,9 +3421,8 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view, obj = NULL; (void)cfg_map_get(zoptions, "type", &obj); - if (obj != NULL && strcasecmp(cfg_obj_asstring(obj), "forwar" - "d") == 0) - { + if (obj != NULL && + strcasecmp(cfg_obj_asstring(obj), "forward") == 0) { obj = NULL; (void)cfg_map_get(zoptions, "forward", &obj); if (obj == NULL) { @@ -5766,9 +5765,8 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, if (!cfg_obj_issockaddr(alternate)) { dns_fixedname_t fixed; dns_name_t *name; - const char *str = - cfg_obj_asstring(cfg_tuple_get(alternate, "nam" - "e")); + const char *str = cfg_obj_asstring( + cfg_tuple_get(alternate, "name")); isc_buffer_t buffer; in_port_t myport = port; @@ -6086,8 +6084,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, if (zclass != view->rdclass) { const char *vname = NULL; if (vconfig != NULL) { - vname = cfg_obj_asstring(cfg_tuple_get(vconfig, "nam" - "e")); + vname = cfg_obj_asstring( + cfg_tuple_get(vconfig, "name")); } else { vname = ""; } @@ -9099,10 +9097,8 @@ load_configuration(const char *filename, named_server_t *server, } else { const cfg_obj_t *logobj = NULL; - CHECKM(isc_logconfig_create(named_g_lctx, &logc), "creating " - "new logging " - "configuratio" - "n"); + CHECKM(isc_logconfig_create(named_g_lctx, &logc), + "creating new logging configuration"); logobj = NULL; (void)cfg_map_get(config, "logging", &logobj); @@ -9110,25 +9106,16 @@ load_configuration(const char *filename, named_server_t *server, CHECKM(named_logconfig(logc, logobj), "configuring " "logging"); } else { - CHECKM(named_log_setdefaultchannels(logc), "setting up " - "default " - "logging " - "channels"); - CHECKM(named_log_setunmatchedcategory(logc), "setting " - "up " - "default " - "'category" - " unmatche" - "d'"); - CHECKM(named_log_setdefaultcategory(logc), "setting up " - "default " - "'category " - "default'"); + CHECKM(named_log_setdefaultchannels(logc), + "setting up default logging channels"); + CHECKM(named_log_setunmatchedcategory(logc), + "setting up default 'category unmatched'"); + CHECKM(named_log_setdefaultcategory(logc), + "setting up default 'category default'"); } - CHECKM(isc_logconfig_use(named_g_lctx, logc), "installing " - "logging " - "configuration"); + CHECKM(isc_logconfig_use(named_g_lctx, logc), + "installing logging configuration"); logc = NULL; isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, @@ -9220,9 +9207,8 @@ load_configuration(const char *filename, named_server_t *server, obj = NULL; result = named_config_get(maps, "recursing-file", &obj); INSIST(result == ISC_R_SUCCESS); - CHECKM(setstring(server, &server->recfile, cfg_obj_asstring(obj)), "str" - "du" - "p"); + CHECKM(setstring(server, &server->recfile, cfg_obj_asstring(obj)), + "strdup"); obj = NULL; result = named_config_get(maps, "version", &obj); @@ -9517,10 +9503,8 @@ view_loaded(void *arg) { "all zones loaded"); } - CHECKFATAL(dns_zonemgr_forcemaint(server->zonemgr), "forcing " - "zone " - "maintenanc" - "e"); + CHECKFATAL(dns_zonemgr_forcemaint(server->zonemgr), + "forcing zone maintenance"); named_os_started(); @@ -9670,10 +9654,8 @@ run_server(isc_task_t *task, isc_event_t *event) { &named_g_addparser), "creating additional configuration parser"); - CHECKFATAL(load_configuration(named_g_conffile, server, true), "loading" - " config" - "uratio" - "n"); + CHECKFATAL(load_configuration(named_g_conffile, server, true), + "loading configuration"); CHECKFATAL(load_zones(server, true, false), "loading zones"); #ifdef ENABLE_AFL @@ -9876,10 +9858,8 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) { * startup and shutdown of the server, as well as all exclusive * tasks. */ - CHECKFATAL(isc_task_create(named_g_taskmgr, 0, &server->task), "creatin" - "g " - "server " - "task"); + CHECKFATAL(isc_task_create(named_g_taskmgr, 0, &server->task), + "creating server task"); isc_task_setname(server->task, "server", server); isc_taskmgr_setexcltask(named_g_taskmgr, server->task); @@ -9970,9 +9950,8 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) { server->flushonshutdown = false; server->controls = NULL; - CHECKFATAL(named_controls_create(server, &server->controls), "named_" - "controls_" - "create"); + CHECKFATAL(named_controls_create(server, &server->controls), + "named_controls_create"); server->dispatchgen = 0; ISC_LIST_INIT(server->dispatches); @@ -11403,9 +11382,9 @@ named_server_validation(named_server_t *server, isc_lex_t *lex, CHECK(putstr(text, "\n")); } CHECK(putstr(text, "DNSSEC validation is ")); - CHECK(putstr(text, view->enablevalidation ? "enabled" - : "disable" - "d")); + CHECK(putstr(text, view->enablevalidation + ? "enabled" + : "disabled")); CHECK(putstr(text, " (view ")); CHECK(putstr(text, view->name)); CHECK(putstr(text, ")")); @@ -11754,9 +11733,9 @@ named_server_status(named_server_t *server, isc_buffer_t **text) { CHECK(putstr(text, line)); snprintf(line, sizeof(line), "query logging is %s\n", - ns_server_getoption(server->sctx, NS_SERVER_LOGQUERIES) ? "ON" - : "OF" - "F"); + ns_server_getoption(server->sctx, NS_SERVER_LOGQUERIES) + ? "ON" + : "OFF"); CHECK(putstr(text, line)); snprintf(line, sizeof(line), "recursive clients: %u/%u/%u\n", @@ -11777,10 +11756,9 @@ named_server_status(named_server_t *server, isc_buffer_t **text) { if (server->reload_status != NAMED_RELOAD_DONE) { snprintf(line, sizeof(line), "reload/reconfig %s\n", - server->reload_status == NAMED_RELOAD_FAILED ? "failed" - : "in " - "progre" - "ss"); + (server->reload_status == NAMED_RELOAD_FAILED + ? "failed" + : "in progress")); CHECK(putstr(text, line)); } @@ -12192,9 +12170,8 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { isc_task_endexclusive(server->task); view = dns_zone_getview(zone); - if (strcmp(view->name, "_default") == 0 || strcmp(view->name, "_bin" - "d") == 0) - { + if (strcmp(view->name, "_default") == 0 || + strcmp(view->name, "_bind") == 0) { vname = ""; sep = ""; } else { @@ -12317,9 +12294,8 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, } view = dns_zone_getview(mayberaw); - if (strcmp(view->name, "_default") == 0 || strcmp(view->name, "_bin" - "d") == 0) - { + if (strcmp(view->name, "_default") == 0 || + strcmp(view->name, "_bind") == 0) { vname = ""; sep = ""; } else { diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 606e652eba..59c5052d66 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -1843,10 +1843,9 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { if (gluecachestats != NULL) { TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counters")); - TRY0(xmlTextWriterWriteAttribute(writer, - ISC_XMLCHAR "type", - ISC_XMLCHAR "gluecach" - "e")); + TRY0(xmlTextWriterWriteAttribute( + writer, ISC_XMLCHAR "type", + ISC_XMLCHAR "gluecache")); result = dump_counters( gluecachestats, isc_statsformat_xml, writer, @@ -1884,10 +1883,9 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { if (dnssecsignstats != NULL) { TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counters")); - TRY0(xmlTextWriterWriteAttribute(writer, - ISC_XMLCHAR "type", - ISC_XMLCHAR "dnssec-" - "sign")); + TRY0(xmlTextWriterWriteAttribute( + writer, ISC_XMLCHAR "type", + ISC_XMLCHAR "dnssec-sign")); dumparg.result = ISC_R_SUCCESS; dns_dnssecsignstats_dump(dnssecsignstats, @@ -1905,11 +1903,9 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { if (dnssecrefreshstats != NULL) { TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counters")); - TRY0(xmlTextWriterWriteAttribute(writer, - ISC_XMLCHAR "type", - ISC_XMLCHAR "dnssec-" - "refres" - "h")); + TRY0(xmlTextWriterWriteAttribute( + writer, ISC_XMLCHAR "type", + ISC_XMLCHAR "dnssec-refresh")); dumparg.result = ISC_R_SUCCESS; dns_dnssecsignstats_dump(dnssecrefreshstats, @@ -2356,8 +2352,8 @@ generatexml(named_server_t *server, uint32_t flags, int *buflen, TRY0(xmlTextWriterEndElement(writer)); /* /views */ if ((flags & STATS_XML_NET) != 0) { - TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "socketmg" - "r")); + TRY0(xmlTextWriterStartElement(writer, + ISC_XMLCHAR "socketmgr")); TRY0(isc_socketmgr_renderxml(named_g_socketmgr, writer)); TRY0(xmlTextWriterEndElement(writer)); /* /socketmgr */ } diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 9404ed1050..783644934c 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -2196,9 +2196,8 @@ do_next_command(char *cmdline) { if (strcasecmp(word, "realm") == 0) { return (evaluate_realm(cmdline)); } - if (strcasecmp(word, "check-names") == 0 || strcasecmp(word, "checkname" - "s") == 0) - { + if (strcasecmp(word, "check-names") == 0 || + strcasecmp(word, "checknames") == 0) { return (evaluate_checknames(cmdline)); } if (strcasecmp(word, "gsstsig") == 0) { diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index f6fca991a1..7d2f5ab09c 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -361,9 +361,8 @@ main(int argc, char *argv[]) { dns_result_register(); - CHECKM(dns_dt_open(argv[0], dns_dtmode_file, mctx, &handle), "dns_dt_" - "openfil" - "e"); + CHECKM(dns_dt_open(argv[0], dns_dtmode_file, mctx, &handle), + "dns_dt_openfile"); for (;;) { isc_region_t input; diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index 231bdfb127..68acdd744b 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -1362,10 +1362,9 @@ plus_option(char *option, struct query *query, bool global) { query->ednsflags = 0; break; } - result = parse_xint(&num, value, - 0xffff, - "ednsflag" - "s"); + result = parse_xint( + &num, value, 0xffff, + "ednsflags"); CHECK("parse_xint(ednsflags)", result); query->ednsflags = num; diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c index 4ee255c8d8..e59bb8dde1 100644 --- a/lib/dns/rootns.c +++ b/lib/dns/rootns.c @@ -290,9 +290,8 @@ report(dns_view_t *view, dns_name_t *name, bool missing, dns_rdata_t *rdata) { isc_buffer_t buffer; isc_result_t result; - if (strcmp(view->name, "_bind") != 0 && strcmp(view->name, "_defaul" - "t") != 0) - { + if (strcmp(view->name, "_bind") != 0 && + strcmp(view->name, "_default") != 0) { viewname = view->name; sep = ": view "; } @@ -468,9 +467,8 @@ dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db) { isc_stdtime_get(&now); - if (strcmp(view->name, "_bind") != 0 && strcmp(view->name, "_defaul" - "t") != 0) - { + if (strcmp(view->name, "_bind") != 0 && + strcmp(view->name, "_default") != 0) { viewname = view->name; sep = ": view "; } diff --git a/lib/isc/mem.c b/lib/isc/mem.c index 8a78c6be85..9a339b06c9 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -737,9 +737,8 @@ mem_create(isc_mem_t **ctxp, unsigned int flags) { isc__mem_t *ctx; - STATIC_ASSERT((ALIGNMENT_SIZE & (ALIGNMENT_SIZE - 1)) == 0, "wrong " - "alignment " - "size"); + STATIC_ASSERT((ALIGNMENT_SIZE & (ALIGNMENT_SIZE - 1)) == 0, + "wrong alignment size"); RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 54058eef39..1883cdec49 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -5383,8 +5383,8 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, void *writer0) { TRY0(xmlTextWriterEndElement(writer)); /* name */ } - TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "reference" - "s")); + TRY0(xmlTextWriterStartElement(writer, + ISC_XMLCHAR "references")); TRY0(xmlTextWriterWriteFormatString( writer, "%d", (int)isc_refcount_current(&sock->references))); @@ -5397,19 +5397,17 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, void *writer0) { if (sock->connected) { isc_sockaddr_format(&sock->peer_address, peerbuf, sizeof(peerbuf)); - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "peer-" - "address", - ISC_XMLCHAR peerbuf)); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "peer-address", + ISC_XMLCHAR peerbuf)); } len = sizeof(addr); if (getsockname(sock->fd, &addr.type.sa, (void *)&len) == 0) { isc_sockaddr_format(&addr, peerbuf, sizeof(peerbuf)); - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "local-" - "address", - ISC_XMLCHAR peerbuf)); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "local-address", + ISC_XMLCHAR peerbuf)); } TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "states")); @@ -5419,16 +5417,14 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, void *writer0) { ISC_XMLCHAR "listener")); } if (sock->connected) { - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "state", - ISC_XMLCHAR "connecte" - "d")); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "state", + ISC_XMLCHAR "connected")); } if (sock->connecting) { - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "state", - ISC_XMLCHAR "connectin" - "g")); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "state", + ISC_XMLCHAR "connecting")); } if (sock->bound) { TRY0(xmlTextWriterWriteElement(writer, diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index de4aaffa5a..ad10f8344e 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -3727,8 +3727,8 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, void *writer0) { TRY0(xmlTextWriterEndElement(writer)); /* name */ } - TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "reference" - "s")); + TRY0(xmlTextWriterStartElement(writer, + ISC_XMLCHAR "references")); TRY0(xmlTextWriterWriteFormatString( writer, "%" PRIuFAST32, isc_refcount_current(&sock->references))); @@ -3741,39 +3741,34 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, void *writer0) { if (sock->connected) { isc_sockaddr_format(&sock->address, peerbuf, sizeof(peerbuf)); - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "peer-" - "address", - ISC_XMLCHAR peerbuf)); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "peer-address", + ISC_XMLCHAR peerbuf)); } len = sizeof(addr); if (getsockname(sock->fd, &addr.type.sa, (void *)&len) == 0) { isc_sockaddr_format(&addr, peerbuf, sizeof(peerbuf)); - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "local-" - "address", - ISC_XMLCHAR peerbuf)); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "local-address", + ISC_XMLCHAR peerbuf)); } TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "states")); if (sock->pending_recv) { - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "state", - ISC_XMLCHAR "pending-" - "receive")); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "state", + ISC_XMLCHAR "pending-receive")); } if (sock->pending_send) { - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "state", - ISC_XMLCHAR "pending-" - "send")); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "state", + ISC_XMLCHAR "pending-send")); } if (sock->pending_accept) { - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "state", - ISC_XMLCHAR "pending_" - "accept")); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "state", + ISC_XMLCHAR "pending_accept")); } if (sock->listener) { TRY0(xmlTextWriterWriteElement(writer, @@ -3781,16 +3776,14 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, void *writer0) { ISC_XMLCHAR "listener")); } if (sock->connected) { - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "state", - ISC_XMLCHAR "connecte" - "d")); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "state", + ISC_XMLCHAR "connected")); } if (sock->pending_connect) { - TRY0(xmlTextWriterWriteElement(writer, - ISC_XMLCHAR "state", - ISC_XMLCHAR "connectin" - "g")); + TRY0(xmlTextWriterWriteElement( + writer, ISC_XMLCHAR "state", + ISC_XMLCHAR "connecting")); } if (sock->bound) { TRY0(xmlTextWriterWriteElement(writer, @@ -3826,7 +3819,6 @@ error: goto error; \ } \ } while (0) - isc_result_t isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0) { isc_result_t result = ISC_R_SUCCESS; diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c index 991f9377a7..19fc5ab8b6 100644 --- a/lib/isccfg/aclconf.c +++ b/lib/isccfg/aclconf.c @@ -102,8 +102,8 @@ get_acl_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) { for (elt = cfg_list_first(acls); elt != NULL; elt = cfg_list_next(elt)) { const cfg_obj_t *acl = cfg_listelt_value(elt); - const char *aclname = cfg_obj_asstring(cfg_tuple_get(acl, "nam" - "e")); + const char *aclname = + cfg_obj_asstring(cfg_tuple_get(acl, "name")); if (strcasecmp(aclname, name) == 0) { if (ret != NULL) { *ret = cfg_tuple_get(acl, "value"); @@ -573,9 +573,8 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx, { subtype = dns_geoip_city_metrocode; de.geoip_elem.as_int = atoi(search); - } else if (strcasecmp(stype, "tz") == 0 || strcasecmp(stype, "timezon" - "e") == 0) - { + } else if (strcasecmp(stype, "tz") == 0 || + strcasecmp(stype, "timezone") == 0) { subtype = dns_geoip_city_timezonecode; strlcpy(de.geoip_elem.as_string, search, sizeof(de.geoip_elem.as_string)); diff --git a/lib/ns/query.c b/lib/ns/query.c index 634ec37c13..3e4d86d761 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -2981,8 +2981,8 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, if (result != ISC_R_SUCCESS) { rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, p_name, rpz_type, "allrdatasets()", result); - CTRACE(ISC_LOG_ERROR, "rpz_find_p: allrdatasets " - "failed"); + CTRACE(ISC_LOG_ERROR, + "rpz_find_p: allrdatasets failed"); return (DNS_R_SERVFAIL); } if (qtype == dns_rdatatype_aaaa &&