| From | Luis Henriques <> | Subject | [PATCH 104/104] kernel-doc: bugfix - multi-line macros | Date | Mon, 30 Sep 2013 11:11:21 +0100 |
| |
3.5.7.22 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Santos <daniel.santos@pobox.com>
commit 654784284430bf2739985914b65e09c7c35a7273 upstream.
Prior to this patch the following code breaks:
/** * multiline_example - this breaks kernel-doc */ #define multiline_example( \ myparam)
Producing this error:
Error(somefile.h:983): cannot understand prototype: 'multiline_example( \ '
This patch fixes the issue by appending all lines ending in a blackslash (optionally followed by whitespace), removing the backslash and any whitespace after it prior to appending (just like the C pre-processor would).
This fixes a break in kerel-doc introduced by the additions to rbtree.h.
Signed-off-by: Daniel Santos <daniel.santos@pobox.com> Cc: Randy Dunlap <rdunlap@xenotime.net> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- scripts/kernel-doc | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 9b0c0b8..55ab5e4 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -2045,6 +2045,9 @@ sub process_file($) { $section_counter = 0; while (<IN>) { + while (s/\\\s*$//) { + $_ .= <IN>; + } if ($state == 0) { if (/$doc_start/o) { $state = 1; # next line is always the function name -- 1.8.3.2
|