diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-06 17:58:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-10 15:20:10 -0400 |
| commit | a3e0a87d951b1323ca542c9b115d5525d0d022c9 (patch) | |
| tree | cf0f810beb6960ff0e5b092a8760a707656bc097 /src/or/relay.c | |
| parent | f7d654b81e1a65803c22bb53fc1d3a2021d87d50 (diff) | |
| download | tor-a3e0a87d951b1323ca542c9b115d5525d0d022c9.tar tor-a3e0a87d951b1323ca542c9b115d5525d0d022c9.tar.gz | |
Completely refactor how FILENAME_PRIVATE works
We previously used FILENAME_PRIVATE identifiers mostly for
identifiers exposed only to the unit tests... but also for
identifiers exposed to the benchmarker, and sometimes for
identifiers exposed to a similar module, and occasionally for no
really good reason at all.
Now, we use FILENAME_PRIVATE identifiers for identifiers shared by
Tor and the unit tests. They should be defined static when we
aren't building the unit test, and globally visible otherwise. (The
STATIC macro will keep us honest here.)
For identifiers used only by the unit tests and never by Tor at all,
on the other hand, we wrap them in #ifdef TOR_UNIT_TESTS.
This is not the motivating use case for the split test/non-test
build system; it's just a test example to see how it works, and to
take a chance to clean up the code a little.
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 251d3ffa2..7ec7e0302 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -969,7 +969,7 @@ remap_event_helper(entry_connection_t *conn, const tor_addr_t *new_addr) * <b>addr_out</b> to the address we're connected to, and <b>ttl_out</b> to * the ttl of that address, in seconds, and return 0. On failure, return * -1. */ -int +STATIC int connected_cell_parse(const relay_header_t *rh, const cell_t *cell, tor_addr_t *addr_out, int *ttl_out) { |