From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 26 Sep 2019 01:13:30 +0000 (-0400)
Subject: annotate_ifdef_directives: clarify situation with newlines
X-Git-Tag: tor-0.4.2.2-alpha~25^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21cc9d13f34d116b521c4415098ca1c9993bd198;p=thirdparty%2Ftor.git

annotate_ifdef_directives: clarify situation with newlines

Our line limit is 80 characters, assuming that there is a single
terminating newline character that counts towards the limit.  On
Windows, this might go as high as 81 characters, if we count CRLF as
two characters.
---

diff --git a/scripts/maint/annotate_ifdef_directives b/scripts/maint/annotate_ifdef_directives
index 4463d83828..b6bb147ce2 100755
--- a/scripts/maint/annotate_ifdef_directives
+++ b/scripts/maint/annotate_ifdef_directives
@@ -26,7 +26,10 @@ import re
 # Any block with fewer than this many lines does not need annotations.
 LINE_OBVIOUSNESS_LIMIT = 4
 
-# Maximum line width.
+# Maximum line width.  This includes a terminating newline character.
+#
+# (This is the maximum before encoding, so that if the the operating system
+# uses multiple characers to encode newline, that's still okay.)
 LINE_WIDTH=80
 
 class Problem(Exception):
@@ -38,7 +41,10 @@ def commented_line(fmt, argument, maxwidth=LINE_WIDTH):
     be longer than maxwidth, truncate argument.
 
     Requires that fmt%"..." will fit into maxwidth characters.
+
+    Requires that fmt ends with a newline.
     """
+    assert fmt.endswith("\n")
     result = fmt % argument
     if len(result) <= maxwidth:
         return result