From nobody Sat Apr 27 16:09:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615542741; cv=none; d=zohomail.com; s=zohoarc; b=WuKO76D78VvrERndsw8rWmhih1NWqGfDYPBU0hKgahFHGTxACwJgtr5Dfs0VF5fj6c5ImwdFLIhv0FlUYY7otKBB5QqQ09sefFvlPOg57df5QUZf9FyNkn5zvDcLEHBbXMbGUYpwdQxxVRZcbq4F4CU0w1U3sxWrldgOwbkIh9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615542741; h=Content-Type:Content-Transfer-Encoding:Cc: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=LWsuh71HjnSwByGaJxcAZIEiilYYKSJSMJnqncRF+bU=; b=e19iObbB1I46B3sFTFZpj6OO93HC89XX3bzINEMXWH9ox8sFMcHDyoOLPFUmwmWF0cPDNKpJ4ZaYkZ1PheYrzZFn/fvRHwOQztB4YPHsWLXwUR2/6bVdm1XbGkUKhXEYbaSOLse5trrRc/FG/NOvQHL0/UkOuj8Wd6XW82PEC6M= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1615542740792244.74902870230312; Fri, 12 Mar 2021 01:52:20 -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-211-PaFePND9OBmfPDeF9lDJ_g-1; Fri, 12 Mar 2021 04:52:17 -0500 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 059A9800D62; Fri, 12 Mar 2021 09:52:12 +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 9458F102AE7E; Fri, 12 Mar 2021 09:52:11 +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 559028E1A; Fri, 12 Mar 2021 09:52:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12C9q9Mb015701 for ; Fri, 12 Mar 2021 04:52:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id E62E5100D86; Fri, 12 Mar 2021 09:52:08 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E05FA103792 for ; Fri, 12 Mar 2021 09:52:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D1B7185A79C for ; Fri, 12 Mar 2021 09:52:06 +0000 (UTC) Received: from regular1.263xmail.com (regular1.263xmail.com [211.150.70.202]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-455-93HElwa3NNS22Cjcb-IS4w-1; Fri, 12 Mar 2021 04:52:02 -0500 Received: from localhost (unknown [192.168.167.32]) by regular1.263xmail.com (Postfix) with ESMTP id ED8CE826 for ; Fri, 12 Mar 2021 17:51:58 +0800 (CST) Received: from localhost.localdomain (unknown [14.18.236.70]) by smtp.263.net (postfix) whith ESMTP id P27343T140202846693120S1615542688589588_; Fri, 12 Mar 2021 17:51:34 +0800 (CST) X-MC-Unique: PaFePND9OBmfPDeF9lDJ_g-1 X-MC-Unique: 93HElwa3NNS22Cjcb-IS4w-1 X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ADDR-CHECKED4: 1 X-ANTISPAM-LEVEL: 2 X-SKE-CHECKED: 1 X-ABS-CHECKED: 1 X-IP-DOMAINF: 1 X-UNIQUE-TAG: <476932ea4f97ca869d6dde91dbf40ba7> X-RL-SENDER: yili@winhong.com X-SENDER: yili@winhong.com X-LOGIN-NAME: yili@winhong.com X-FST-TO: mprivozn@redhat.com X-SENDER-IP: 14.18.236.70 X-ATTACHMENT-NUM: 0 X-System-Flag: 0 From: Yi Li To: mprivozn@redhat.com Subject: [PATCH] virconf.c: Refactor cleanup and remove VIR_FREE Date: Fri, 12 Mar 2021 17:51:22 +0800 Message-Id: <20210312095122.764594-1-yili@winhong.com> In-Reply-To: References: MIME-Version: 1.0 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 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 12C9q9Mb015701 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, Yi Li 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 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Switch to using the 'g_auto*' helpers. Signed-off-by: Yi Li --- src/util/virconf.c | 47 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 16107bce96..17fbea2397 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -573,7 +573,7 @@ static int virConfParseComment(virConfParserCtxtPtr ctxt) { const char *base; - char *comm; + g_autofree char *comm; =20 if (CUR !=3D '#') return -1; @@ -581,10 +581,9 @@ virConfParseComment(virConfParserCtxtPtr ctxt) base =3D ctxt->cur; while ((ctxt->cur < ctxt->end) && (!IS_EOL(CUR))) NEXT; comm =3D g_strndup(base, ctxt->cur - base); - if (virConfAddEntry(ctxt->conf, NULL, NULL, comm) =3D=3D NULL) { - VIR_FREE(comm); + if (virConfAddEntry(ctxt->conf, NULL, NULL, comm) =3D=3D NULL) return -1; - } + return 0; } =20 @@ -626,9 +625,9 @@ static int virConfParseStatement(virConfParserCtxtPtr ctxt) { const char *base; - char *name; + g_autofree char *name; virConfValuePtr value; - char *comm =3D NULL; + g_autofree char *comm =3D NULL; =20 SKIP_BLANKS_AND_EOL; if (CUR =3D=3D '#') @@ -639,16 +638,13 @@ virConfParseStatement(virConfParserCtxtPtr ctxt) SKIP_BLANKS; if (CUR !=3D '=3D') { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting an assignment= ")); - VIR_FREE(name); return -1; } NEXT; SKIP_BLANKS; value =3D virConfParseValue(ctxt); - if (value =3D=3D NULL) { - VIR_FREE(name); + if (value =3D=3D NULL) return -1; - } SKIP_BLANKS; if (CUR =3D=3D '#') { NEXT; @@ -657,9 +653,7 @@ virConfParseStatement(virConfParserCtxtPtr ctxt) comm =3D g_strndup(base, ctxt->cur - base); } if (virConfAddEntry(ctxt->conf, name, value, comm) =3D=3D NULL) { - VIR_FREE(name); virConfFreeValue(value); - VIR_FREE(comm); return -1; } return 0; @@ -724,7 +718,7 @@ virConfParse(const char *filename, const char *content,= int len, virConfPtr virConfReadFile(const char *filename, unsigned int flags) { - char *content; + g_autofree char *content; int len; virConfPtr conf; =20 @@ -740,7 +734,6 @@ virConfReadFile(const char *filename, unsigned int flag= s) =20 conf =3D virConfParse(filename, content, len, flags); =20 - VIR_FREE(content); =20 return conf; } @@ -1412,7 +1405,7 @@ virConfWriteFile(const char *filename, virConfPtr con= f) virConfEntryPtr cur; int ret; int fd; - char *content; + g_autofree char *content; unsigned int use; =20 if (conf =3D=3D NULL) @@ -1433,7 +1426,6 @@ virConfWriteFile(const char *filename, virConfPtr con= f) use =3D virBufferUse(&buf); content =3D virBufferContentAndReset(&buf); ret =3D safewrite(fd, content, use); - VIR_FREE(content); VIR_FORCE_CLOSE(fd); if (ret !=3D (int)use) { virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content= ")); @@ -1461,7 +1453,7 @@ virConfWriteMem(char *memory, int *len, virConfPtr co= nf) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virConfEntryPtr cur; - char *content; + g_autofree char *content; unsigned int use; =20 if ((memory =3D=3D NULL) || (len =3D=3D NULL) || (*len <=3D 0) || (con= f =3D=3D NULL)) @@ -1478,11 +1470,9 @@ virConfWriteMem(char *memory, int *len, virConfPtr c= onf) =20 if ((int)use >=3D *len) { *len =3D (int)use; - VIR_FREE(content); return -1; } memcpy(memory, content, use); - VIR_FREE(content); *len =3D use; return use; } @@ -1505,26 +1495,19 @@ virConfLoadConfigPath(const char *name) int virConfLoadConfig(virConfPtr *conf, const char *name) { - char *path =3D NULL; - int ret =3D -1; + g_autofree char *path =3D NULL; =20 *conf =3D NULL; =20 if (!(path =3D virConfLoadConfigPath(name))) - goto cleanup; + return -1; =20 - if (!virFileExists(path)) { - ret =3D 0; - goto cleanup; - } + if (!virFileExists(path)) + return 0; =20 VIR_DEBUG("Loading config file '%s'", path); if (!(*conf =3D virConfReadFile(path, 0))) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - VIR_FREE(path); - return ret; + return 0; } --=20 2.25.3