summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2014-01-23 20:54:50 -0800
committerAndrea Shepard <andrea@torproject.org>2014-09-30 23:14:25 -0700
commit5a07fb96f2a4072bd9ee31a887ac0c790fdaf6c4 (patch)
tree68e691efba5fda18cada0efe980c0e5a1fcac757 /src
parent5e9a88e001f66092b8b3fd5fd14877214d038027 (diff)
downloadtor-5a07fb96f2a4072bd9ee31a887ac0c790fdaf6c4.tar.gz
tor-5a07fb96f2a4072bd9ee31a887ac0c790fdaf6c4.zip
Make tor_libevent_get_base() mockable
Diffstat (limited to 'src')
-rw-r--r--src/common/compat_libevent.c4
-rw-r--r--src/common/compat_libevent.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 74b54bb855..6b2241ad30 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -280,8 +280,8 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg)
}
/** Return the current Libevent event base that we're set up to use. */
-struct event_base *
-tor_libevent_get_base(void)
+MOCK_IMPL(struct event_base *,
+tor_libevent_get_base, (void))
{
return the_event_base;
}
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h
index 9ee7b49cfb..45d007f9b8 100644
--- a/src/common/compat_libevent.h
+++ b/src/common/compat_libevent.h
@@ -72,7 +72,7 @@ typedef struct tor_libevent_cfg {
} tor_libevent_cfg;
void tor_libevent_initialize(tor_libevent_cfg *cfg);
-struct event_base *tor_libevent_get_base(void);
+MOCK_DECL(struct event_base *, tor_libevent_get_base, (void));
const char *tor_libevent_get_method(void);
void tor_check_libevent_version(const char *m, int server,
const char **badness_out);