From nobody Fri Dec 19 06:34:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678464971; cv=none; d=zohomail.com; s=zohoarc; b=f9UVFqxtAyl/ZgjvJTtU1hYMWhYtNBn7IBBWm6TRAYTjOByXTt5CDi4ONoeMkVg5U6mvr8w11xMt6ZrcWtxfsNEOmwMOhiQdp4TVfU0gzDruWda6bLp+qPDqiipmZP361aUD6/TjAtEnf7ASxm984PN8CVxTCXWKAMuXXrAM4Lc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464971; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pIddJfr3GAokfEhOjNMbYnIPZ3npHPiDVjmnzLChjpo=; b=BtG0krRFqSr18f322dMP9gb1/nOobLyHeduJe9pVo/2lcn5IkfFPy9FJONvA+yDic/NYc18/nQPpoxXj69t8Ra+e6LSkccJ1b/sMNkAoDKJD9pgA40BesZalEaCsHP0+I56Di9oh2DRVa0bk3upwg3YpviWNtZp1LeS/dyLOgc0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1678464971118815.8895185020709; Fri, 10 Mar 2023 08:16:11 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-543-DzU87vM7NhieyKjC3UPTeg-1; Fri, 10 Mar 2023 11:11:12 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3ABE288434F; Fri, 10 Mar 2023 16:10:46 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 049154051E51; Fri, 10 Mar 2023 16:10:46 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E9E0E1946A79; Fri, 10 Mar 2023 16:10:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8438819472C8 for ; Fri, 10 Mar 2023 16:10:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 821B3C16025; Fri, 10 Mar 2023 16:10:42 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2714DC15BA0 for ; Fri, 10 Mar 2023 16:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464942; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pIddJfr3GAokfEhOjNMbYnIPZ3npHPiDVjmnzLChjpo=; b=Lpq32BSAIY6SZtgZu48c2CcyhHJBnPTKU3X+4KShfSwOLqwAEftGvRLi1trkBW8XLPoiE9 jqkPZ2oqqo+Qk1tgez54If299JfwNYHTOV5VChQeiOc5GNgP2kAUVva9JEI+lVLXUioTZy 3dUX7WRH/NmHZ3/5+7zs6ZhQHu9Ou1k= X-MC-Unique: DzU87vM7NhieyKjC3UPTeg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 22/51] nwfilter: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:38 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678464973005100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/nwfilter/nwfilter_dhcpsnoop.c | 67 +++++++++++------------ src/nwfilter/nwfilter_driver.c | 18 +++--- src/nwfilter/nwfilter_ebiptables_driver.c | 16 +++--- src/nwfilter/nwfilter_gentech_driver.c | 19 +++---- src/nwfilter/nwfilter_learnipaddr.c | 9 ++- 5 files changed, 60 insertions(+), 69 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index 20afc1b2d4..3dc0b777e9 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -485,8 +485,7 @@ virNWFilterSnoopReqNew(const char *ifkey) =20 if (ifkey =3D=3D NULL || strlen(ifkey) !=3D VIR_IFKEY_LEN - 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterSnoopReqNew called with invalid " - "key \"%s\" (%zu)"), + _("virNWFilterSnoopReqNew called with invalid key \= "%1$s\" (%2$zu)"), NULLSTR_EMPTY(ifkey), ifkey ? strlen(ifkey) : 0); return NULL; @@ -955,26 +954,26 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAd= dr *mac, pcap_set_immediate_mode(handle, 1) < 0 || pcap_activate(handle) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("setup of pcap handle failed: %s"), + _("setup of pcap handle failed: %1$s"), pcap_geterr(handle)); goto cleanup; } =20 if (pcap_compile(handle, &fp, ext_filter, 1, PCAP_NETMASK_UNKNOWN) != =3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("pcap_compile: %s"), pcap_geterr(handle)); + _("pcap_compile: %1$s"), pcap_geterr(handle)); goto cleanup; } =20 if (pcap_setfilter(handle, &fp) !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("pcap_setfilter: %s"), pcap_geterr(handle)); + _("pcap_setfilter: %1$s"), pcap_geterr(handle)); goto cleanup_freecode; } =20 if (pcap_setdirection(handle, dir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("pcap_setdirection: %s"), + _("pcap_setdirection: %1$s"), pcap_geterr(handle)); goto cleanup_freecode; } @@ -1004,8 +1003,8 @@ static void virNWFilterDHCPDecodeWorker(void *jobdata= , void *opaque) req->jobCompletionStatus =3D -1; =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("Instantiation of rules failed on " - "interface '%s'"), req->binding->portdevname); + _("Instantiation of rules failed on interface '%1$s= '"), + req->binding->portdevname); } ignore_value(!!g_atomic_int_dec_and_test(job->qCtr)); } @@ -1306,7 +1305,7 @@ virNWFilterDHCPSnoopThread(void *req0) /* protect req->binding->portdevname */ VIR_WITH_MUTEX_LOCK_GUARD(&req->lock) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("interface '%s' failing; reopenin= g"), + _("interface '%1$s' failing; reopen= ing"), req->binding->portdevname); if (req->binding->portdevname) pcapConf[i].handle =3D @@ -1359,8 +1358,8 @@ virNWFilterDHCPSnoopThread(void *req0) pcapConf[i].dir, &pcapConf[i].qCtr) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Job submission failed on " - "interface '%s'"), req->binding->port= devname); + _("Job submission failed on interface '= %1$s'"), + req->binding->portdevname); error =3D true; break; } @@ -1468,8 +1467,8 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdr= iver, req->binding->portdevname, req->ifkey) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterDHCPSnoopReq ifname map failed" - " on interface \"%s\" key \"%s\""), binding->port= devname, + _("virNWFilterDHCPSnoopReq ifname map failed on int= erface \"%1$s\" key \"%2$s\""), + binding->portdevname, ifkey); goto exit_snoopunlock; } @@ -1477,8 +1476,8 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdr= iver, if (isnewreq && virHashAddEntry(virNWFilterSnoopState.snoopReqs, ifkey, req) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterDHCPSnoopReq req add failed on" - " interface \"%s\" ifkey \"%s\""), binding->portd= evname, + _("virNWFilterDHCPSnoopReq req add failed on interf= ace \"%1$s\" ifkey \"%2$s\""), + binding->portdevname, ifkey); goto exit_rem_ifnametokey; } @@ -1489,8 +1488,8 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdr= iver, if (virThreadCreateFull(&thread, false, virNWFilterDHCPSnoopThread, "dhcp-snoop", false, req) !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterDHCPSnoopReq virThreadCreate " - "failed on interface '%s'"), binding->portdevname= ); + _("virNWFilterDHCPSnoopReq virThreadCreate failed o= n interface '%1$s'"), + binding->portdevname); goto exit_snoopreq_unlock; } =20 @@ -1501,15 +1500,15 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *tech= driver, req->threadkey =3D virNWFilterSnoopActivate(req); if (!req->threadkey) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Activation of snoop request failed on " - "interface '%s'"), req->binding->portdevname); + _("Activation of snoop request failed on interface = '%1$s'"), + req->binding->portdevname); goto exit_snoopreq_unlock; } =20 if (virNWFilterSnoopReqRestore(req) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Restoring of leases failed on " - "interface '%s'"), req->binding->portdevname); + _("Restoring of leases failed on interface '%1$s'"), + req->binding->portdevname); goto exit_snoop_cancel; } =20 @@ -1677,17 +1676,17 @@ virNWFilterSnoopLeaseFileRefresh(void) int tfd; =20 if (g_mkdir_with_parents(LEASEFILE_DIR, 0700) < 0) { - virReportError(errno, _("mkdir(\"%s\")"), LEASEFILE_DIR); + virReportError(errno, _("mkdir(\"%1$s\")"), LEASEFILE_DIR); return; } =20 if (unlink(TMPLEASEFILE) < 0 && errno !=3D ENOENT) - virReportSystemError(errno, _("unlink(\"%s\")"), TMPLEASEFILE); + virReportSystemError(errno, _("unlink(\"%1$s\")"), TMPLEASEFILE); =20 /* lease file loaded, delete old one */ tfd =3D open(TMPLEASEFILE, O_CREAT|O_RDWR|O_TRUNC|O_EXCL, 0644); if (tfd < 0) { - virReportSystemError(errno, _("open(\"%s\")"), TMPLEASEFILE); + virReportSystemError(errno, _("open(\"%1$s\")"), TMPLEASEFILE); return; } =20 @@ -1701,13 +1700,13 @@ virNWFilterSnoopLeaseFileRefresh(void) } =20 if (VIR_CLOSE(tfd) < 0) { - virReportSystemError(errno, _("unable to close %s"), TMPLEASEFILE); + virReportSystemError(errno, _("unable to close %1$s"), TMPLEASEFIL= E); /* assuming the old lease file is still better, skip the renaming = */ goto cleanup; } =20 if (rename(TMPLEASEFILE, LEASEFILE) < 0) { - virReportSystemError(errno, _("rename(\"%s\", \"%s\")"), + virReportSystemError(errno, _("rename(\"%1$s\", \"%2$s\")"), TMPLEASEFILE, LEASEFILE); unlink(TMPLEASEFILE); } @@ -1737,8 +1736,8 @@ virNWFilterSnoopLeaseFileLoad(void) =20 if (line[strlen(line)-1] !=3D '\n') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterSnoopLeaseFileLoad lease file " - "line %d corrupt"), ln); + _("virNWFilterSnoopLeaseFileLoad lease file lin= e %1$d corrupt"), + ln); break; } ln++; @@ -1746,8 +1745,8 @@ virNWFilterSnoopLeaseFileLoad(void) if (sscanf(line, "%llu %54s %15s %15s", &timeout, ifkey, ipstr, srvstr) < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterSnoopLeaseFileLoad lease file " - "line %d corrupt"), ln); + _("virNWFilterSnoopLeaseFileLoad lease file lin= e %1$d corrupt"), + ln); break; } ipl.timeout =3D timeout; @@ -1764,15 +1763,15 @@ virNWFilterSnoopLeaseFileLoad(void) if (tmp < 0) { virNWFilterSnoopReqPut(req); virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterSnoopLeaseFileLoad req add" - " failed on interface \"%s\""), ifkey); + _("virNWFilterSnoopLeaseFileLoad req add fa= iled on interface \"%1$s\""), + ifkey); continue; } } =20 if (virSocketAddrParseIPv4(&ipl.ipAddress, ipstr) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("line %d corrupt ipaddr \"%s\""), + _("line %1$d corrupt ipaddr \"%2$s\""), ln, ipstr); virNWFilterSnoopReqPut(req); continue; @@ -1917,7 +1916,7 @@ virNWFilterDHCPSnoopEnd(const char *ifname) req =3D virNWFilterSnoopReqGetByIFKey(ifkey); if (!req) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("ifkey \"%s\" has no req"), ifkey); + _("ifkey \"%1$s\" has no req"), ifkey); return; } =20 diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 3803850e26..09719edd75 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -248,7 +248,7 @@ nwfilterStateInitialize(bool privileged, driver->stateDir =3D g_strdup(RUNSTATEDIR "/libvirt/nwfilter"); =20 if (g_mkdir_with_parents(driver->stateDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create state directory '%s'"= ), + virReportSystemError(errno, _("cannot create state directory '%1$s= '"), driver->stateDir); goto error; } @@ -282,7 +282,7 @@ nwfilterStateInitialize(bool privileged, driver->configDir =3D g_strdup(SYSCONFDIR "/libvirt/nwfilter"); =20 if (g_mkdir_with_parents(driver->configDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create config directory '%s'= "), + virReportSystemError(errno, _("cannot create config directory '%1$= s'"), driver->configDir); goto error; } @@ -290,7 +290,7 @@ nwfilterStateInitialize(bool privileged, driver->bindingDir =3D g_strdup(RUNSTATEDIR "/libvirt/nwfilter-binding= "); =20 if (g_mkdir_with_parents(driver->bindingDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create config directory '%s'= "), + virReportSystemError(errno, _("cannot create config directory '%1$= s'"), driver->bindingDir); goto error; } @@ -359,7 +359,7 @@ nwfilterConnectOpen(virConnectPtr conn, =20 if (STRNEQ(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected nwfilter URI path '%s', try nwfilter:= ///system"), + _("unexpected nwfilter URI path '%1$s', try nwfilte= r:///system"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -405,7 +405,7 @@ nwfilterObjFromNWFilter(const unsigned char *uuid) if (!(obj =3D virNWFilterObjListFindByUUID(driver->nwfilters, uuid))) { virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_NWFILTER, - _("no nwfilter with matching uuid '%s'"), uuidstr); + _("no nwfilter with matching uuid '%1$s'"), uuidstr= ); } return obj; } @@ -452,7 +452,7 @@ nwfilterLookupByName(virConnectPtr conn, =20 if (!obj) { virReportError(VIR_ERR_NO_NWFILTER, - _("no nwfilter with matching name '%s'"), name); + _("no nwfilter with matching name '%1$s'"), name); return NULL; } def =3D virNWFilterObjGetDef(obj); @@ -661,7 +661,7 @@ nwfilterBindingLookupByPortDev(virConnectPtr conn, portdev); if (!obj) { virReportError(VIR_ERR_NO_NWFILTER_BINDING, - _("no nwfilter binding for port dev '%s'"), portdev= ); + _("no nwfilter binding for port dev '%1$s'"), portd= ev); goto cleanup; } =20 @@ -706,7 +706,7 @@ nwfilterBindingGetXMLDesc(virNWFilterBindingPtr binding, binding->portdev); if (!obj) { virReportError(VIR_ERR_NO_NWFILTER_BINDING, - _("no nwfilter binding for port dev '%s'"), binding= ->portdev); + _("no nwfilter binding for port dev '%1$s'"), bindi= ng->portdev); goto cleanup; } =20 @@ -790,7 +790,7 @@ nwfilterBindingDelete(virNWFilterBindingPtr binding) obj =3D virNWFilterBindingObjListFindByPortDev(driver->bindings, bindi= ng->portdev); if (!obj) { virReportError(VIR_ERR_NO_NWFILTER_BINDING, - _("no nwfilter binding for port dev '%s'"), binding= ->portdev); + _("no nwfilter binding for port dev '%1$s'"), bindi= ng->portdev); return -1; } =20 diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 24c0db5bde..99a74a60e5 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -153,8 +153,8 @@ printVar(virNWFilterVarCombIter *vars, =20 varName =3D virNWFilterVarAccessGetVarName(item->varAccess); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Buffer too small to print variable " - "'%s' into"), varName); + _("Buffer too small to print variable '%1$s' in= to"), + varName); return -1; } =20 @@ -295,7 +295,7 @@ _printDataType(virNWFilterVarCombIter *vars, case DATATYPE_STRINGCOPY: case DATATYPE_BOOLEAN: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot print data type %x"), item->datatype); + _("Cannot print data type %1$x"), item->datatype); return -1; case DATATYPE_LAST: default: @@ -1441,7 +1441,7 @@ _iptablesCreateRuleInstance(virFirewall *fw, =20 default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected protocol %d"), + _("Unexpected protocol %1$d"), rule->prtclType); return -1; } @@ -1846,8 +1846,7 @@ ebtablesCreateRuleInstance(virFirewall *fw, if (reverse && HAS_ENTRY_ITEM(&rule->p.stpHdrFilter.ethHdr.dataSrcMACAddr)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("STP filtering in %s direction with " - "source MAC address set is not supported"), + _("STP filtering in %1$s direction with source = MAC address set is not supported"), virNWFilterRuleDirectionTypeToString( VIR_NWFILTER_RULE_DIRECTION_INOUT)); return -1; @@ -2351,7 +2350,7 @@ ebtablesCreateRuleInstance(virFirewall *fw, =20 default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected rule protocol %d"), + _("Unexpected rule protocol %1$d"), rule->prtclType); return -1; } @@ -3126,8 +3125,7 @@ iptablesCheckBridgeNFCallEnabled(bool isIPv6) if (buffer[0] =3D=3D '0') { char msg[256]; g_snprintf(msg, sizeof(msg), - _("To enable ip%stables filtering for the V= M do " - "'echo 1 > %s'"), + _("To enable ip%1$stables filtering for the= VM do 'echo 1 > %2$s'"), isIPv6 ? "6" : "", pathname); VIR_WARN("%s", msg); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter= _gentech_driver.c index 979b13fa2c..72e24e2f08 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -514,8 +514,7 @@ virNWFilterDoInstantiate(virNWFilterTechDriver *techdri= ver, } else { rc =3D -1; virReportError(VIR_ERR_PARSE_FAILED, - _("filter '%s' " - "learning value '%s' invalid."), + _("filter '%1$s' learning value '%2$s' inva= lid."), filter->name, learning); goto error; } @@ -576,8 +575,8 @@ virNWFilterDoInstantiate(virNWFilterTechDriver *techdri= ver, buf =3D virNWFilterPrintVars(missing_vars, ", ", false, reportIP); if (buf) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot instantiate filter due to unresolvable " - "variables or unavailable list elements: %s"), bu= f); + _("Cannot instantiate filter due to unresolvable va= riables or unavailable list elements: %1$s"), + buf); } =20 rc =3D -1; @@ -632,8 +631,7 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverSta= te *driver, =20 if (!techdriver) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get access to ACL tech " - "driver '%s'"), + _("Could not get access to ACL tech driver '%1$s'"), drvname); return -1; } @@ -779,8 +777,7 @@ virNWFilterRollbackUpdateFilter(virNWFilterBindingDef *= binding) techdriver =3D virNWFilterTechDriverForName(drvname); if (!techdriver) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get access to ACL tech " - "driver '%s'"), + _("Could not get access to ACL tech driver '%1$s'"), drvname); return -1; } @@ -805,8 +802,7 @@ virNWFilterTearOldFilter(virNWFilterBindingDef *binding) techdriver =3D virNWFilterTechDriverForName(drvname); if (!techdriver) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get access to ACL tech " - "driver '%s'"), + _("Could not get access to ACL tech driver '%1$s'"), drvname); return -1; } @@ -830,8 +826,7 @@ _virNWFilterTeardownFilter(const char *ifname) =20 if (!techdriver) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get access to ACL tech " - "driver '%s'"), + _("Could not get access to ACL tech driver '%1$s'"), drvname); return -1; } diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index 0f3042a893..90e9a21a4e 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -155,7 +155,7 @@ virNWFilterLockIface(const char *ifname) =20 if (virStrcpyStatic(ifaceLock->ifname, ifname) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("interface name %s does not fit into buff= er"), + _("interface name %1$s does not fit into bu= ffer"), ifaceLock->ifname); g_free(ifaceLock); return -1; @@ -607,8 +607,8 @@ learnIPAddressThread(void *arg) =20 if ((inetaddr =3D virSocketAddrFormat(&sa)) !=3D NULL) { if (virNWFilterIPAddrMapAddIPAddr(req->binding->portdevname, i= netaddr) < 0) { - VIR_ERROR(_("Failed to add IP address %s to IP address " - "cache for interface %s"), inetaddr, req->bindin= g->portdevname); + VIR_ERROR(_("Failed to add IP address %1$s to IP address c= ache for interface %2$s"), + inetaddr, req->binding->portdevname); } =20 ret =3D virNWFilterInstantiateFilterLate(req->driver, @@ -620,8 +620,7 @@ learnIPAddressThread(void *arg) } else { if (showError) virReportSystemError(req->status, - _("encountered an error on interface %s " - "index %d"), + _("encountered an error on interface %1$s= index %2$d"), req->binding->portdevname, req->ifindex); =20 techdriver->applyDropAllRules(req->binding->portdevname); --=20 2.39.2