Remove the repetitive warnings from the uapi headers.
Having
WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS
every four lines made the headers harder to read, made the diffs much worse
each time we upgraded, and wasn't really providing any benefit. Before the
next uapi update, let's just stop doing this.
Bug: N/A
Test: builds, manually inspected files look right
Change-Id: Id7088cf750894c9d24950f3d53587fe3156c4f7d
diff --git a/libc/kernel/tools/clean_header.py b/libc/kernel/tools/clean_header.py
index f474f74..d63ea03 100755
--- a/libc/kernel/tools/clean_header.py
+++ b/libc/kernel/tools/clean_header.py
@@ -122,7 +122,7 @@
out = StringOutput()
out.write(kernel_disclaimer)
- blocks.writeWithWarning(out, kernel_warning, 4)
+ blocks.write(out)
return out.get()
diff --git a/libc/kernel/tools/cpp.py b/libc/kernel/tools/cpp.py
index 10ce290..bca491b 100644
--- a/libc/kernel/tools/cpp.py
+++ b/libc/kernel/tools/cpp.py
@@ -1098,33 +1098,24 @@
return result, indent
- def writeWithWarning(self, out, warning, left_count, repeat_count, indent):
- """Dump the current block with warnings."""
+ def write(self, out, indent):
+ """Dump the current block."""
# removeWhiteSpace() will sometimes creates non-directive blocks
# without any tokens. These come from blocks that only contained
# empty lines and spaces. They should not be printed in the final
# output, and then should not be counted for this operation.
#
if self.directive is None and not self.tokens:
- return left_count, indent
+ return indent
if self.directive:
out.write(str(self) + '\n')
- left_count -= 1
- if left_count == 0:
- out.write(warning)
- left_count = repeat_count
-
else:
lines, indent = self.format_blocks(self.tokens, indent)
for line in lines:
out.write(line + '\n')
- left_count -= 1
- if left_count == 0:
- out.write(warning)
- left_count = repeat_count
- return left_count, indent
+ return indent
def __repr__(self):
"""Generate the representation of a given block."""
@@ -1243,14 +1234,9 @@
return result
def write(self, out):
- out.write(str(self))
-
- def writeWithWarning(self, out, warning, repeat_count):
- left_count = repeat_count
indent = 0
for b in self.blocks:
- left_count, indent = b.writeWithWarning(out, warning, left_count,
- repeat_count, indent)
+ indent = b.write(out, indent)
def removeVarsAndFuncs(self, knownStatics=None):
"""Remove variable and function declarations.
@@ -1795,7 +1781,7 @@
#endif
#ifndef __SIGRTMAX
#define __SIGRTMAX 123
-#endif\
+#endif
"""
out = utils.StringOutput()
diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py
index 5198dbe..9612812 100644
--- a/libc/kernel/tools/defaults.py
+++ b/libc/kernel/tools/defaults.py
@@ -176,8 +176,3 @@
****************************************************************************
****************************************************************************/
"""
-
-# This is the warning line that will be inserted every N-th line in the output
-kernel_warning = """\
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-"""