[tor-commits] [tor/master] Fix a couple more long warning lines

nickm at torproject.org nickm at torproject.org
Thu Mar 5 13:25:48 UTC 2020


commit 7036ed34715678d64a9bfee99db69830f44d8912
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 6 16:19:49 2020 -0500

    Fix a couple more long warning lines
    
    These are not a problem with 2-space indentation, but cocci will
    start getting confused when clang-format wraps them with 4-space
    indentation.
---
 src/lib/log/log.c         | 2 +-
 src/lib/malloc/map_anon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/log/log.c b/src/lib/log/log.c
index 75f8f79da..9ebe7350b 100644
--- a/src/lib/log/log.c
+++ b/src/lib/log/log.c
@@ -523,7 +523,7 @@ logfile_deliver(logfile_t *lf, const char *buf, size_t msg_len,
      * pass them, and some very old ones do not detect overflow so well.
      * Regrettably, they call their maximum line length MAXLINE. */
 #if MAXLINE < 64
-#warning "MAXLINE is a very low number; it might not be from syslog.h."
+#warning "MAXLINE is very low; it might not be from syslog.h."
 #endif
     char *m = msg_after_prefix;
     if (msg_len >= MAXLINE)
diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c
index 1926b61f0..628966012 100644
--- a/src/lib/malloc/map_anon.c
+++ b/src/lib/malloc/map_anon.c
@@ -78,7 +78,7 @@
 #endif /* defined(HAVE_MINHERIT) || ... */
 
 #if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT)
-#warning "minherit() is defined, but we couldn't find the right flag for it."
+#warning "minherit() is defined, but FLAG_ZERO/NOINHERIT are not."
 #warning "This is probably a bug in Tor's support for this platform."
 #endif
 





More information about the tor-commits mailing list