[tor-commits] [tor/master] Run "make autostyle"

[teor at torproject.org]

commit 57b6678d52eec334a3e650158ac97d60b5b2b38b
Author: teor <teor at torproject.org>
Date:   Fri Dec 20 09:45:53 2019 +1000

    Run "make autostyle"
---
 src/feature/control/control_hs.h | 2 +-
 src/lib/math/prob_distr.c        | 2 +-
 src/test/fakecircs.c             | 2 +-
 src/test/test_options_act.c      | 4 ++--
 src/test/testing_common.c        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/feature/control/control_hs.h b/src/feature/control/control_hs.h
index 35ac1b22d..41ba1ee89 100644
--- a/src/feature/control/control_hs.h
+++ b/src/feature/control/control_hs.h
@@ -29,5 +29,5 @@ int
 handle_control_onion_client_auth_view(control_connection_t *conn,
                                       const control_cmd_args_t *args);
 
-#endif
+#endif /* !defined(TOR_CONTROL_HS_H) */
 
diff --git a/src/lib/math/prob_distr.c b/src/lib/math/prob_distr.c
index 1d1748666..02dbc5de5 100644
--- a/src/lib/math/prob_distr.c
+++ b/src/lib/math/prob_distr.c
@@ -68,7 +68,7 @@ DECLARE_PROB_DISTR_DOWNCAST_FN(logistic)
 DECLARE_PROB_DISTR_DOWNCAST_FN(log_logistic)
 DECLARE_PROB_DISTR_DOWNCAST_FN(genpareto)
 DECLARE_PROB_DISTR_DOWNCAST_FN(weibull)
-#endif
+#endif /* !defined(COCCI) */
 
 /**
  * Count number of one bits in 32-bit word.
diff --git a/src/test/fakecircs.c b/src/test/fakecircs.c
index 82a8722ba..cb8dafc6b 100644
--- a/src/test/fakecircs.c
+++ b/src/test/fakecircs.c
@@ -22,7 +22,7 @@
 #include "core/or/relay.h"
 #include "core/or/relay_crypto_st.h"
 
-#include "fakecircs.h"
+#include "test/fakecircs.h"
 
 /** Return newly allocated OR circuit using the given nchan and pchan. It must
  * be freed with the free_fake_orcirc(). */
diff --git a/src/test/test_options_act.c b/src/test/test_options_act.c
index 0a9be28c5..a3c44e66c 100644
--- a/src/test/test_options_act.c
+++ b/src/test/test_options_act.c
@@ -40,10 +40,10 @@ get_file_mode(const char *fname, unsigned *permissions_out)
     TT_DIE(("Bad mode %o on %s", mode_, (fn)));                  \
   }                                                              \
   STMT_END
-#else
+#else /* defined(_WIN32) */
 /* "group-readable" isn't meaningful on windows */
 #define assert_mode(fn,mask,expected) STMT_NIL
-#endif
+#endif /* !defined(_WIN32) */
 
 static or_options_t *mock_opts;
 static const or_options_t *
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index 378a6f192..03e013a26 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -108,7 +108,7 @@ setup_directory(void)
     /* undo sticky bit so tests don't get confused. */
     r = chown(temp_dir, getuid(), getgid());
   }
-#endif /* defined(_WIN32) */
+#endif /* defined(_WIN32) || ... */
   if (r) {
     fprintf(stderr, "Can't create directory %s:", temp_dir);
     perror("");