From nobody Mon Feb 9 20:12:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606906331; cv=none; d=zohomail.com; s=zohoarc; b=P7sriWbkcfnJ4zIAlr1S0ZW2IICssMEE+y441Xeb9RcwOkq5FNyQ1Gy1/fxb8jSMn2zlCj+VnBPonuwOIBaHeH2IJzXClihgImiaD9dwy+dvr3LugzzXdyZhMudZisVs9Zo67wJhJZNWpaWwrFykNTOi+Gt+8GrRaB95YntdDnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606906331; 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=iUR8QomuX/Blkx1DYOhTiUT7FwKK7aUab2JpYXJFiRg=; b=CVBa1Vc/rD9EXPDUPEailn46VE7lfQW5ONflogAe/39wqJEyZ0+WQrgnKu+fKj44uVYtzMhhFtujL0KhK7bdBYsQK2Q1heHhpgST/kxdCG7ReV0P2wO2F3sK18U8Ybmc5jVyMyQZYKiytt7ecDuRgucmCEO4KvbizP9vzWuU3mc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606906331399198.67341086377144; Wed, 2 Dec 2020 02:52:11 -0800 (PST) Received: from localhost ([::1]:37162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkOFZ-0002zX-N7 for importer@patchew.org; Wed, 02 Dec 2020 04:16:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkNDS-00045t-7E for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:10:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkNCg-0003sM-7e for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:10:21 -0500 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-422-P9v1zrSaMCebZJZRROHI3w-1; Wed, 02 Dec 2020 03:09:30 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80D9780364D for ; Wed, 2 Dec 2020 08:09:29 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 455AF60854 for ; Wed, 2 Dec 2020 08:09:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606896573; h=from:from: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; bh=iUR8QomuX/Blkx1DYOhTiUT7FwKK7aUab2JpYXJFiRg=; b=b4x7ODwKdWF+dvqYGH94nic1YEjZJAfxxrrKZxFSZyKlov+H2Ru3mNI4/hNaN5wcj3lJap lCR5j0Hto/hTJBeo/08rdOZe4VvXpDBHRMlqsR0dFQQJEQDypNXIIYa85D3icfkTy1GyTo r9gtANcCy4LqsjqaM0ligArZjhZQejM= X-MC-Unique: P9v1zrSaMCebZJZRROHI3w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 105/113] scripts: kernel-doc: fix line number handling Date: Wed, 2 Dec 2020 03:08:41 -0500 Message-Id: <20201202080849.4125477-106-pbonzini@redhat.com> In-Reply-To: <20201202080849.4125477-1-pbonzini@redhat.com> References: <20201202080849.4125477-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Mauro Carvalho Chehab Address several issues related to pointing to the wrong line number: 1) ensure that line numbers will always be initialized When section is the default (Description), the line number is not initializing, producing this: $ ./scripts/kernel-doc --enable-lineno ./drivers/media/v4l2-core/v4l2-mem2= mem.c|less **Description** #define LINENO 0 In case of streamoff or release called on any context, 1] If the context is currently running, then abort job will be called 2] If the context is queued, then the context will be removed from the job_queue Which is not right. Ensure that the line number will always be there. After applied, the result now points to the right location: **Description** #define LINENO 410 In case of streamoff or release called on any context, 1] If the context is currently running, then abort job will be called 2] If the context is queued, then the context will be removed from the job_queue 2) The line numbers for function prototypes are always + 1, because it is taken at the line after handling the prototype. Change the logic to point to the next line after the /** */ block; 3) The "DOC:" line number should point to the same line as this markup is found, and not to the next one. Probably part of the issues were due to a but that was causing the line number offset to be incremented by one, if --export were used. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Paolo Bonzini Message-Id: <20201117165312.118257-24-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/kernel-doc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 667ad3169c..98752164eb 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1705,7 +1705,7 @@ sub dump_function($$) { my $file =3D shift; my $noret =3D 0; =20 - print_lineno($.); + print_lineno($new_start_line); =20 $prototype =3D~ s/^static +//; $prototype =3D~ s/^extern +//; @@ -2033,7 +2033,7 @@ sub process_name($$) { if (/$doc_block/o) { $state =3D STATE_DOCBLOCK; $contents =3D ""; - $new_start_line =3D $. + 1; + $new_start_line =3D $.; =20 if ( $1 eq "" ) { $section =3D $section_intro; @@ -2116,6 +2116,7 @@ sub process_body($$) { if ($state =3D=3D STATE_BODY_WITH_BLANK_LINE && /^\s*\*\s?\S/) { dump_section($file, $section, $contents); $section =3D $section_default; + $new_start_line =3D $.; $contents =3D ""; } =20 @@ -2171,6 +2172,7 @@ sub process_body($$) { $prototype =3D ""; $state =3D STATE_PROTO; $brcount =3D 0; + $new_start_line =3D $. + 1; } elsif (/$doc_content/) { if ($1 eq "") { if ($section eq $section_context) { --=20 2.26.2