From nobody Sun Feb 8 16:12:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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=1571576221; cv=none; d=zoho.com; s=zohoarc; b=MfzqJfpCa8f96/RFShoPP9lhorNaOxpGNWThL7yDLS1qBXqBjl1Va2Bd1ZqEV28v6DHiSernYNKtl/UJANK3V+XyBnNfDhcyEQwkDaWyHs/m+a7uD1DArOcEe/cmu7lC8SdKQOtNAk/BbejytgRoDjPVBRYLM4Rk230EEYIAIyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571576221; 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=mPJi7Hw58F2C5Do5V+tjXY9KyyXgAyQ3ICTqIumdnQ0=; b=TJ4wQnMsMEF/i7crbfs9eF0UgX1t7B5C0K28GYr5yHnu+ecEfDqUo4YLmmBgpvLk68PuTd4BumPYIWKV0hhStS/uy2ttxl6Zbuuhnk94HmCwIGU9uSha0NXxufeVzyGL3cIrFp1SobRTcyEAbnXmqm5XGVreoze2bh6PHMESrYk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 157157622154847.39353648607596; Sun, 20 Oct 2019 05:57:01 -0700 (PDT) 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-25-KBlm_IFJM5ykC03IilUWEQ-1; Sun, 20 Oct 2019 08:56:58 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD2885EF; Sun, 20 Oct 2019 12:56:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A15E100EBDC; Sun, 20 Oct 2019 12:56:53 +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 596CB1803B5A; Sun, 20 Oct 2019 12:56:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9KCuGTl023670 for ; Sun, 20 Oct 2019 08:56:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0F9BB3DA3; Sun, 20 Oct 2019 12:56:16 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-23.brq.redhat.com [10.40.200.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75C7B194B9 for ; Sun, 20 Oct 2019 12:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571576220; 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=mPJi7Hw58F2C5Do5V+tjXY9KyyXgAyQ3ICTqIumdnQ0=; b=HUL9p0k++q5i5QJ5inoEs+6J0c4LMPo2BvZAFhFkhKc1uL3D5QUBUxj+zoQX0OX9rrueGx KHAN9STNDC2OXlJb0gc7ASgZlZanq4NHMBI2HJxVwf/pmofwUJWoOmi9ett2rxLBgD3Ed5 4M1FVehf1MdiVWhIi9UiWuZ+Nyh3DWo= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Sun, 20 Oct 2019 14:55:52 +0200 Message-Id: <84a072a358326d340eb95b84e087f26193afa7ad.1571575890.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 34/34] Use g_strdup instead of VIR_STRDUP everywhere 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.84 on 10.5.11.22 X-MC-Unique: KBlm_IFJM5ykC03IilUWEQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a =3D g_strdup(b); Signed-off-by: J=C3=A1n Tomko --- src/admin/admin_server_dispatch.c | 3 +-- src/hyperv/hyperv_driver.c | 13 ++++--------- src/hyperv/hyperv_util.c | 3 +-- src/libvirt-admin.c | 18 ++++++------------ src/libvirt.c | 16 +++++----------- src/openvz/openvz_conf.c | 14 ++++---------- src/openvz/openvz_driver.c | 12 ++++-------- src/phyp/phyp_driver.c | 25 ++++++++----------------- src/vmware/vmware_conf.c | 11 +++-------- src/vmware/vmware_driver.c | 6 ++---- src/vmx/vmx.c | 14 +++++++------- src/vz/vz_driver.c | 3 +-- src/vz/vz_sdk.c | 29 +++++++++-------------------- 13 files changed, 55 insertions(+), 112 deletions(-) diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis= patch.c index e56da3ba9f..0956084301 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -139,8 +139,7 @@ static int G_GNUC_WARN_UNUSED_RESULT make_nonnull_server(admin_nonnull_server *srv_dst, virNetServerPtr srv_src) { - if (VIR_STRDUP(srv_dst->name, virNetServerGetName(srv_src)) < 0) - return -1; + srv_dst->name =3D g_strdup(virNetServerGetName(srv_src)); return 0; } =20 diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index d69542b500..542253b8b8 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -149,8 +149,7 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr= auth, =20 /* Request credentials */ if (conn->uri->user !=3D NULL) { - if (VIR_STRDUP(username, conn->uri->user) < 0) - goto cleanup; + username =3D g_strdup(conn->uri->user); } else { if (!(username =3D virAuthGetUsername(conn, auth, "hyperv", "administrator", @@ -846,13 +845,10 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned = int flags) return NULL; } =20 - if (VIR_STRDUP(def->name, computerSystem->data.common->ElementName) < = 0) - goto cleanup; + def->name =3D g_strdup(computerSystem->data.common->ElementName); =20 if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V1) { - if (VIR_STRDUP(def->description, - virtualSystemSettingData->data.v1->Notes) < 0) - goto cleanup; + def->description =3D g_strdup(virtualSystemSettingData->data.v1->N= otes); } else if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V2 && virtualSystemSettingData->data.v2->Notes.data !=3D NULL) { char **notes =3D (char **)virtualSystemSettingData->data.v2->Notes= .data; @@ -935,8 +931,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, cha= r **const names, int maxn =20 for (computerSystem =3D computerSystemList; computerSystem !=3D NULL; computerSystem =3D computerSystem->next) { - if (VIR_STRDUP(names[count], computerSystem->data.common->ElementN= ame) < 0) - goto cleanup; + names[count] =3D g_strdup(computerSystem->data.common->ElementName= ); =20 ++count; =20 diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index 3b84713426..2425d6a0c6 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -54,8 +54,7 @@ hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) if (STRCASEEQ(queryParam->name, "transport")) { VIR_FREE((*parsedUri)->transport); =20 - if (VIR_STRDUP((*parsedUri)->transport, queryParam->value) < 0) - goto cleanup; + (*parsedUri)->transport =3D g_strdup(queryParam->value); =20 if (STRNEQ((*parsedUri)->transport, "http") && STRNEQ((*parsedUri)->transport, "https")) { diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 93c73615e3..9a18ea0f8b 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -112,8 +112,7 @@ getSocketPath(virURIPtr uri) =20 if (STREQ(param->name, "socket")) { VIR_FREE(sock_path); - if (VIR_STRDUP(sock_path, param->value) < 0) - goto error; + sock_path =3D g_strdup(param->value); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown URI parameter '%s'"), param->name); @@ -140,8 +139,7 @@ getSocketPath(virURIPtr uri) } =20 if (legacy) { - if (VIR_STRDUP(sockbase, "libvirt-admin-sock") < 0) - goto error; + sockbase =3D g_strdup("libvirt-admin-sock"); } else { if (virAsprintf(&sockbase, "%s-admin-sock", uri->scheme) < 0) goto error; @@ -177,8 +175,7 @@ virAdmGetDefaultURI(virConfPtr conf, char **uristr) { const char *defname =3D getenv("LIBVIRT_ADMIN_DEFAULT_URI"); if (defname && *defname) { - if (VIR_STRDUP(*uristr, defname) < 0) - return -1; + *uristr =3D g_strdup(defname); VIR_DEBUG("Using LIBVIRT_ADMIN_DEFAULT_URI '%s'", *uristr); } else { if (virConfGetValueString(conf, "uri_default", uristr) < 0) @@ -194,11 +191,9 @@ virAdmGetDefaultURI(virConfPtr conf, char **uristr) * 'libvirtd:///session' depending on the process's EUID. */ if (geteuid() =3D=3D 0) { - if (VIR_STRDUP(*uristr, "libvirtd:///system") < 0) - return -1; + *uristr =3D g_strdup("libvirtd:///system"); } else { - if (VIR_STRDUP(*uristr, "libvirtd:///session") < 0) - return -1; + *uristr =3D g_strdup("libvirtd:///session"); } } } @@ -238,8 +233,7 @@ virAdmConnectOpen(const char *name, unsigned int flags) goto error; =20 if (name) { - if (VIR_STRDUP(uristr, name) < 0) - goto error; + uristr =3D g_strdup(name); } else { if (virAdmGetDefaultURI(conf, &uristr) < 0) goto error; diff --git a/src/libvirt.c b/src/libvirt.c index 812cb9efde..33b43305a1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -173,10 +173,7 @@ virConnectAuthCallbackDefault(virConnectCredentialPtr = cred, } =20 if (cred[i].type !=3D VIR_CRED_EXTERNAL) { - if (VIR_STRDUP(cred[i].result, - STREQ(bufptr, "") && cred[i].defresult ? - cred[i].defresult : bufptr) < 0) - return -1; + cred[i].result =3D g_strdup(STREQ(bufptr, "") && cred[i].defre= sult ? cred[i].defresult : bufptr); cred[i].resultlen =3D strlen(cred[i].result); } } @@ -803,8 +800,7 @@ virConnectGetDefaultURI(virConfPtr conf, const char *defname =3D getenv("LIBVIRT_DEFAULT_URI"); if (defname && *defname) { VIR_DEBUG("Using LIBVIRT_DEFAULT_URI '%s'", defname); - if (VIR_STRDUP(*name, defname) < 0) - goto cleanup; + *name =3D g_strdup(defname); } else { if (virConfGetValueString(conf, "uri_default", name) < 0) goto cleanup; @@ -885,8 +881,7 @@ virConnectOpenInternal(const char *name, * if detectable. */ if (name) { - if (VIR_STRDUP(uristr, name) < 0) - goto failed; + uristr =3D g_strdup(name); } else { if (virConnectGetDefaultURI(conf, &uristr) < 0) goto failed; @@ -924,9 +919,8 @@ virConnectOpenInternal(const char *name, =20 /* Avoid need for drivers to worry about NULLs, as * no one needs to distinguish "" vs NULL */ - if (ret->uri->path =3D=3D NULL && - VIR_STRDUP(ret->uri->path, "") < 0) - goto failed; + if (ret->uri->path =3D=3D NULL) + ret->uri->path =3D g_strdup(""); =20 VIR_DEBUG("Split \"%s\" to URI components:\n" " scheme %s\n" diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index e5ef426329..4646308c48 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -348,8 +348,7 @@ openvzReadFSConf(virDomainDefPtr def, goto error; =20 fs->type =3D VIR_DOMAIN_FS_TYPE_TEMPLATE; - if (VIR_STRDUP(fs->src->path, temp) < 0) - goto error; + fs->src->path =3D g_strdup(temp); } else { /* OSTEMPLATE was not found, VE was booted from a private dir dire= ctly */ ret =3D openvzReadVPSConfigParam(veid, "VE_PRIVATE", &temp); @@ -373,8 +372,7 @@ openvzReadFSConf(virDomainDefPtr def, VIR_FREE(veid_str); } =20 - if (VIR_STRDUP(fs->dst, "/") < 0) - goto error; + fs->dst =3D g_strdup("/"); =20 param =3D "DISKSPACE"; ret =3D openvzReadVPSConfigParam(veid, param, &temp); @@ -549,8 +547,7 @@ int openvzLoadDomains(struct openvz_driver *driver) } =20 def->os.type =3D VIR_DOMAIN_OSTYPE_EXE; - if (VIR_STRDUP(def->os.init, "/sbin/init") < 0) - goto cleanup; + def->os.init =3D g_strdup("/sbin/init"); =20 ret =3D openvzReadVPSConfigParam(veid, "CPUS", &temp); if (ret < 0) { @@ -727,10 +724,7 @@ openvzReadConfigParam(const char *conf_file, const cha= r *param, char **value) saveptr =3D NULL; if ((token =3D strtok_r(sf, "\"\t\n", &saveptr)) !=3D NULL) { VIR_FREE(*value); - if (VIR_STRDUP(*value, token) < 0) { - err =3D 1; - break; - } + *value =3D g_strdup(token); /* keep going - last entry wins */ } } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index bf399986a7..017eec3081 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -118,10 +118,8 @@ openvzDomainDefPostParse(virDomainDefPtr def, void *parseOpaque G_GNUC_UNUSED) { /* fill the init path */ - if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { - if (VIR_STRDUP(def->os.init, "/sbin/init") < 0) - return -1; - } + if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_EXE && !def->os.init) + def->os.init =3D g_strdup("/sbin/init"); =20 return 0; } @@ -780,8 +778,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *= vpsid, /* if net is ethernet and the user has specified guest interface n= ame, * let's use it; otherwise generate a new one */ if (net->ifname_guest) { - if (VIR_STRDUP(guest_ifname, net->ifname_guest) < 0) - goto cleanup; + guest_ifname =3D g_strdup(net->ifname_guest); } else { guest_ifname =3D openvzGenerateContainerVethName(veid); if (guest_ifname =3D=3D NULL) { @@ -1507,8 +1504,7 @@ static int openvzConnectListDefinedDomains(virConnect= Ptr conn G_GNUC_UNUSED, continue; } snprintf(vpsname, sizeof(vpsname), "%d", veid); - if (VIR_STRDUP(names[got], vpsname) < 0) - goto out; + names[got] =3D g_strdup(vpsname); got ++; } =20 diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 4527adc670..8b1d804233 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -946,8 +946,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr au= th, goto err; =20 if (conn->uri->user !=3D NULL) { - if (VIR_STRDUP(username, conn->uri->user) < 0) - goto err; + username =3D g_strdup(conn->uri->user); } else { if (!(username =3D virAuthGetUsername(conn, auth, "ssh", NULL, conn->uri->server))) @@ -1124,9 +1123,7 @@ phypConnectOpen(virConnectPtr conn, =20 if (conn->uri->path[0] !=3D '\0') { /* need to shift one byte in order to remove the first "/" of URI = component */ - if (VIR_STRDUP(managed_system, - conn->uri->path + (conn->uri->path[0] =3D=3D '/')) = < 0) - goto failure; + managed_system =3D g_strdup(conn->uri->path + (conn->uri->path[0] = =3D=3D '/')); =20 /* here we are handling only the first component of the path, * so skipping the second: @@ -1465,8 +1462,7 @@ phypGetBackingDevice(virConnectPtr conn, const char *= managed_system, else goto cleanup; =20 - if (VIR_STRDUP(backing_device, char_ptr) < 0) - goto cleanup; + backing_device =3D g_strdup(char_ptr); } else { backing_device =3D g_steal_pointer(&ret); } @@ -2228,8 +2224,7 @@ phypStorageVolGetXMLDesc(virStorageVolPtr vol, unsign= ed int flags) goto cleanup; } =20 - if (VIR_STRDUP(voldef.key, vol->key) < 0) - goto cleanup; + voldef.key =3D g_strdup(vol->key); =20 voldef.type =3D VIR_STORAGE_POOL_LOGICAL; =20 @@ -2338,8 +2333,7 @@ phypStoragePoolListVolumes(virStoragePoolPtr pool, ch= ar **const volumes, =20 if (char_ptr) { *char_ptr =3D '\0'; - if (VIR_STRDUP(volumes[got++], volumes_list) < 0) - goto cleanup; + volumes[got++] =3D g_strdup(volumes_list); char_ptr++; volumes_list =3D char_ptr; } else { @@ -2532,8 +2526,7 @@ phypConnectListStoragePools(virConnectPtr conn, char = **const pools, int npools) =20 if (char_ptr) { *char_ptr =3D '\0'; - if (VIR_STRDUP(pools[got++], storage_pools) < 0) - goto cleanup; + pools[got++] =3D g_strdup(storage_pools); char_ptr++; storage_pools =3D char_ptr; } else { @@ -2985,8 +2978,7 @@ phypConnectListInterfaces(virConnectPtr conn, char **= const names, int nnames) =20 if (char_ptr) { *char_ptr =3D '\0'; - if (VIR_STRDUP(names[got++], networks) < 0) - goto cleanup; + names[got++] =3D g_strdup(networks); char_ptr++; networks =3D char_ptr; } else { @@ -3146,8 +3138,7 @@ phypConnectListDefinedDomains(virConnectPtr conn, cha= r **const names, int nnames =20 if (char_ptr) { *char_ptr =3D '\0'; - if (VIR_STRDUP(names[got++], domains) < 0) - goto cleanup; + names[got++] =3D g_strdup(domains); char_ptr++; domains =3D char_ptr; } else { diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 207af8fe81..8707f842ad 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -175,8 +175,7 @@ vmwareLoadDomains(struct vmware_driver *driver) =20 pDomain =3D vm->privateData; =20 - if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) - goto cleanup; + pDomain->vmxPath =3D g_strdup(vmxPath); =20 vmwareDomainConfigDisplay(pDomain, vmdef); =20 @@ -354,14 +353,10 @@ vmwareParsePath(const char *path, char **directory, c= har **filename) =20 if (VIR_STRNDUP(*directory, path, separator - path - 1) < 0) goto error; - if (VIR_STRDUP(*filename, separator) < 0) { - VIR_FREE(*directory); - goto error; - } + *filename =3D g_strdup(separator); =20 } else { - if (VIR_STRDUP(*filename, path) < 0) - goto error; + *filename =3D g_strdup(path); } =20 return 0; diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 912827a921..83974531d5 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -447,8 +447,7 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla goto cleanup; =20 pDomain =3D vm->privateData; - if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) - goto cleanup; + pDomain->vmxPath =3D g_strdup(vmxPath); =20 vmwareDomainConfigDisplay(pDomain, vmdef); =20 @@ -708,8 +707,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *x= ml, goto cleanup; =20 pDomain =3D vm->privateData; - if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) - goto cleanup; + pDomain->vmxPath =3D g_strdup(vmxPath); =20 vmwareDomainConfigDisplay(pDomain, vmdef); vmdef =3D NULL; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c9a80ba35d..0d1d87bac6 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1085,8 +1085,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDefPtr = def, if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SCSI || !driver) return 0; =20 - if (VIR_STRDUP(copy, driver) < 0) - return -1; + copy =3D g_strdup(driver); tmp =3D copy; =20 for (; *tmp !=3D '\0'; ++tmp) @@ -1812,13 +1811,15 @@ virVMXParseConfig(virVMXContext *ctx, if (ctx->datacenterPath || ctx->moref) { struct virVMXDomainDefNamespaceData *nsdata =3D NULL; =20 - if (VIR_ALLOC(nsdata) < 0 || - VIR_STRDUP(nsdata->datacenterPath, ctx->datacenterPath) < 0 || - VIR_STRDUP(nsdata->moref, ctx->moref) < 0) { + if (VIR_ALLOC(nsdata) < 0) { virVMXDomainDefNamespaceFree(nsdata); goto cleanup; } =20 + nsdata->datacenterPath =3D g_strdup(ctx->datacenterPath); + + nsdata->moref =3D g_strdup(ctx->moref); + def->ns =3D *virDomainXMLOptionGetNamespace(xmlopt); def->namespaceData =3D nsdata; } @@ -2839,8 +2840,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf= , int port, goto cleanup; } =20 - if (VIR_STRDUP((*def)->source->data.tcp.host, parsedUri->server) <= 0) - goto cleanup; + (*def)->source->data.tcp.host =3D g_strdup(parsedUri->server); =20 if (virAsprintf(&(*def)->source->data.tcp.service, "%d", parsedUri->port) < 0) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 76b23788b8..5b54f83b22 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -3015,8 +3015,7 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, =20 if (dname) { VIR_FREE(def->name); - if (VIR_STRDUP(def->name, dname) < 0) - goto cleanup; + def->name =3D g_strdup(dname); } =20 if (virDomainMigratePrepare3ParamsEnsureACL(conn, def) < 0) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 68284d53f7..e7c1676df9 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -501,8 +501,7 @@ prlsdkUUIDParse(const char *uuidstr, unsigned char *uui= d) virCheckNonNullArgGoto(uuidstr, error); virCheckNonNullArgGoto(uuid, error); =20 - if (VIR_STRDUP(tmp, uuidstr) < 0) - goto error; + tmp =3D g_strdup(uuidstr); =20 tmp[strlen(tmp) - 1] =3D '\0'; =20 @@ -774,10 +773,8 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, fs->type =3D VIR_DOMAIN_FS_TYPE_VOLUME; if (VIR_ALLOC(fs->src->srcpool) < 0) goto cleanup; - if (VIR_STRDUP(fs->src->srcpool->pool, matches[1]) < 0) - goto cleanup; - if (VIR_STRDUP(fs->src->srcpool->volume, matches[2]) < 0) - goto cleanup; + fs->src->srcpool->pool =3D g_strdup(matches[1]); + fs->src->srcpool->volume =3D g_strdup(matches[2]); VIR_FREE(buf); } else { fs->type =3D VIR_DOMAIN_FS_TYPE_FILE; @@ -1054,9 +1051,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetD= efPtr net, bool isCt) * always up */ net->linkstate =3D VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP; net->type =3D VIR_DOMAIN_NET_TYPE_NETWORK; - if (VIR_STRDUP(net->data.network.name, - PARALLELS_DOMAIN_ROUTED_NETWORK_NAME) < 0) - goto cleanup; + net->data.network.name =3D g_strdup(PARALLELS_DOMAIN_ROUTED_NETWOR= K_NAME); return 0; } =20 @@ -1078,9 +1073,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetD= efPtr net, bool isCt) =20 if (emulatedType =3D=3D PNA_ROUTED) { net->type =3D VIR_DOMAIN_NET_TYPE_NETWORK; - if (VIR_STRDUP(net->data.network.name, - PARALLELS_DOMAIN_ROUTED_NETWORK_NAME) < 0) - goto cleanup; + net->data.network.name =3D g_strdup(PARALLELS_DOMAIN_ROUTED_NETWOR= K_NAME); } else { char *netid =3D prlsdkGetStringParamVar(PrlVmDevNet_GetVirtualNetworkId, @@ -1224,8 +1217,7 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainC= hrDefPtr chr) goto cleanup; if (!(uri =3D virURIParse(uristr))) goto cleanup; - if (VIR_STRDUP(chr->source->data.tcp.host, uri->server) < 0) - goto cleanup; + chr->source->data.tcp.host =3D g_strdup(uri->server); if (virAsprintf(&chr->source->data.tcp.service, "%d", uri->port) <= 0) goto cleanup; chr->source->data.tcp.listen =3D socket_mode =3D=3D PSP_SERIAL_SOC= KET_SERVER; @@ -1236,12 +1228,10 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomai= nChrDefPtr chr) goto cleanup; if (!(uri =3D virURIParse(uristr))) goto cleanup; - if (VIR_STRDUP(chr->source->data.udp.bindHost, uri->server) < 0) - goto cleanup; + chr->source->data.udp.bindHost =3D g_strdup(uri->server); if (virAsprintf(&chr->source->data.udp.bindService, "%d", uri->por= t) < 0) goto cleanup; - if (VIR_STRDUP(chr->source->data.udp.connectHost, uri->server) < 0) - goto cleanup; + chr->source->data.udp.connectHost =3D g_strdup(uri->server); if (virAsprintf(&chr->source->data.udp.connectService, "%d", uri->= port) < 0) goto cleanup; break; @@ -1526,8 +1516,7 @@ prlsdkConvertDomainType(PRL_HANDLE sdkdom, virDomainD= efPtr def) break; case PVT_CT: def->os.type =3D VIR_DOMAIN_OSTYPE_EXE; - if (VIR_STRDUP(def->os.init, "/sbin/init") < 0) - return -1; + def->os.init =3D g_strdup("/sbin/init"); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list