nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few compilation warnings and errors

Browse Source
This commit is contained in:
Nick Mathewson 2015-12-15 13:03:21 -05:00
parent a7d44731d9
commit 744958e0dd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection.h
View File

@ -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,

2
src/or/directory.c
View File

@ -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();

2
src/or/directory.h
View File

@ -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);

2
src/test/test_connection.c
View File

@ -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