aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-10-24 18:08:48 -0400
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 17:14:35 -0500
commit2e95972c44ca7b3dd3c5d6ff08745b56ddfa55bc (patch)
treecf7d5ebefd08be48dc6e125263286246e1caba21
parent4b44595a7b8e0ebf3fce108df65d8cd6a6cf4910 (diff)
kernel-doc: use no-doc option
When asked by a template to include all functions from a file, it will also include DOC: sections wreaking havoc in the generated docbook file. This patch makes it use the new -no-doc-sections flag for kernel-doc to avoid this. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--scripts/basic/docproc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 0e4bd5459df4..7eae53419a48 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -65,6 +65,7 @@ FILELINE * entity_system;
65#define DOCBOOK "-docbook" 65#define DOCBOOK "-docbook"
66#define FUNCTION "-function" 66#define FUNCTION "-function"
67#define NOFUNCTION "-nofunction" 67#define NOFUNCTION "-nofunction"
68#define NODOCSECTIONS "-no-doc-sections"
68 69
69char *srctree; 70char *srctree;
70 71
@@ -231,13 +232,14 @@ void docfunctions(char * filename, char * type)
231 232
232 for (i=0; i <= symfilecnt; i++) 233 for (i=0; i <= symfilecnt; i++)
233 symcnt += symfilelist[i].symbolcnt; 234 symcnt += symfilelist[i].symbolcnt;
234 vec = malloc((2 + 2 * symcnt + 2) * sizeof(char*)); 235 vec = malloc((2 + 2 * symcnt + 3) * sizeof(char *));
235 if (vec == NULL) { 236 if (vec == NULL) {
236 perror("docproc: "); 237 perror("docproc: ");
237 exit(1); 238 exit(1);
238 } 239 }
239 vec[idx++] = KERNELDOC; 240 vec[idx++] = KERNELDOC;
240 vec[idx++] = DOCBOOK; 241 vec[idx++] = DOCBOOK;
242 vec[idx++] = NODOCSECTIONS;
241 for (i=0; i < symfilecnt; i++) { 243 for (i=0; i < symfilecnt; i++) {
242 struct symfile * sym = &symfilelist[i]; 244 struct symfile * sym = &symfilelist[i];
243 for (j=0; j < sym->symbolcnt; j++) { 245 for (j=0; j < sym->symbolcnt; j++) {