External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-05 01:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Move error messages onto a single line

Browse Source 
Error messages are exempt from the 80 columns rule. Move them
onto one line.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2023-08-24 17:03:58 +02:00
parent 4a09a89c4b
commit 9b10782bb7
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nwfilter/nwfilter_dhcpsnoop.c
View File

@ -1441,9 +1441,7 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver,
/* check that all tools are available for applying the filters (late) */ /* check that all tools are available for applying the filters (late) */
if (!techdriver->canApplyBasicRules()) { if (!techdriver->canApplyBasicRules()) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("IP parameter must be provided since " _("IP parameter must be provided since snooping the IP address does not work possibly due to missing tools"));
"snooping the IP address does not work "
"possibly due to missing tools"));
goto exit_snoopreqput; goto exit_snoopreqput;
} }
@ -1454,8 +1452,7 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver,
&req->binding->mac, &req->binding->mac,
dhcpsrvrs, false) < 0) { dhcpsrvrs, false) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("applyDHCPOnlyRules " _("applyDHCPOnlyRules failed - spoofing not protected!"));
"failed - spoofing not protected!"));
goto exit_snoopreqput; goto exit_snoopreqput;
} }
@ -1990,9 +1987,8 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver G_GNUC_UNUSED,
virNWFilterDriverState *driver G_GNUC_UNUSED) virNWFilterDriverState *driver G_GNUC_UNUSED)
{ {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("libvirt was not compiled with libpcap and \"" _("libvirt was not compiled with libpcap and \"%1$s\" requires it"),
NWFILTER_VARNAME_CTRL_IP_LEARNING NWFILTER_VARNAME_CTRL_IP_LEARNING "='dhcp'");
"='dhcp'\" requires it."));
return -1; return -1;
} }
#endif /* WITH_LIBPCAP */ #endif /* WITH_LIBPCAP */

8
src/nwfilter/nwfilter_learnipaddr.c
View File

@ -669,9 +669,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriver *techdriver,
if (!techdriver->canApplyBasicRules()) { if (!techdriver->canApplyBasicRules()) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("IP parameter must be provided since " _("IP parameter must be provided since snooping the IP address does not work possibly due to missing tools"));
"snooping the IP address does not work "
"possibly due to missing tools"));
return -1; return -1;
} }
@ -717,9 +715,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriver *techdriver G_GNUC_UNUSED,
int howDetect G_GNUC_UNUSED) int howDetect G_GNUC_UNUSED)
{ {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("IP parameter must be given since libvirt " _("IP parameter must be given since libvirt was not compiled with IP address learning support"));
"was not compiled with IP address learning "
"support"));
return -1; return -1;
} }
#endif /* WITH_LIBPCAP */ #endif /* WITH_LIBPCAP */