From nobody Sun Feb 8 14:07:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1576070646; cv=none; d=zohomail.com; s=zohoarc; b=nMSRnzbE+fpZT+otFkoDD6CQ46o9BE5jxD/Q6Flteu6x5hYdSZM0bc+dAcSLDMusxI9kNA4WBfksd+zewesd75SeDLIFe7kPMcP1dVtE6xhTlo38pTh5ifd3ceM/IEcy/gKwwGraBgNSWd6xrQuYsLLUTohRPE/UiHZKgc+C/nE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576070646; 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=wK8WbYqK4HW/OrS6UKA3e7Ew5CgGWQon2nO68AdiQLY=; b=GhXYiYoY8kFF4g3H1vkVIPIguT6s53tdBuj6QhTnPOqf8aFmEpDLvl0syKzE/3BIcq8ouVW8QT4RjkFl4/SGhg4FO+slZgi+86ZqxmSL1n6RxRKQTDge1hbcCKUJMRzlwuHgrB1Zjx37ab1W0OOKP5HNma6AsZep0zqDdTFz2gs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1576070646402289.5766259428585; Wed, 11 Dec 2019 05:24:06 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-220--ZNQq9v2O2eYicjAu2rKQQ-1; Wed, 11 Dec 2019 08:24:03 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB36C1010FFC; Wed, 11 Dec 2019 13:23:57 +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 94D315DA7B; Wed, 11 Dec 2019 13:23:57 +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 40A0C83716; Wed, 11 Dec 2019 13:23:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBBDMcPN019937 for ; Wed, 11 Dec 2019 08:22:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6D60263BC6; Wed, 11 Dec 2019 13:22:38 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7DA063BBA for ; Wed, 11 Dec 2019 13:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576070645; 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=wK8WbYqK4HW/OrS6UKA3e7Ew5CgGWQon2nO68AdiQLY=; b=a+M5ziKo22Akx4WG5Tqiyl+kt/qNsbIPkM1JOY/s7oARTVSDCQ/302GXW7PZ3frpkhg+js i6E9KCLDuGXkCFUClXPl445isjuaZUiCLeEMt2JFazSBuaGxn79TzQWLn8aAoZKD8Ureg4 nWh2L9J7I1jyug8hWVyFuNsNqgjtVwU= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Wed, 11 Dec 2019 14:23:21 +0100 Message-Id: <6ece16bb772847927426c3a9f55bc136d68bd095.1576070578.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCHv2 5/8] Remove the rest of VIR_STRNDUP 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: -ZNQq9v2O2eYicjAu2rKQQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Replace all the uses passing a single parameter as the length. Signed-off-by: J=C3=A1n Tomko --- src/conf/nwfilter_conf.c | 4 ++-- src/conf/nwfilter_params.c | 6 ++---- src/interface/interface_backend_udev.c | 8 ++------ src/libxl/xen_common.c | 3 +-- src/libxl/xen_xl.c | 6 ++---- src/libxl/xen_xm.c | 6 ++---- src/qemu/qemu_monitor_json.c | 3 +-- src/rpc/virnetlibsshsession.c | 7 ++----- src/util/virjson.c | 11 +++-------- src/util/virkeyfile.c | 3 +-- src/util/virsocketaddr.c | 5 +---- src/util/virstoragefile.c | 3 +-- src/util/virstring.c | 3 +-- 13 files changed, 21 insertions(+), 47 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 5bcf52a84c..d071c398bc 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -400,8 +400,8 @@ virNWFilterRuleDefAddString(virNWFilterRuleDefPtr nwf, { char *tmp; =20 - if (VIR_STRNDUP(tmp, string, maxstrlen) < 0 || - VIR_APPEND_ELEMENT_COPY(nwf->strings, nwf->nstrings, tmp) < 0) + tmp =3D g_strndup(string, maxstrlen); + if (VIR_APPEND_ELEMENT_COPY(nwf->strings, nwf->nstrings, tmp) < 0) VIR_FREE(tmp); =20 return tmp; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index b1a2c50f27..4110169135 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -884,8 +884,7 @@ virNWFilterVarAccessParse(const char *varAccess) =20 if (input[idx] =3D=3D '\0') { /* in the form 'IP', which is equivalent to IP[@0] */ - if (VIR_STRNDUP(dest->varName, input, idx) < 0) - goto err_exit; + dest->varName =3D g_strndup(input, idx); dest->accessType =3D VIR_NWFILTER_VAR_ACCESS_ITERATOR; dest->u.iterId =3D 0; return dest; @@ -898,8 +897,7 @@ virNWFilterVarAccessParse(const char *varAccess) =20 varNameLen =3D idx; =20 - if (VIR_STRNDUP(dest->varName, input, varNameLen) < 0) - goto err_exit; + dest->varName =3D g_strndup(input, varNameLen); =20 input +=3D idx + 1; virSkipSpaces(&input); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index 7df5cf2cc3..26b1045f8a 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -953,12 +953,8 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, goto cleanup; } =20 - if (VIR_STRNDUP(ifacedef->data.vlan.tag, vid_pos, vid_len) < 0) - goto cleanup; - if (VIR_STRNDUP(ifacedef->data.vlan.dev_name, dev_pos, dev_len) < 0) { - VIR_FREE(ifacedef->data.vlan.tag); - goto cleanup; - } + ifacedef->data.vlan.tag =3D g_strndup(vid_pos, vid_len); + ifacedef->data.vlan.dev_name =3D g_strndup(dev_pos, dev_len); =20 ret =3D 0; =20 diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 89ced6ae2b..415549a42c 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1153,8 +1153,7 @@ xenParseVif(char *entry, const char *vif_typename) } else if (STRPREFIX(key, "script=3D")) { int len =3D nextkey ? (nextkey - data) : strlen(data); VIR_FREE(script); - if (VIR_STRNDUP(script, data, len) < 0) - return NULL; + script =3D g_strndup(data, len); } else if (STRPREFIX(key, "model=3D")) { int len =3D nextkey ? (nextkey - data) : strlen(data); if (virStrncpy(model, data, len, sizeof(model)) < 0) { diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index cdff71f11b..8112214b5f 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1104,13 +1104,11 @@ xenParseXLChannel(virConfPtr conf, virDomainDefPtr = def) } else if (STRPREFIX(key, "name=3D")) { int len =3D nextkey ? (nextkey - data) : strlen(data); VIR_FREE(name); - if (VIR_STRNDUP(name, data, len) < 0) - goto cleanup; + name =3D g_strndup(data, len); } else if (STRPREFIX(key, "path=3D")) { int len =3D nextkey ? (nextkey - data) : strlen(data); VIR_FREE(path); - if (VIR_STRNDUP(path, data, len) < 0) - goto cleanup; + path =3D g_strndup(data, len); } =20 while (nextkey && (nextkey[0] =3D=3D ',' || diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index a196912194..5d5d521c18 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -167,8 +167,7 @@ xenParseXMDisk(char *entry, int hvm) /* The main type phy:, file:, tap: ... */ if ((tmp =3D strchr(src, ':')) !=3D NULL) { len =3D tmp - src; - if (VIR_STRNDUP(tmp, src, len) < 0) - goto error; + tmp =3D g_strndup(src, len); =20 if (virDomainDiskSetDriver(disk, tmp) < 0) { VIR_FREE(tmp); @@ -192,8 +191,7 @@ xenParseXMDisk(char *entry, int hvm) goto error; len =3D tmp - src; =20 - if (VIR_STRNDUP(driverType, src, len) < 0) - goto error; + driverType =3D g_strndup(src, len); =20 if (STREQ(driverType, "aio")) virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index b2f695a70c..b4d103a37b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -271,8 +271,7 @@ int qemuMonitorJSONIOProcess(qemuMonitorPtr mon, if (nl) { int got =3D nl - (data + used); char *line; - if (VIR_STRNDUP(line, data + used, got) < 0) - return -1; + line =3D g_strndup(data + used, got); used +=3D got + strlen(LINE_ENDING); line[got] =3D '\0'; /* kill \n */ if (qemuMonitorJSONIOProcessLine(mon, line, msg) < 0) { diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 2312939cdc..e874929740 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -431,9 +431,7 @@ virNetLibsshAuthenticatePrivkeyCb(const char *prompt, goto error; } =20 - if (VIR_STRNDUP(actual_prompt, prompt, - virLengthForPromptString(prompt)) < 0) - goto error; + actual_prompt =3D g_strndup(prompt, virLengthForPromptString(prompt)); =20 memset(&retr_passphrase, 0, sizeof(virConnectCredential)); retr_passphrase.type =3D cred_type; @@ -716,8 +714,7 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibss= hSessionPtr sess, =20 prompt =3D virBufferContentAndReset(&prompt_buff); } else { - if (VIR_STRNDUP(prompt, promptStr, promptStrLen) < 0) - goto prompt_error; + prompt =3D g_strndup(promptStr, promptStrLen); } =20 memset(&retr_passphrase, 0, sizeof(virConnectCredential)); diff --git a/src/util/virjson.c b/src/util/virjson.c index c57dc11f78..988a09e956 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -462,10 +462,7 @@ virJSONValueNewStringLen(const char *data, return NULL; =20 val->type =3D VIR_JSON_TYPE_STRING; - if (VIR_STRNDUP(val->data.string, data, length) < 0) { - VIR_FREE(val); - return NULL; - } + val->data.string =3D g_strndup(data, length); =20 return val; } @@ -1632,8 +1629,7 @@ virJSONParserHandleNumber(void *ctx, char *str; virJSONValuePtr value; =20 - if (VIR_STRNDUP(str, s, l) < 0) - return -1; + str =3D g_strndup(s, l); value =3D virJSONValueNewNumber(str); VIR_FREE(str); =20 @@ -1690,8 +1686,7 @@ virJSONParserHandleMapKey(void *ctx, state =3D &parser->state[parser->nstate-1]; if (state->key) return 0; - if (VIR_STRNDUP(state->key, (const char *)stringVal, stringLen) < 0) - return 0; + state->key =3D g_strndup((const char *)stringVal, stringLen); return 1; } =20 diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index ece31667ce..84b1b0e55a 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -173,8 +173,7 @@ static int virKeyFileParseValue(virKeyFileParserCtxtPtr= ctxt) len =3D ctxt->cur - valuestart; if (IS_EOF && !IS_EOL(CUR)) len++; - if (VIR_STRNDUP(value, valuestart, len) < 0) - goto cleanup; + value =3D g_strndup(valuestart, len); =20 if (virHashAddEntry(ctxt->group, key, value) < 0) { VIR_FREE(value); diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index d7b0f12d96..ef51d3fa7d 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -593,10 +593,7 @@ virSocketAddrGetPath(virSocketAddrPtr addr G_GNUC_UNUS= ED) return NULL; } =20 - if (VIR_STRNDUP(path, - addr->data.un.sun_path, - sizeof(addr->data.un.sun_path)) < 0) - return NULL; + path =3D g_strndup(addr->data.un.sun_path, sizeof(addr->data.un.sun_pa= th)); =20 return path; #else diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 8918f905a2..14e1efc9e8 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -420,8 +420,7 @@ cowGetBackingStore(char **res, return BACKING_STORE_OK; } =20 - if (VIR_STRNDUP(*res, (const char*)buf + 4 + 4, COW_FILENAME_MAXLEN) <= 0) - return BACKING_STORE_ERROR; + *res =3D g_strndup((const char *)buf + 4 + 4, COW_FILENAME_MAXLEN); return BACKING_STORE_OK; } =20 diff --git a/src/util/virstring.c b/src/util/virstring.c index bd7c640042..7cf32fda3e 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -89,8 +89,7 @@ virStringSplitCount(const char *string, if (VIR_RESIZE_N(tokens, maxtokens, ntokens, 1) < 0) goto error; =20 - if (VIR_STRNDUP(tokens[ntokens], remainder, len) < 0) - goto error; + tokens[ntokens] =3D g_strndup(remainder, len); ntokens++; remainder =3D tmp + delimlen; tmp =3D strstr(remainder, delim); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list