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

Make options_get_datadir_fname2_suffix() mockable

Browse Source
This commit is contained in:
Andrea Shepard 2016-06-25 08:31:45 +00:00
parent 35fc5879fb
commit 2a17b93cc4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/config.c
View File

@ -7229,10 +7229,10 @@ init_libevent(const or_options_t *options)
* *
* Note: Consider using the get_datadir_fname* macros in or.h. * Note: Consider using the get_datadir_fname* macros in or.h.
*/ */
char * MOCK_IMPL(char *,
options_get_datadir_fname2_suffix(const or_options_t *options, options_get_datadir_fname2_suffix,(const or_options_t *options,
const char *sub1, const char *sub2, const char *sub1, const char *sub2,
const char *suffix) const char *suffix))
{ {
char *fname = NULL; char *fname = NULL;
size_t len; size_t len;

8
src/or/config.h
View File

@ -53,9 +53,11 @@ config_line_t *option_get_assignment(const or_options_t *options,
const char *key); const char *key);
int options_save_current(void); int options_save_current(void);
const char *get_torrc_fname(int defaults_fname); const char *get_torrc_fname(int defaults_fname);
char *options_get_datadir_fname2_suffix(const or_options_t *options, MOCK_DECL(char *,
const char *sub1, const char *sub2, options_get_datadir_fname2_suffix,
const char *suffix); (const or_options_t *options,
const char *sub1, const char *sub2,
const char *suffix));
#define get_datadir_fname2_suffix(sub1, sub2, suffix) \ #define get_datadir_fname2_suffix(sub1, sub2, suffix) \
options_get_datadir_fname2_suffix(get_options(), (sub1), (sub2), (suffix)) options_get_datadir_fname2_suffix(get_options(), (sub1), (sub2), (suffix))
/** Return a newly allocated string containing datadir/sub1. See /** Return a newly allocated string containing datadir/sub1. See