Run "make autostyle"

diff --git a/src/feature/control/control_hs.h b/src/feature/control/control_hs.h
index 35ac1b22d4d9fcb8dd980d4e19327b90a6ead968..41ba1ee89b73753c1d2bfda812461518e302f2d8 100644 (file)
--- 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 1d1748666288f594e891d48d26697e666b34cadb..02dbc5de54020c6c21325bbf09f909065d8a8548 100644 (file)
--- 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 82a8722ba8cdf756d6ff105a3fd80b995f89b635..cb8dafc6b30f135ba1d9e94fb61838b7d46b9a3f 100644 (file)
--- 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 0a9be28c54da4f83550f7fde1f16b6aee9bfc13c..a3c44e66c5f1aacc6b6acfbb9249dc5d82d990ca 100644 (file)
--- 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 378a6f1924b04fe14b1a8825485e8bea69de181a..03e013a268158bfcc1a67b4d402f0a032cd4f212 100644 (file)
--- 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("");