From nobody Sun Feb 8 22:08:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1655876166; cv=none; d=zohomail.com; s=zohoarc; b=EutOCtFb6dLIeGxVJwara8S12utBxwOjNMdIZQqZeTW3a/PEZVE01qG/m9oWNq68lgih4cVN4Jr3QFm24lWM4KdxuYcI/i73UrkAtloOyqLkNeADVj4lBadzcdpMS4e6J5xuQJdIl5//GTyH+2hZRlkIdrTcDn5fcTZ4cCTex5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655876166; 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=jEx4HPWGgttQiNPLOR0UhpDiRYdyhPlOSdDfaj6uxw0=; b=WA3I8HP8ViZp4eHY2NF8Tvyn0WjOEHGcmGCc1tsnLxgdGrrZJFcwFhMYoUMALTJzOc7MYO2xF9Rz8HplzE0A6qKkcjbUC5f+VPppAxDqsRMDW/+ZB+J+ZZs3VqqYiR4QZ8eerN11NuKku0LzDuVFgArQ13VCfNdD4LZFEhuYf/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 165587616602024.015866643923346; Tue, 21 Jun 2022 22:36:06 -0700 (PDT) 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-147-CFsfw4CWNbuk_DF4bD1fMQ-1; Wed, 22 Jun 2022 01:35:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78FC8800DA8; Wed, 22 Jun 2022 05:35:40 +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 5DA8840EC005; Wed, 22 Jun 2022 05:35:40 +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 23B331947054; Wed, 22 Jun 2022 05:35:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1E57F1947042 for ; Wed, 22 Jun 2022 05:35:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 10107112131E; Wed, 22 Jun 2022 05:35:38 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC7331121314 for ; Wed, 22 Jun 2022 05:35:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655876164; 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=jEx4HPWGgttQiNPLOR0UhpDiRYdyhPlOSdDfaj6uxw0=; b=JO7paBc3cRsd5/sslNycYZ8MTf2h648qbITMKf6EqHJ030mItkwxw6XecEVfyoQYY/GJP4 UoOrbQ34dThgCjO1ehvIYArb1fNyZWqTXeo64K9H1JDkiKVHiJFaT2C1bTetSA5IcataZ6 UsoT0BTlVZJZDkLZKVyPBbQXXfM7vpU= X-MC-Unique: CFsfw4CWNbuk_DF4bD1fMQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] vz: refactor testURIParse Date: Wed, 22 Jun 2022 07:35:31 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655876166305100001 Use g_autofree for the two strings still using manual cleanup and remove the pointless cleanup label. Signed-off-by: J=C3=A1n Tomko --- src/vz/vz_sdk.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 5ea3f29a8f..ecf610d7db 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1130,26 +1130,25 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomai= nChrDef *chr) PRL_RESULT pret; PRL_UINT32 serialPortIndex; PRL_UINT32 emulatedType; - char *friendlyName =3D NULL; + g_autofree char *friendlyName =3D NULL; PRL_SERIAL_PORT_SOCKET_OPERATION_MODE socket_mode; - char *uristr =3D NULL; + g_autofree char *uristr =3D NULL; g_autoptr(virURI) uri =3D NULL; - int ret =3D -1; =20 chr->deviceType =3D VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL; pret =3D PrlVmDev_GetIndex(serialPort, &serialPortIndex); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); chr->target.port =3D serialPortIndex; =20 pret =3D PrlVmDev_GetEmulatedType(serialPort, &emulatedType); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 if (!(friendlyName =3D prlsdkGetStringParamVar(PrlVmDev_GetFriendlyNam= e, serialPort))) - goto cleanup; + return -1; =20 pret =3D PrlVmDevSerial_GetSocketMode(serialPort, &socket_mode); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 switch (emulatedType) { case PDT_USE_OUTPUT_FILE: @@ -1169,7 +1168,7 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainC= hrDef *chr) chr->source->type =3D VIR_DOMAIN_CHR_TYPE_TCP; uristr =3D g_strdup_printf("tcp://%s", friendlyName); if (!(uri =3D virURIParse(uristr))) - goto cleanup; + return -1; chr->source->data.tcp.host =3D g_strdup(uri->server); chr->source->data.tcp.service =3D g_strdup_printf("%d", uri->port); chr->source->data.tcp.listen =3D socket_mode =3D=3D PSP_SERIAL_SOC= KET_SERVER; @@ -1178,7 +1177,7 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainC= hrDef *chr) chr->source->type =3D VIR_DOMAIN_CHR_TYPE_UDP; uristr =3D g_strdup_printf("udp://%s", friendlyName); if (!(uri =3D virURIParse(uristr))) - goto cleanup; + return -1; chr->source->data.udp.bindHost =3D g_strdup(uri->server); chr->source->data.udp.bindService =3D g_strdup_printf("%d", uri->p= ort); chr->source->data.udp.connectHost =3D g_strdup(uri->server); @@ -1187,17 +1186,10 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomai= nChrDef *chr) default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown serial type: %X"), emulatedType); - goto cleanup; - break; + return -1; } =20 - ret =3D 0; - - cleanup: - VIR_FREE(friendlyName); - VIR_FREE(uristr); - - return ret; + return 0; } =20 =20 --=20 2.34.1