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/common/util.h | |
| parent | f7d654b81e1a65803c22bb53fc1d3a2021d87d50 (diff) | |
| download | tor-a3e0a87d951b1323ca542c9b115d5525d0d022c9.tar.gz tor-a3e0a87d951b1323ca542c9b115d5525d0d022c9.zip | |
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/common/util.h')
| -rw-r--r-- | src/common/util.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/util.h b/src/common/util.h index 5596378bca..ca6ce7c4c8 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -15,6 +15,7 @@ #include "torint.h" #include "compat.h" #include "di_ops.h" +#include "testsupport.h" #include <stdio.h> #include <stdlib.h> #ifdef _WIN32 @@ -520,9 +521,9 @@ int32_t tor_weak_random_range(tor_weak_rng_t *rng, int32_t top); #ifdef UTIL_PRIVATE /* Prototypes for private functions only used by util.c (and unit tests) */ -int format_hex_number_for_helper_exit_status(unsigned int x, char *buf, +STATIC int format_hex_number_for_helper_exit_status(unsigned int x, char *buf, int max_len); -int format_helper_exit_status(unsigned char child_state, +STATIC int format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno); /* Space for hex values of child state, a slash, saved_errno (with |