From nobody Sat Jul 5 16:20:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152152861846830.66763738294776; Mon, 19 Mar 2018 23:50:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2DF7C7FDC8; Tue, 20 Mar 2018 06:50:17 +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 E9EF91915E; Tue, 20 Mar 2018 06:50:16 +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 86B3A180BAEA; Tue, 20 Mar 2018 06:50:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2K6nsxM019555 for ; Tue, 20 Mar 2018 02:49:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC7C24251; Tue, 20 Mar 2018 06:49:54 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D6E4A6134B for ; Tue, 20 Mar 2018 06:49:52 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C06DE85543 for ; Tue, 20 Mar 2018 06:49:51 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id h76so1195461wme.4 for ; Mon, 19 Mar 2018 23:49:51 -0700 (PDT) Received: from rst.Home ([2a02:c7d:692a:c500:1ebc:73f3:5f60:b131]) by smtp.gmail.com with ESMTPSA id g38sm1923269wra.77.2018.03.19.23.49.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Mar 2018 23:49:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jIF++vAXmaZAkIpr6LVGYGS92wh84gzp44zFaMqsP+A=; b=l7tqciLUlPxzt2aNc3n7axv8KZLXdiIpDWfpBqM0FOdCP1fNb39VOZ9afcGH2IqGAm 0u6do0BXewHBmfMCEmtq7NXADmUPNmvTGeFRgy69oOtpRgxudJMcEEtu+GFEq/s1GGr4 vWW77YK770/wNuMLSZjjIAVHw/p7Wy+87awolECzt5aXKOtY1ZtJeUWejCkrBl7zJIs2 scd4MF9fhbIZPT6JqCPuEQjDNQlTRaWlT5DdstN72EsQQHmMvl4RzxyzQKBBl8g4FGTC F7Nx1QA+4CeG2XXoOOYUcI6xLDn7oZXghh0wMCt7FVc10EBs9tM0+qqA9YGahcov5dYR R21Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jIF++vAXmaZAkIpr6LVGYGS92wh84gzp44zFaMqsP+A=; b=V1/sVKH2hY25Xpo7+VjgSX37vD59O7IxrSowVwwLAuP2Gdz/v9qrOmT3yJbF3QXMeF PbLWwNpTgBvlT4c2q2kk2/pQxzL9ImrNITVW1HGeg/O77d4OglWYGzYF95nByoc4p1NI 97Fcg7/Urw2OlX3rbZ5kyol8JNXYHC13pJvCuR2BCAYJ23LRPbzzaaaqOtUTcgO+Tbyz 5Dmlp1WXhgrJ/0FWNZ9h6pE0p3E/Y6pgKQqGVVwKwL/4EmmXFhl5xzcSKTACIdiGek2j /n233etSSkbqbxoe0GmskiMSUgjFJDZdCl80oFEs4m/LdTL4rvblEoipfNuUM54kbQVG pxZw== X-Gm-Message-State: AElRT7Hy/bFAK4QkcJrccyFQ4bA3JIpLX4czRyfmX7PXjSS0qUVYGazC uHLCFTtJadQ1Gf6Y9d+FP0qSBapV X-Google-Smtp-Source: AG47ELvLvjwj6Fu7w8yoF+g8JJOZfQaJodNgv2lyh/Yx7Bl2mH1lfuJ+Si0OkVNejrtNs3ibeRGPKA== X-Received: by 10.28.12.14 with SMTP id 14mr1042888wmm.107.1521528590196; Mon, 19 Mar 2018 23:49:50 -0700 (PDT) From: Radostin Stoyanov To: libvir-list@redhat.com Date: Tue, 20 Mar 2018 06:49:02 +0000 Message-Id: <20180320064908.17723-20-rstoyanov1@gmail.com> In-Reply-To: <20180320064908.17723-1-rstoyanov1@gmail.com> References: <20180320064908.17723-1-rstoyanov1@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 20 Mar 2018 06:49:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 20 Mar 2018 06:49:52 +0000 (UTC) for IP:'74.125.82.67' DOMAIN:'mail-wm0-f67.google.com' HELO:'mail-wm0-f67.google.com' FROM:'rstoyanov1@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.12 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 74.125.82.67 mail-wm0-f67.google.com 74.125.82.67 mail-wm0-f67.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Radostin Stoyanov Subject: [libvirt] [PATCHv2 19/25] apibuild: Simplify parseTypeComment() 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 20 Mar 2018 06:50:17 +0000 (UTC) X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Improve readability and reduce complexity the method parseTypeComment(). Signed-off-by: Radostin Stoyanov --- docs/apibuild.py | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index d5707d5d1..06d556bae 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -756,48 +756,38 @@ class CParser: # # Parse a comment block associate to a typedef # - def parseTypeComment(self, name, quiet=3D0): + def parseTypeComment(self, name, quiet=3DFalse): if name[0:2] =3D=3D '__': - quiet =3D 1 - - args =3D [] - desc =3D "" + quiet =3D True =20 if self.comment is None: if not quiet: self.warning("Missing comment for type %s" % (name)) - return((args, desc)) - if self.comment[0] !=3D '*': + return None + if not self.comment.startswith('*'): if not quiet: self.warning("Missing * in type comment for %s" % (name)) - return((args, desc)) + return None + lines =3D self.comment.split('\n') - if lines[0] =3D=3D '*': - del lines[0] + # Remove lines that contain only single asterisk + lines[:] =3D [line for line in lines if line.strip() !=3D '*'] + if lines[0] !=3D "* %s:" % (name): if not quiet: self.warning("Misformatted type comment for %s" % (name)) self.warning(" Expecting '* %s:' got '%s'" % (name, lines= [0])) - return((args, desc)) + return None del lines[0] - while len(lines) > 0 and lines[0] =3D=3D '*': - del lines[0] - desc =3D "" - while len(lines) > 0: - l =3D lines[0] - while len(l) > 0 and l[0] =3D=3D '*': - l =3D l[1:] - l =3D l.strip() - desc =3D desc + " " + l - del lines[0] =20 - desc =3D desc.strip() + # Concatenate all remaining lines by striping leading asterisks + desc =3D " ".join([line.lstrip("*").strip() for line in lines]).st= rip() =20 - if quiet =3D=3D 0: - if desc =3D=3D "": - self.warning("Type comment for %s lack description of the = macro" % (name)) + if not (quiet or desc): + self.warning("Type comment for %s lack description of the macr= o" + % (name)) =20 - return(desc) + return desc # # Parse a comment block associate to a macro # --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list