From nobody Fri May 3 06:31:44 2024 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=fail(p=none dis=none) header.from=outlook.com ARC-Seal: i=1; a=rsa-sha256; t=1665917290; cv=none; d=zohomail.com; s=zohoarc; b=gX/10KuaHCZ0TtDELCuNcUNSWCLgNo4qdooBSHEM/pqQTwcDaJQKLHc6kWPMl4QMJwp4TmcacVTUk4gh800OICXWjIUj4XHRRcl5chD7ukVWVsYY2wj48j5oHDEzibMTPheykw/S4v5FBVEa+muiUT3DfzqkHEu3FpnU88zH6ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665917290; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=qozPQcvDCn8cZ7GOa1ixqrtY46mG3YNpvDHy0exUm2A=; b=EJ26oVjxipgIaVtHSpNduLTpiGeQeT0NkJ+j8rTQGuKUZ0T/Jjr+UyEbiIGPb6hDZ2jWaMsH6I5oIpvwp22HtrVjnoYnKWaaL4GsAPMKgsm3ibA+iY7aQKFDXaqDu+pYk68JsHo1oUMQwRlmsMEOzCuqYmSEnSA1+KFBNrW3AJA= 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=fail 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 1665917290341424.7696359091101; Sun, 16 Oct 2022 03:48:10 -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-70-UOP39BqqMbuBUYEdUvf_QQ-1; Sun, 16 Oct 2022 06:48:07 -0400 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 C9FA6101AA45; Sun, 16 Oct 2022 10:48:05 +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 9B1952166B29; Sun, 16 Oct 2022 10:48:02 +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 499CA194658D; Sun, 16 Oct 2022 10:48:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4D120194658C for ; Sun, 16 Oct 2022 10:48:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E985FE2026; Sun, 16 Oct 2022 10:48:00 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0387E2033 for ; Sun, 16 Oct 2022 10:48:00 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BDB213C0F221 for ; Sun, 16 Oct 2022 10:48:00 +0000 (UTC) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2095.outbound.protection.outlook.com [40.92.50.95]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-459-lfrSpbtxP0Sm644aO10f9Q-1; Sun, 16 Oct 2022 06:47:58 -0400 Received: from HE1P193MB0058.EURP193.PROD.OUTLOOK.COM (2603:10a6:3:107::16) by AM0P193MB0723.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:14b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.32; Sun, 16 Oct 2022 10:47:56 +0000 Received: from HE1P193MB0058.EURP193.PROD.OUTLOOK.COM ([fe80::dc44:abd1:bc2a:4f48]) by HE1P193MB0058.EURP193.PROD.OUTLOOK.COM ([fe80::dc44:abd1:bc2a:4f48%12]) with mapi id 15.20.5723.032; Sun, 16 Oct 2022 10:47:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665917289; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qozPQcvDCn8cZ7GOa1ixqrtY46mG3YNpvDHy0exUm2A=; b=Qmebzy9R+GXLuEhvFee3mBuMfnDWVsrFo0px7SycxwASoFdarwh4gYQWK2Y+f67VuGQlF/ 7e/3+esQCbkjBsUP74df5Fio1jd7jIU7CGw8gqpjp0tm87CC8MGjngTvV8jKnpaO2lF4YG xguc22MKIqN5jNaNKchWY1HE2xnNBWw= X-MC-Unique: UOP39BqqMbuBUYEdUvf_QQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: lfrSpbtxP0Sm644aO10f9Q-1 From: ttxine To: libvir-list@redhat.com Subject: [libvirt PATCH] virvhba.c: use g_autofree Date: Sun, 16 Oct 2022 13:47:49 +0300 Message-ID: X-TMN: [OdPuE8Oa8dOucPaMJ5hXPFV8883qwpOy] X-ClientProxiedBy: FR3P281CA0123.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::9) To HE1P193MB0058.EURP193.PROD.OUTLOOK.COM (2603:10a6:3:107::16) X-Microsoft-Original-Message-ID: <20221016104749.50099-1-ttxinee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1P193MB0058:EE_|AM0P193MB0723:EE_ X-MS-Office365-Filtering-Correlation-Id: a6f7152a-fd4a-4c3d-f6e8-08daaf63e28f X-MS-Exchange-SLBlob-MailProps: WaIXnCbdHrNsJbj7NxvUrjmEPxw2ts2LjV5nZ4q2cRDB4oqzzNQ52QKhhhv98a8RK6RcSn77TMxMAh5BbzbPKxv9dQTcVi9ry5DSI+cUAESFmpeS1BzFhKuGM8tXEQy3u1qpil0FX+GizlVZe72mtKRFWTXQ5u/tFEQVky/3ulm+UWK2b0GARlbUAmwFGFft2KsSXVN8wg0rezVt6xf96YTCYN0XgF25VlCZNU9dTRua+QmwDrJzs2fggp4zUIRTRqs+EZUMgqS2ybBhj/g1jbtthiwGGWrg74hRYHf5O66MAFdcHnIGCLwbx6C9ZWHw+aAmx0Lx5acqIJqpQZ7CCravlzSKQG/pUbPls73HEh9XTEcPW/KM0LTtnUqKtZYgCKFVMUBJOJtitXKJ2tLrd7Oj0dGkvzDcpXJ7JjEqpqKZMLGhD+KYSW47lWQ/bPI1eSYrAqbRDfG/y5bU0UE9bzKtAvfIGLHpbNFp/mIFcCReco9lToE+tPzkglDbQ+d4zHR82slLlFscXAtSAWitiHKVhvMgJ4YxXl1oAopQh7CIDcp8n+AcjVuhbKSfuC94QuDcy7UckRkASevkOrphjcpBqdC17hNZlWE8Qtx6fticXErg8Bg/wvE8RFCPgcJJHSqnN3WzSlgNDS/LPS4tKDptuEYqYQ8piebB5fBl+669onfrgVqRY51Yv7Y1j/coukJb1ARf9y3tOgrAFbKHbu6t4c+oC+ALrX4X7Ue9nNn12g8+jT7B5tfMy4iTZy7HRhxBZTzReDI= X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: ABagS/0bDe/qjV9kq5izGxmUIB8weK4CdH0qAFbV9jiPbZLs/3uiOKarK+FAc/6aMiaqNjKrf0NlGddZl0zhwARKsKL96/3LhJZHi+CKzbhRlVJLnIM8/dh7PlNaqrCHfQ+dcAX9setESf+cf1XOS521QXvksZ4ksHTqtaQfukTVrpRbDLo09Iqn3IRp9Q8uKIB+5HCJqy6BmS05rakMJLkDK3cRhLrfAPGvVwTTw5F0DOuxGCGfCErPCI1YvQkwmdjQJ9GNQ59rq93yDLaWzeL9yCSz1ywWgIHwAnswWc0L36V8I3518fLrGnTWXhF0u10rMEfT4G8YqrDhO13EUhvWRuMP3bvqP+u4QQfEKS7L/ZrL88W8LNTzp0D5MO05sYEZdzfziPGOzOwUfN6nUaDo1nBW/6Z730gux68xJFF8JVFfuPVduH8rbzdlfHkO4yur8VEZuhafax/NrvlWfXdJL8Ob9mHBnV6DVCyZ1/lTWZDC4QXXYXarCXUqxxZDpEp+QEmlgDIsT0Vh9IIUwR8EHjRdKHST77WmeBjCBuumd7T8068EK4ZOI6hZ+NYpHi22TWdLCiRKVKop49ZHzaM3rdOFHtQWf/nJQ3/wUDCxTYhe2chLEDreDPKLujBd4neHGgcSJ74hrjHTUfWKdKTvVkYhcahKdaPzDkmhYj9h+nXfBnM3Eap+CAhV0Asc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LLNTL2Klqa9uxLmBhWeYPr5V1aLOUJRY+GCePTkIlhLDLTVzQMPLj6QD0V1T?= =?us-ascii?Q?Wwsvggm3Gmjcgx4dQJl+/TLA2IJAFR/llUswnelYXvCB5NCLVPsI5w8r8K0n?= =?us-ascii?Q?3AwkNGbULrc6aSRcOaj6Xdg0mHNwsWQsC5UbtLGJ4vHPduK8tOZVhFl0oH5s?= =?us-ascii?Q?cYBosyhIu90rxaBkGUfv4MadVRBYKIpoXYLWHUEhPfSkOwFqvSS9lGXYepMO?= =?us-ascii?Q?HqOFnNoubL/mScg5u4xMJ0RfGXZYJIo7yEMaxJWmVYMgbQsnw0XYrJCsi0in?= =?us-ascii?Q?qrNi9aL62RC9xmcxXj8YiBwfHtHj3LFi8c68UVsqqWehxAoTwH2ppVdnx1I7?= =?us-ascii?Q?VHGIno41+B2zUZpMbQHlG0UrVWlWjefuMSLP3Reb7Vu4JnmyuhZGqlvl2gfg?= =?us-ascii?Q?clIT2Ocwq7ZW8U6KhrW4+1kWlnVhwtk3bplWxJNwHzDQ1xzL67pway3+K1s5?= =?us-ascii?Q?rvjsOzkSxKi2fiPQycayqQd0IO1F8v53zY5Sw+otOzQDScSPziqDpsizDdho?= =?us-ascii?Q?gFIXioSc5f8/VubZw6lMQCSiF05OlJ+Wqwb82LUTSKIrT8Yt8+mgzw9bFMXM?= =?us-ascii?Q?WW01c8bDbY3oLkCvVR6xHLOnHntekh5VJgyyce3zxgU50ZC0mGCbR8D3C9xf?= =?us-ascii?Q?iZd+gr8HSktz6ywl+q0N2pisDJhD0ZHQvxHVVhi5CQHpsqkWchgG5XkXvir+?= =?us-ascii?Q?JPKTqmcV8KyEPEnnBeUnfM06fM04efPPODbLD4FiheD5shJEJN9vEXnGL1GU?= =?us-ascii?Q?jXCVANF4lYlZL80ur8lG+SmXMdhRhjSlr2uaNQKCCTbHXVJqe3rFJY1drmvS?= =?us-ascii?Q?qgkXVZCCunOf5/SyQToww6vambJU8FMYCutIo+1ON7UyoyK6EYzi7OHSrwv9?= =?us-ascii?Q?7nRt9FOZfRlvlkGI6WBxLol6VX4D6r67BP5UttKY8oEv/ORu72luC4wE8a6N?= =?us-ascii?Q?vGsB836G01flzguxMBX2MbFnjLsfydmAKk5gxkXudXO37pyhqRC+ZLjuL0fZ?= =?us-ascii?Q?ZJFzneH1JKiyzuSGjXx5hHPOJz0iVvHCe7YdF9j798+N0tuRsri/LFKpYJQ6?= =?us-ascii?Q?msMb26tnwI9TD4AaPRpF2/sPczbxDxfOGRtk9sp03H4yyQk80IFzsAGe4uRG?= =?us-ascii?Q?vrr7EPv+wCgIvMGUBAr+zvXw50ioQfomA8+5pswvNqc5gw0wtui4GrcFRUeR?= =?us-ascii?Q?D2HdaohDuf4h8e1tiuH61g2zWEWJVHRzSDZSKTD5eneEF0Tpx4tpuiSWqVJ8?= =?us-ascii?Q?r0bL2ZayMp+ZMIrVr/EgH5fjhdTDbYyuWM3XJ0Q3AQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6f7152a-fd4a-4c3d-f6e8-08daaf63e28f X-MS-Exchange-CrossTenant-AuthSource: HE1P193MB0058.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2022 10:47:56.7023 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0P193MB0723 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: , Cc: ttxine 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: 1665917291532100001 Content-Type: text/plain; charset="utf-8" Change strings to use g_autofree. Signed-off-by: Maxim Kostin Reviewed-by: Michal Privoznik --- src/util/virvhba.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/util/virvhba.c b/src/util/virvhba.c index a4e88024d1..76c39e5f2b 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -49,7 +49,7 @@ bool virVHBAPathExists(const char *sysfs_prefix, int host) { - char *sysfs_path =3D NULL; + g_autofree char *sysfs_path =3D NULL; bool ret =3D false; =20 sysfs_path =3D g_strdup_printf("%s/host%d", @@ -58,7 +58,6 @@ virVHBAPathExists(const char *sysfs_prefix, if (virFileExists(sysfs_path)) ret =3D true; =20 - VIR_FREE(sysfs_path); return ret; } =20 @@ -79,8 +78,8 @@ bool virVHBAIsVportCapable(const char *sysfs_prefix, int host) { - char *scsi_host_path =3D NULL; - char *fc_host_path =3D NULL; + g_autofree char *scsi_host_path =3D NULL; + g_autofree char *fc_host_path =3D NULL; bool ret =3D false; =20 fc_host_path =3D g_strdup_printf("%s/host%d/%s", @@ -94,8 +93,6 @@ virVHBAIsVportCapable(const char *sysfs_prefix, if (virFileExists(fc_host_path) || virFileExists(scsi_host_path)) ret =3D true; =20 - VIR_FREE(fc_host_path); - VIR_FREE(scsi_host_path); return ret; } =20 @@ -115,9 +112,9 @@ virVHBAGetConfig(const char *sysfs_prefix, int host, const char *entry) { - char *sysfs_path =3D NULL; + g_autofree char *sysfs_path =3D NULL; char *p =3D NULL; - char *buf =3D NULL; + g_autofree char *buf =3D NULL; char *result =3D NULL; =20 sysfs_path =3D g_strdup_printf("%s/host%d/%s", @@ -140,8 +137,6 @@ virVHBAGetConfig(const char *sysfs_prefix, result =3D g_strdup(p); =20 cleanup: - VIR_FREE(sysfs_path); - VIR_FREE(buf); return result; } =20 @@ -315,8 +310,8 @@ vhbaReadCompareWWN(const char *prefix, const char *f_name, const char *wwn) { - char *path; - char *buf =3D NULL; + g_autofree char *path =3D NULL; + g_autofree char *buf =3D NULL; char *p; int ret =3D -1; =20 @@ -343,8 +338,6 @@ vhbaReadCompareWWN(const char *prefix, ret =3D 1; =20 cleanup: - VIR_FREE(path); - VIR_FREE(buf); =20 return ret; } --=20 2.34.1