Commit 39f00c08 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

kernel-doc: allow structs whose members are all private

Struct members may be marked as private by using
	/* private: */
before them, as noted in Documentation/kernel-doc-nano-HOWTO.txt

Fix kernel-doc to handle structs whose members are all private;
otherwise invalid XML is generated:

xmlto: input does not validate (status 3)
linux-2.6.27-rc6-git4/Documentation/DocBook/debugobjects.xml:146: element variablelist: validity error : Element variablelist content does not follow the DTD, expecting ((title , titleabbrev?)? , varlistentry+), got ()
Document linux-2.6.27-rc6-git4/Documentation/DocBook/debugobjects.xml does not validate
make[1]: *** [Documentation/DocBook/debugobjects.html] Error 3
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Reported-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c32a162f
...@@ -781,6 +781,7 @@ sub output_struct_xml(%) { ...@@ -781,6 +781,7 @@ sub output_struct_xml(%) {
print " <refsect1>\n"; print " <refsect1>\n";
print " <title>Members</title>\n"; print " <title>Members</title>\n";
if ($#{$args{'parameterlist'}} >= 0) {
print " <variablelist>\n"; print " <variablelist>\n";
foreach $parameter (@{$args{'parameterlist'}}) { foreach $parameter (@{$args{'parameterlist'}}) {
($parameter =~ /^#/) && next; ($parameter =~ /^#/) && next;
...@@ -798,6 +799,9 @@ sub output_struct_xml(%) { ...@@ -798,6 +799,9 @@ sub output_struct_xml(%) {
print " </varlistentry>\n"; print " </varlistentry>\n";
} }
print " </variablelist>\n"; print " </variablelist>\n";
} else {
print " <para>\n None\n </para>\n";
}
print " </refsect1>\n"; print " </refsect1>\n";
output_section_xml(@_); output_section_xml(@_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment