| From 701b3a3c0ac42630f74a5efba8545d61ac0e3293 Mon Sep 17 00:00:00 2001 |
| From: "valdis.kletnieks@vt.edu" <valdis.kletnieks@vt.edu> |
| Date: Tue, 17 Jul 2018 12:57:29 -0400 |
| Subject: PATCH scripts/kernel-doc |
| |
| From: Valdis Kletnieks <valdis.kletnieks@vt.edu> |
| |
| commit 701b3a3c0ac42630f74a5efba8545d61ac0e3293 upstream. |
| |
| Fix a warning whinge from Perl introduced by "scripts: kernel-doc: parse next structs/unions" |
| |
| Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.32), passed through in regex; marked by <-- HERE in m/({ <-- HERE [^\{\}]*})/ at ./scripts/kernel-doc line 1155. |
| Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.32), passed through in regex; marked by <-- HERE in m/({ <-- HERE )/ at ./scripts/kernel-doc line 1179. |
| |
| Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> |
| Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Jonathan Corbet <corbet@lwn.net> |
| Cc: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| scripts/kernel-doc | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/scripts/kernel-doc |
| +++ b/scripts/kernel-doc |
| @@ -1152,7 +1152,7 @@ sub dump_struct($$) { |
| } |
| |
| # Ignore other nested elements, like enums |
| - $members =~ s/({[^\{\}]*})//g; |
| + $members =~ s/(\{[^\{\}]*})//g; |
| |
| create_parameterlist($members, ';', $file, $declaration_name); |
| check_sections($file, $declaration_name, $decl_type, $sectcheck, $struct_actual); |
| @@ -1176,7 +1176,7 @@ sub dump_struct($$) { |
| $declaration .= "\t" x $level; |
| } |
| $declaration .= "\t" . $clause . "\n"; |
| - $level++ if ($clause =~ m/({)/ && !($clause =~m/}/)); |
| + $level++ if ($clause =~ m/(\{)/ && !($clause =~m/}/)); |
| } |
| output_declaration($declaration_name, |
| 'struct', |
