From nobody Fri Dec 19 04:17:18 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=1678464705; cv=none; d=zohomail.com; s=zohoarc; b=lHXlSu6H/NKO4evm0NmeCfkxqUHQv2BMs4zRdS9B4UgOd0W/OtB/Qcj9qSmykWDTdT3hjzbyedYSAFTpHKqlnBj8IokKDmPmXxX1QeBjSDibyQk7dQwmf921SzST0loRFnx5rBREwDowiTzxyPLuWMfu80ZqSBKxw6RqZ+194Tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464705; 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=yB8HMPZ5VdRhmnVrWyJV6SQQ5APIr74LPryWUaRdcAU=; b=m7zGJMwrHmDkQptGpmnQ5Zz34ezs+AZPryIlAnnU75nJYqXtDKLIW9iWTvZcwswC4SzwW/AjanYyH70fTT9HmZpYwTecZ5j8mKITU6rJFs6QclpSvf/LhR62+Jyj9nDv+eq/7muIB6fTmPD9rtgfP3UfsDIKJ2Z9rqpBvrvNHyk= 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 1678464705356371.66845214500495; Fri, 10 Mar 2023 08:11:45 -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-497-spXdl9VEOCadxh2EiJ1wPA-1; Fri, 10 Mar 2023 11:11:38 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 26370100F919; Fri, 10 Mar 2023 16:11:11 +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 105EB2166B26; Fri, 10 Mar 2023 16:11:11 +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 01AF51946A4A; Fri, 10 Mar 2023 16:11:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0CC2E1946A69 for ; Fri, 10 Mar 2023 16:11:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 02878492B05; Fri, 10 Mar 2023 16:11:10 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8ECF492B04 for ; Fri, 10 Mar 2023 16:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464704; 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=yB8HMPZ5VdRhmnVrWyJV6SQQ5APIr74LPryWUaRdcAU=; b=hiAaU3aIoZYkbrpHkSNJIrhcSOIIJ+NrXUR9dRh1mOCT/fzoDe26tyTPATAmbhvT/F+WoS EegkweFlduQBVCuBdy+gBOgmtBtIcxavMbkh/GJ6syzMWU6ziAXuSLfLRm9HYbG7zoyqio 51sYzStCJP0oX4ijbDiD5WC384ntNjQ= X-MC-Unique: spXdl9VEOCadxh2EiJ1wPA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 44/51] vmware: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:10:00 +0100 Message-Id: <7095bf47853f1f5e74b6214b7ec2d65cc4a66314.1678463799.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.6 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: 1678464707227100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/vmware/vmware_conf.c | 16 ++++++++-------- src/vmware/vmware_driver.c | 26 ++++++++++++++------------ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 5703ce717e..8303591a9b 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -212,19 +212,19 @@ vmwareParseVersionStr(int type, const char *verbuf, u= nsigned long *version) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid driver type: %d"), type); + _("Invalid driver type: %1$d"), type); return -1; } =20 if ((tmp =3D strstr(verbuf, pattern)) =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find version pattern \"%s\""), pattern); + _("cannot find version pattern \"%1$s\""), pattern); return -1; } =20 if ((tmp =3D STRSKIP(tmp, pattern)) =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse %sversion"), pattern); + _("failed to parse %1$sversion"), pattern); return -1; } =20 @@ -311,7 +311,7 @@ vmwareParsePath(const char *path, char **directory, cha= r **filename) =20 if (*separator =3D=3D '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("path '%s' doesn't reference a file"), path); + _("path '%1$s' doesn't reference a file"), path= ); return -1; } =20 @@ -385,8 +385,8 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) =20 if (!virStringHasCaseSuffix(fileName, ".vmdk")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting source '%s' of first file-based harddi= sk " - "to be a VMDK image"), src); + _("Expecting source '%1$s' of first file-based hard= disk to be a VMDK image"), + src); return -1; } =20 @@ -401,7 +401,7 @@ vmwareMoveFile(char *srcFile, char *dstFile) g_autoptr(virCommand) cmd =3D NULL; =20 if (!virFileExists(srcFile)) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("file %s does not exist"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("file %1$s does not exist= "), srcFile); return -1; } @@ -413,7 +413,7 @@ vmwareMoveFile(char *srcFile, char *dstFile) =20 if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to move file to %s "), dstFile); + _("failed to move file to %1$s "), dstFile); return -1; } =20 diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 3c578434f3..259d00cacd 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -57,7 +57,7 @@ vmwareDomObjFromDomainLocked(struct vmware_driver *driver, virUUIDFormat(uuid, uuidstr); =20 virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + _("no domain with matching uuid '%1$s'"), uuidstr); return NULL; } =20 @@ -158,7 +158,7 @@ vmwareConnectOpen(virConnectPtr conn, /* If path isn't /session, then they typoed, so tell them correct path= */ if (STRNEQ(conn->uri->path, "/session")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected VMware URI path '%s', try vmwareplaye= r:///session, vmwarews:///session or vmwarefusion:///session"), + _("unexpected VMware URI path '%1$s', try vmwarepla= yer:///session, vmwarews:///session or vmwarefusion:///session"), NULLSTR(conn->uri->path)); return VIR_DRV_OPEN_ERROR; } @@ -177,7 +177,7 @@ vmwareConnectOpen(virConnectPtr conn, if (vmrun =3D=3D NULL) continue; if (virFileResolveLink(vmrun, &driver->vmrun) < 0) { - virReportSystemError(errno, _("unable to resolve symlink '%s'"= ), vmrun); + virReportSystemError(errno, _("unable to resolve symlink '%1$s= '"), vmrun); goto cleanup; } VIR_FREE(vmrun); @@ -196,8 +196,9 @@ vmwareConnectOpen(virConnectPtr conn, goto cleanup; =20 if ((tmp =3D STRSKIP(conn->uri->scheme, "vmware")) =3D=3D NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " - "scheme '%s'"), conn->uri->scheme); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to parse URI scheme '%1$s'"), + conn->uri->scheme); goto cleanup; } =20 @@ -205,8 +206,9 @@ vmwareConnectOpen(virConnectPtr conn, driver->type =3D vmwareDriverTypeFromString(tmp); =20 if (driver->type =3D=3D -1) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " - "requested VMware backend '%s'"), tmp); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to find valid requested VMware backend '%= 1$s'"), + tmp); goto cleanup; } =20 @@ -407,7 +409,7 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla /* create vmx file */ if (virFileWriteStr(vmxPath, vmx, S_IRUSR|S_IWUSR) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to write vmx file '%s'"), vmxPath); + _("Failed to write vmx file '%1$s'"), vmxPath); goto cleanup; } =20 @@ -652,7 +654,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *x= ml, /* create vmx file */ if (virFileWriteStr(vmxPath, vmx, S_IRUSR|S_IWUSR) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to write vmx file '%s'"), vmxPath); + _("Failed to write vmx file '%1$s'"), vmxPath); goto cleanup; } =20 @@ -775,7 +777,7 @@ vmwareDomainLookupByID(virConnectPtr conn, int id) =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id '%d'"), id); + _("no domain with matching id '%1$d'"), id); goto cleanup; } =20 @@ -832,7 +834,7 @@ vmwareDomainLookupByName(virConnectPtr conn, const char= *name) =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); goto cleanup; } =20 @@ -910,7 +912,7 @@ vmwareConnectDomainXMLFromNative(virConnectPtr conn, co= nst char *nativeFormat, =20 if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported config format '%s'"), nativeFormat); + _("Unsupported config format '%1$s'"), nativeFormat= ); return NULL; } =20 --=20 2.39.2