Commit 194dbea2 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Run "make autostyle" with new "annotate_ifdef_directives"

parent 3283fd7e

src/app/config/config.c

+3 −3
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) 
                      "on this OS/with this build.");

    goto rollback;

  }

#else /* !(!defined(HAVE_SYS_UN_H)) */

#else /* defined(HAVE_SYS_UN_H) */

  if (options->ControlSocketsGroupWritable && !options->ControlSocket) {

    *msg = tor_strdup("Setting ControlSocketGroupWritable without setting"

                      "a ControlSocket makes no sense.");
@@ -5101,7 +5101,7 @@ find_torrc_filename(config_line_t *cmd_arg, 
      } else {

        fname = dflt ? tor_strdup(dflt) : NULL;

      }

#else /* !(!defined(_WIN32)) */

#else /* defined(_WIN32) */

      fname = dflt ? tor_strdup(dflt) : NULL;

#endif /* !defined(_WIN32) */

    }
@@ -8425,7 +8425,7 @@ init_cookie_authentication(const char *fname, const char *header, 
      log_warn(LD_FS,"Unable to make %s group-readable.", escaped(fname));

    }

  }

#else /* !(!defined(_WIN32)) */

#else /* defined(_WIN32) */

  (void) group_readable;

#endif /* !defined(_WIN32) */

src/lib/crypt_ops/compat_openssl.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
   ((st) == SSL3_ST_SW_SRVR_HELLO_B))

#define OSSL_HANDSHAKE_STATE int

#define CONST_IF_OPENSSL_1_1_API

#else /* !(!defined(OPENSSL_1_1_API)) */

#else /* defined(OPENSSL_1_1_API) */

#define STATE_IS_SW_SERVER_HELLO(st) \

  ((st) == TLS_ST_SW_SRVR_HELLO)

#define CONST_IF_OPENSSL_1_1_API const

src/lib/fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ check_private_dir,(const char *dirname, cpd_check_t check, 
    }

  }

  close(fd);

#else /* !(!defined(_WIN32)) */

#else /* defined(_WIN32) */

  /* Win32 case: we can't open() a directory. */

  (void)effective_user;

src/lib/log/util_bug.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 
  (void)(a);                                                            \

  (void)(fmt);                                                          \

  STMT_END

#else /* !(defined(TOR_UNIT_TESTS) && ... */

#else /* !(defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TES... */

/** Like assert(3), but send assertion failures to the log as well as to

 * stderr. */

#define tor_assert(expr) tor_assertf(expr, NULL)

src/lib/math/fp.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ clamp_double_to_int64(double number) 
*/

#define PROBLEMATIC_FLOAT_CONVERSION_WARNING

DISABLE_GCC_WARNING(float-conversion)

#endif /* defined(MINGW_ANY) && GCC_VERSION >= 409 */

#endif /* (defined(MINGW_ANY)||defined(__FreeBSD__)) && GCC_VERSION >= 409 */



/*

  With clang 4.0 we apparently run into "double promotion" warnings here,