From b0daf7fa7c43e665a8d07bff146831c129178479 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 25 Aug 2023 09:15:37 +0200 Subject: [PATCH] network: Move error messages onto a single line Error messages are exempt from the 80 columns rule. Move them onto one line. Signed-off-by: Michal Privoznik Reviewed-by: Pavel Hrdina --- src/network/bridge_driver.c | 14 ++++---------- src/network/bridge_driver_linux.c | 10 +--------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index caad085192..dc1d9c7b64 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1302,8 +1302,7 @@ networkDnsmasqConfContents(virNetworkObj *obj, if (ipdef->nranges || ipdef->nhosts) { if (ipv4def) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("For IPv4, multiple DHCP definitions " - "cannot be specified.")); + _("For IPv4, multiple DHCP definitions cannot be specified.")); return -1; } else { ipv4def = ipdef; @@ -1316,8 +1315,7 @@ networkDnsmasqConfContents(virNetworkObj *obj, if (ipdef->nranges || ipdef->nhosts) { if (ipv6def) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("For IPv6, multiple DHCP definitions " - "cannot be specified.")); + _("For IPv6, multiple DHCP definitions cannot be specified.")); return -1; } else { ipv6def = ipdef; @@ -2869,9 +2867,7 @@ networkValidate(virNetworkDriverState *driver, if (ipdef->nranges || ipdef->nhosts) { if (ipv4def) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Multiple IPv4 dhcp sections found -- " - "dhcp is supported only for a " - "single IPv4 address on each network")); + _("Multiple IPv4 dhcp sections found -- dhcp is supported only for a single IPv4 address on each network")); return -1; } else { ipv4def = true; @@ -2882,9 +2878,7 @@ networkValidate(virNetworkDriverState *driver, if (ipdef->nranges || ipdef->nhosts) { if (ipv6def) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Multiple IPv6 dhcp sections found -- " - "dhcp is supported only for a " - "single IPv6 address on each network")); + _("Multiple IPv6 dhcp sections found -- dhcp is supported only for a single IPv6 address on each network")); return -1; } else { ipv6def = true; diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c index 1ef5b9d917..b8893bfed2 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -884,15 +884,7 @@ int networkAddFirewallRules(virNetworkDef *def) if (version >= 6000 && virFirewallDGetBackend() == VIR_FIREWALLD_BACKEND_NFTABLES) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("firewalld is set to use the nftables " - "backend, but the required firewalld " - "'libvirt' zone is missing. Either set " - "the firewalld backend to 'iptables', or " - "ensure that firewalld has a 'libvirt' " - "zone by upgrading firewalld to a " - "version supporting rule priorities " - "(0.7.0+) and/or rebuilding " - "libvirt with --with-firewalld-zone")); + _("firewalld is set to use the nftables backend, but the required firewalld 'libvirt' zone is missing. Either set the firewalld backend to 'iptables', or ensure that firewalld has a 'libvirt' zone by upgrading firewalld to a version supporting rule priorities (0.7.0+) and/or rebuilding libvirt with --with-firewalld-zone")); return -1; } }