Commit 744958e0 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Fix a few compilation warnings and errors

parent a7d44731

src/or/connection.h

+2 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ smartlist_t *connection_dir_list_by_purpose_resource_and_state( 


/** Return a count of directory connections that are fetching the item

 * described by <b>purpose</b>/<b>resource</b>. */

static INLINE int

static inline int

connection_dir_count_by_purpose_and_resource(

                                             int purpose,

                                             const char *resource)
@@ -229,7 +229,7 @@ connection_dir_count_by_purpose_and_resource( 


/** Return a count of directory connections that are fetching the item

 * described by <b>purpose</b>/<b>resource</b>/<b>state</b>. */

static INLINE int

static inline int

connection_dir_count_by_purpose_resource_and_state(

                                                   int purpose,

                                                   const char *resource,

src/or/directory.c

+1 −1
Original line number Diff line number Diff line
@@ -3441,7 +3441,7 @@ connection_dir_finished_flushing(dir_connection_t *conn) 
/* A helper function for connection_dir_close_consensus_conn_if_extra()

 * and connection_dir_close_extra_consensus_conns() that returns 0 if

 * we can't have, or don't want to close, excess consensus connections. */

int

STATIC int

connection_dir_would_close_consensus_conn_helper(void)

{

  const or_options_t *options = get_options();

src/or/directory.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ STATIC int directory_handle_command_get(dir_connection_t *conn, 
                                        const char *headers,

                                        const char *req_body,

                                        size_t req_body_len);

int connection_dir_would_close_consensus_conn_helper(void);

STATIC int connection_dir_would_close_consensus_conn_helper(void);

STATIC int download_status_schedule_get_delay(download_status_t *dls,

                                              const smartlist_t *schedule,

                                              time_t now);

src/test/test_connection.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ test_conn_download_status_setup(const struct testcase_t *tc) 
  (void)tc;



  /* Don't return NULL, that causes the test to fail */

  return "ok";

  return (void*)"ok";

}



static int