re-run ./scripts/maint/annotate_ifdef_directives

src/common/compat_threads.c

@@ -403,5 +403,5 @@ atomic_counter_exchange(atomic_counter_t *counter, size_t newval)
   tor_mutex_release(&counter->mutex);
   return oldval;
 }
-#endif
+#endif /* !defined(HAVE_STDATOMIC_H) */
 

src/common/compat_threads.h

@@ -159,13 +159,13 @@ typedef struct atomic_counter_t {
   atomic_size_t val;
 } atomic_counter_t;
 #define ATOMIC_LINKAGE static
-#else
+#else /* !(defined(HAVE_STDATOMIC_H)) */
 typedef struct atomic_counter_t {
   tor_mutex_t mutex;
   size_t val;
 } atomic_counter_t;
 #define ATOMIC_LINKAGE
-#endif
+#endif /* defined(HAVE_STDATOMIC_H) */
 
 ATOMIC_LINKAGE void atomic_counter_init(atomic_counter_t *counter);
 ATOMIC_LINKAGE void atomic_counter_destroy(atomic_counter_t *counter);
@@ -214,8 +214,8 @@ atomic_counter_exchange(atomic_counter_t *counter, size_t newval)
   return atomic_exchange(&counter->val, newval);
 }
 
-#else
-#endif
+#else /* !(defined(HAVE_STDATOMIC_H)) */
+#endif /* defined(HAVE_STDATOMIC_H) */
 
 #endif /* !defined(TOR_COMPAT_THREADS_H) */
 

src/common/sandbox.c

@@ -429,9 +429,9 @@ libc_uses_openat_for_everything(void)
     return 1;
   else
     return 0;
-#else
+#else /* !(defined(CHECK_LIBC_VERSION)) */
   return 0;
-#endif
+#endif /* defined(CHECK_LIBC_VERSION) */
 }
 
 /** Allow a single file to be opened.  If <b>use_openat</b> is true,
@@ -1126,7 +1126,7 @@ sb_kill(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
        SCMP_CMP(1, SCMP_CMP_EQ, 0));
 #else
   return 0;
-#endif
+#endif /* defined(__NR_kill) */
 }
 
 /**

src/or/config.c

@@ -1787,7 +1787,7 @@ options_act(const or_options_t *old_options)
                "given FD.");
       return -1;
     }
-#endif
+#endif /* defined(_WIN32) */
   }
 
   /* Load state */

src/or/confparse.h

@@ -68,7 +68,7 @@ typedef union {
   config_line_t **LINELIST_V;
   routerset_t **ROUTERSET;
 } confparse_dummy_values_t;
-#endif
+#endif /* defined(TOR_UNIT_TESTS) */
 
 /** An abbreviation for a configuration option allowed on the command line. */
 typedef struct config_abbrev_t {
@@ -132,13 +132,13 @@ typedef struct config_var_t {
   { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL, { .INT=NULL } }
 #define DUMMY_TYPECHECK_INSTANCE(tp)            \
   static tp tp ## _dummy
-#else
+#else /* !(defined(TOR_UNIT_TESTS)) */
 #define CONF_TEST_MEMBERS(tp, conftype, member)
 #define END_OF_CONFIG_VARS { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
 /* Repeatedly declarable incomplete struct to absorb redundant semicolons */
 #define DUMMY_TYPECHECK_INSTANCE(tp)            \
   struct tor_semicolon_eater
-#endif
+#endif /* defined(TOR_UNIT_TESTS) */
 
 /** Type of a callback to validate whether a given configuration is
  * well-formed and consistent. See options_trial_assign() for documentation

src/or/git_revision.h

@@ -8,5 +8,5 @@
 
 extern const char tor_git_revision[];
 
-#endif
+#endif /* !defined(TOR_GIT_REVISION_H) */
 

src/or/hs_circuit.h

@@ -67,7 +67,7 @@ create_rp_circuit_identifier(const hs_service_t *service,
                              const curve25519_public_key_t *server_pk,
                              const hs_ntor_rend_cell_keys_t *keys);
 
-#endif
+#endif /* defined(HS_CIRCUIT_PRIVATE) */
 
 #endif /* !defined(TOR_HS_CIRCUIT_H) */
 

src/or/main.c

@@ -3207,7 +3207,7 @@ tor_init(int argc, char *argv[])
     log_notice(LD_GENERAL, "%s", rust_str);
   }
   tor_free(rust_str);
-#endif
+#endif /* defined(HAVE_RUST) */
 
   if (network_init()<0) {
     log_err(LD_BUG,"Error initializing network; exiting.");

src/or/protover.c

@@ -778,5 +778,5 @@ protover_free_all(void)
   }
 }
 
-#endif
+#endif /* !defined(HAVE_RUST) */
 

src/or/protover.h

@@ -84,7 +84,7 @@ STATIC const char *protocol_type_to_str(protocol_type_t pr);
 STATIC int str_to_protocol_type(const char *s, protocol_type_t *pr_out);
 STATIC void proto_entry_free(proto_entry_t *entry);
 
-#endif
+#endif /* !defined(HAVE_RUST) && defined(TOR_UNIT_TESTS) */
 
 #endif /* defined(PROTOVER_PRIVATE) */
 

src/or/protover_rust.c

@@ -15,5 +15,5 @@
 /* Define for compatibility, used in main.c */
 void protover_free_all(void) {}
 
-#endif
+#endif /* defined(HAVE_RUST) */
 

src/or/tor_api_internal.h

@@ -16,5 +16,5 @@ struct tor_main_configuration_t {
   char **argv;
 };
 
-#endif
+#endif /* !defined(TOR_API_INTERNAL_H) */