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

Fix wide lines, make entry_is_live() non-inline

Browse Source
This commit is contained in:
Nick Mathewson 2014-07-16 16:52:16 +02:00
parent 368ff2291b
commit 5690284559
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/entrynodes.c
View File

@ -190,8 +190,9 @@ entry_is_time_to_retry(const entry_guard_t *e, time_t now)
* If need_descriptor is true, only return the node if we currently have * If need_descriptor is true, only return the node if we currently have
* a descriptor (routerinfo or microdesc) for it. * a descriptor (routerinfo or microdesc) for it.
*/ */
STATIC INLINE const node_t * STATIC const node_t *
entry_is_live(const entry_guard_t *e, entry_is_live_flags_t flags, const char **msg) entry_is_live(const entry_guard_t *e, entry_is_live_flags_t flags,
const char **msg)
{ {
const node_t *node; const node_t *node;
const or_options_t *options = get_options(); const or_options_t *options = get_options();

6
src/or/entrynodes.h
View File

@ -101,9 +101,9 @@ typedef enum {
ENTRY_NEED_DESCRIPTOR = 1<<3, ENTRY_NEED_DESCRIPTOR = 1<<3,
} entry_is_live_flags_t; } entry_is_live_flags_t;
STATIC INLINE const node_t *entry_is_live(const entry_guard_t *e, STATIC const node_t *entry_is_live(const entry_guard_t *e,
entry_is_live_flags_t flags, entry_is_live_flags_t flags,
const char **msg); const char **msg);
#endif #endif
void remove_all_entry_guards(void); void remove_all_entry_guards(void);

4
src/test/test_entrynodes.c
View File

@ -553,6 +553,7 @@ test_entry_is_live(void *arg)
const node_t *test_node = NULL; const node_t *test_node = NULL;
const entry_guard_t *test_entry = NULL; const entry_guard_t *test_entry = NULL;
const char *msg; const char *msg;
int which_node;
(void) arg; (void) arg;
@ -576,7 +577,8 @@ test_entry_is_live(void *arg)
tt_int_op(smartlist_len(all_entry_guards), ==, NUMBER_OF_DESCRIPTORS); tt_int_op(smartlist_len(all_entry_guards), ==, NUMBER_OF_DESCRIPTORS);
/* Now get a random test entry that we will use for this unit test. */ /* Now get a random test entry that we will use for this unit test. */
test_entry = smartlist_get(all_entry_guards, 3); /* chosen by fair dice roll */ which_node = 3; /* (chosen by fair dice roll) */
test_entry = smartlist_get(all_entry_guards, which_node);
/* Let's do some entry_is_live() tests! */ /* Let's do some entry_is_live() tests! */