From nobody Sat May 4 11:37:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15021206755701010.4283826449127; Mon, 7 Aug 2017 08:44:35 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8E6EA80481; Mon, 7 Aug 2017 15:44:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF7976A30A; Mon, 7 Aug 2017 15:44:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2AB924BB78; Mon, 7 Aug 2017 15:44:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v77FiRnn018708 for ; Mon, 7 Aug 2017 11:44:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id B63A05D961; Mon, 7 Aug 2017 15:44:27 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F9395D9C9 for ; Mon, 7 Aug 2017 15:44:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8E6EA80481 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 7 Aug 2017 17:42:59 +0200 Message-Id: <164205032724b5fc5e57dada6f089ec3007ec4af.1502120573.git.jtomko@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] introduce virConfReadString X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 07 Aug 2017 15:44:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rewrite virConfReadMem to take a null-terminated string. All the callers were calling strlen on it anyway. --- daemon/libvirtd-config.c | 2 +- src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 4 ++-- src/lxc/lxc_native.c | 2 +- src/util/virconf.c | 16 ++++++++-------- src/util/virconf.h | 4 ++-- src/vmx/vmx.c | 4 ++-- src/xen/xen_driver.c | 2 +- tests/virconftest.c | 8 ++++---- tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 6c0f00ed8..db283a41f 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -433,7 +433,7 @@ int daemonConfigLoadData(struct daemonConfig *data, virConfPtr conf; int ret; =20 - conf =3D virConfReadMem(filedata, strlen(filedata), 0); + conf =3D virConfReadString(filedata, 0); if (!conf) return -1; =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 32ac0835e..183a9194d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1520,7 +1520,7 @@ virConfGetValueULLong; virConfLoadConfig; virConfNew; virConfReadFile; -virConfReadMem; +virConfReadString; virConfSetValue; virConfTypeFromString; virConfTypeToString; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 907f1776f..c261e2155 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2605,14 +2605,14 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, goto cleanup; =20 if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XL)) { - if (!(conf =3D virConfReadMem(nativeConfig, strlen(nativeConfig), = 0))) + if (!(conf =3D virConfReadString(nativeConfig, 0))) goto cleanup; if (!(def =3D xenParseXL(conf, cfg->caps, driver->xmlopt))) goto cleanup; } else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XM)) { - if (!(conf =3D virConfReadMem(nativeConfig, strlen(nativeConfig), = 0))) + if (!(conf =3D virConfReadString(nativeConfig, 0))) goto cleanup; =20 if (!(def =3D xenParseXM(conf, diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 7bcdf1fb0..5fc6e7cda 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1000,7 +1000,7 @@ lxcParseConfigString(const char *config, virConfPtr properties =3D NULL; virConfValuePtr value; =20 - if (!(properties =3D virConfReadMem(config, 0, VIR_CONF_FLAG_LXC_FORMA= T))) + if (!(properties =3D virConfReadString(config, VIR_CONF_FLAG_LXC_FORMA= T))) return NULL; =20 if (!(vmdef =3D virDomainDefNew())) diff --git a/src/util/virconf.c b/src/util/virconf.c index c1f41b7e1..e505848f1 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -807,27 +807,27 @@ virConfReadFile(const char *filename, unsigned int fl= ags) } =20 /** - * virConfReadMem: + * virConfReadString: * @memory: pointer to the content of the configuration file - * @len: length in byte * @flags: combination of virConfFlag(s) * - * Reads a configuration file loaded in memory. The string can be - * zero terminated in which case @len can be 0 + * Reads a configuration file loaded in memory. The string must be + * zero terminated. * * Returns a handle to lookup settings or NULL if it failed to * parse the content, use virConfFree() to free the data. */ virConfPtr -virConfReadMem(const char *memory, int len, unsigned int flags) +virConfReadString(const char *memory, unsigned int flags) { - if ((memory =3D=3D NULL) || (len < 0)) { + size_t len; + + if (memory =3D=3D NULL) { virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return NULL; } - if (len =3D=3D 0) - len =3D strlen(memory); =20 + len =3D strlen(memory); return virConfParse("memory conf", memory, len, flags); } =20 diff --git a/src/util/virconf.h b/src/util/virconf.h index 23fea4900..f7d9a369c 100644 --- a/src/util/virconf.h +++ b/src/util/virconf.h @@ -79,8 +79,8 @@ typedef int (*virConfWalkCallback)(const char* name, =20 virConfPtr virConfNew(void); virConfPtr virConfReadFile(const char *filename, unsigned int flags); -virConfPtr virConfReadMem(const char *memory, - int len, unsigned int flags); +virConfPtr virConfReadString(const char *memory, + unsigned int flags); int virConfFree(virConfPtr conf); void virConfFreeValue(virConfValuePtr val); virConfValuePtr virConfGetValue(virConfPtr conf, diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 96507f10f..3e2f4c3e1 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1312,7 +1312,7 @@ virVMXParseConfig(virVMXContext *ctx, return NULL; } =20 - conf =3D virConfReadMem(vmx, strlen(vmx), VIR_CONF_FLAG_VMX_FORMAT); + conf =3D virConfReadString(vmx, VIR_CONF_FLAG_VMX_FORMAT); =20 if (conf =3D=3D NULL) return NULL; @@ -1332,7 +1332,7 @@ virVMXParseConfig(virVMXContext *ctx, if (utf8 =3D=3D NULL) goto cleanup; =20 - conf =3D virConfReadMem(utf8, strlen(utf8), VIR_CONF_FLAG_VMX_FORM= AT); + conf =3D virConfReadString(utf8, VIR_CONF_FLAG_VMX_FORMAT); =20 VIR_FREE(utf8); =20 diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index b5cd47e02..dae0f4f28 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1553,7 +1553,7 @@ xenUnifiedConnectDomainXMLFromNative(virConnectPtr co= nn, } =20 if (STREQ(format, XEN_CONFIG_FORMAT_XM)) { - conf =3D virConfReadMem(config, strlen(config), 0); + conf =3D virConfReadString(config, 0); if (!conf) goto cleanup; =20 diff --git a/tests/virconftest.c b/tests/virconftest.c index 1f4b561bb..9d43465a7 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -89,7 +89,7 @@ static int testConfParseInt(const void *opaque ATTRIBUTE_= UNUSED) "string =3D \"foo\"\n"; =20 int ret =3D -1; - virConfPtr conf =3D virConfReadMem(srcdata, strlen(srcdata), 0); + virConfPtr conf =3D virConfReadString(srcdata, 0); int iv; unsigned int ui; size_t s; @@ -238,7 +238,7 @@ static int testConfParseBool(const void *opaque ATTRIBU= TE_UNUSED) "string =3D \"foo\"\n"; =20 int ret =3D -1; - virConfPtr conf =3D virConfReadMem(srcdata, strlen(srcdata), 0); + virConfPtr conf =3D virConfReadString(srcdata, 0); bool f =3D true; bool t =3D false; =20 @@ -302,7 +302,7 @@ static int testConfParseString(const void *opaque ATTRI= BUTE_UNUSED) "string =3D \"foo\"\n"; =20 int ret =3D -1; - virConfPtr conf =3D virConfReadMem(srcdata, strlen(srcdata), 0); + virConfPtr conf =3D virConfReadString(srcdata, 0); char *str =3D NULL; =20 if (!conf) @@ -342,7 +342,7 @@ static int testConfParseStringList(const void *opaque A= TTRIBUTE_UNUSED) "string =3D \"foo\"\n"; =20 int ret =3D -1; - virConfPtr conf =3D virConfReadMem(srcdata, strlen(srcdata), 0); + virConfPtr conf =3D virConfReadString(srcdata, 0); char **str =3D NULL; =20 if (!conf) diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 3fe42988d..30468c905 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -146,7 +146,7 @@ testCompareFormatXML(const char *xlcfg, const char *xml= , bool replaceVars) if (virTestLoadFile(xlcfg, &xlcfgData) < 0) goto fail; =20 - if (!(conf =3D virConfReadMem(xlcfgData, strlen(xlcfgData), 0))) + if (!(conf =3D virConfReadString(xlcfgData, 0))) goto fail; =20 if (!(def =3D xenParseXL(conf, caps, xmlopt))) diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 345223ffe..d8455da66 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -115,7 +115,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml) priv.caps =3D caps; conn->privateData =3D &priv; =20 - if (!(conf =3D virConfReadMem(xmcfgData, strlen(xmcfgData), 0))) + if (!(conf =3D virConfReadString(xmcfgData, 0))) goto fail; =20 if (!(def =3D xenParseXM(conf, caps, xmlopt))) --=20 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list