Commit 53116ca0 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Re-run "make autostyle" with improved annotate_ifdef_directives

parent de66bed6

src/app/config/config.c

+3 −3
Original line number Diff line number Diff line
@@ -3518,7 +3518,7 @@ options_validate(or_options_t *old_options, or_options_t *options, 
      REJECT("Cannot use TransProxyType without any valid TransPort.");

    }

  }

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

#else /* !defined(USE_TRANSPARENT) */

  if (options->TransPort_set)

    REJECT("TransPort is disabled in this build.");

#endif /* defined(USE_TRANSPARENT) */
@@ -7795,7 +7795,7 @@ get_data_directory(const char *val) 
  } else {

    return tor_strdup(get_windows_conf_root());

  }

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

#else /* !defined(_WIN32) */

  const char *d = val;

  if (!d)

    d = "~/.tor";
@@ -8341,7 +8341,7 @@ config_load_geoip_file_(sa_family_t family, 
  }

  r = geoip_load_file(family, fname, severity);

  tor_free(free_fname);

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

#else /* !defined(_WIN32) */

  (void)default_fname;

  r = geoip_load_file(family, fname, severity);

#endif /* defined(_WIN32) */

src/core/mainloop/connection.c

+2 −2
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ make_win32_socket_exclusive(tor_socket_t sock) 
    return -1;

  }

  return 0;

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

#else /* !defined(SO_EXCLUSIVEADDRUSE) */

  (void) sock;

  return 0;

#endif /* defined(SO_EXCLUSIVEADDRUSE) */
@@ -3957,7 +3957,7 @@ update_send_buffer_size(tor_socket_t sock) 
      &isb, sizeof(isb), &bytesReturned, NULL, NULL)) {

    setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (const char*)&isb, sizeof(isb));

  }

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

#else /* !defined(_WIN32) */

  (void) sock;

#endif /* defined(_WIN32) */

}

src/core/or/channeltls.c

+1 −1
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ channel_tls_time_process_cell(cell_t *cell, channel_tls_t *chan, int *time, 
    channel_tls_time_process_cell(cl, cn, & tp ## time ,            \

                             channel_tls_process_ ## tp ## _cell);  \

    } STMT_END

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

#else /* !defined(KEEP_TIMING_STATS) */

#define PROCESS_CELL(tp, cl, cn) channel_tls_process_ ## tp ## _cell(cl, cn)

#endif /* defined(KEEP_TIMING_STATS) */

src/core/or/command.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ command_process_cell(channel_t *chan, cell_t *cell) 
    command_time_process_cell(cl, cn, & tp ## time ,            \

                              command_process_ ## tp ## _cell);  \

  } STMT_END

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

#else /* !defined(KEEP_TIMING_STATS) */

#define PROCESS_CELL(tp, cl, cn) command_process_ ## tp ## _cell(cl, cn)

#endif /* defined(KEEP_TIMING_STATS) */

src/core/or/connection_edge.c

+1 −1
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ connection_ap_rescan_and_attach_pending(void) 
    entry_conn->marked_pending_circ_line = 0;   \

    entry_conn->marked_pending_circ_file = 0;   \

  } while (0)

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

#else /* !defined(DEBUGGING_17659) */

#define UNMARK() do { } while (0)

#endif /* defined(DEBUGGING_17659) */