[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 108/113] Revert "kernel-doc: Handle function typedefs that return
From: |
Paolo Bonzini |
Subject: |
[PULL 108/113] Revert "kernel-doc: Handle function typedefs that return pointers" |
Date: |
Wed, 2 Dec 2020 03:08:44 -0500 |
This reverts commit 19ab6044be0c55d529e875e3ee16fdd5c3b54d33.
We will replace the commit with the fix from Linux.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20201117165312.118257-27-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scripts/kernel-doc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 780aee4e92..d3a289628c 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1434,8 +1434,8 @@ sub dump_typedef($$) {
$x =~ s@/\*.*?\*/@@gos; # strip comments.
# Parse function prototypes
- if ($x =~ /typedef\s+(\w+\s*\**)\s*\(\*\s*(\w\S+)\s*\)\s*\((.*)\);/ ||
- $x =~ /typedef\s+(\w+\s*\**)\s*(\w\S+)\s*\s*\((.*)\);/) {
+ if ($x =~ /typedef\s+(\w+)\s*\(\*\s*(\w\S+)\s*\)\s*\((.*)\);/ ||
+ $x =~ /typedef\s+(\w+)\s*(\w\S+)\s*\s*\((.*)\);/) {
# Function typedefs
$return_type = $1;
--
2.26.2
- [PULL 106/113] scripts: kernel-doc: try to use c:function if possible, (continued)
- [PULL 106/113] scripts: kernel-doc: try to use c:function if possible, Paolo Bonzini, 2020/12/02
- [PULL 105/113] scripts: kernel-doc: fix line number handling, Paolo Bonzini, 2020/12/02
- [PULL 113/113] scripts: kernel-doc: remove unnecesssary change wrt Linux, Paolo Bonzini, 2020/12/02
- [PULL 111/113] scripts: kernel-doc: use :c:union when needed, Paolo Bonzini, 2020/12/02
- [PULL 099/113] scripts: kernel-doc: use a less pedantic markup for funcs on Sphinx 3.x, Paolo Bonzini, 2020/12/02
- [PULL 065/113] vl: move CHECKPOINT_INIT after preconfig, Paolo Bonzini, 2020/12/02
- [PULL 091/113] scripts/kernel-doc: handle function pointer prototypes, Paolo Bonzini, 2020/12/02
- [PULL 101/113] scripts: kernel-doc: reimplement -nofunction argument, Paolo Bonzini, 2020/12/02
- [PULL 100/113] scripts: kernel-doc: fix troubles with line counts, Paolo Bonzini, 2020/12/02
- [PULL 109/113] scripts: kernel-doc: fix typedef parsing, Paolo Bonzini, 2020/12/02
- [PULL 108/113] Revert "kernel-doc: Handle function typedefs that return pointers",
Paolo Bonzini <=
- [PULL 103/113] scripts: kernel-doc: don't mangle with parameter list, Paolo Bonzini, 2020/12/02
- [PULL 112/113] Revert "docs: temporarily disable the kernel-doc extension", Paolo Bonzini, 2020/12/02
- [PULL 110/113] scripts: kernel-doc: split typedef complex regex, Paolo Bonzini, 2020/12/02
- Re: [PULL 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0, no-reply, 2020/12/02
- Re: [PULL 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0, Peter Maydell, 2020/12/09