diff options
author | Andrea Shepard <andrea@torproject.org> | 2014-01-28 17:25:37 -0800 |
---|---|---|
committer | Andrea Shepard <andrea@torproject.org> | 2014-09-30 23:14:58 -0700 |
commit | dc3af04ba8c65e1217f834f04be2a055e8084ec8 (patch) | |
tree | e2552fec4f6f5b632d82a3180b73af2ba2182388 | |
parent | f8ceb0f028eb7661cb31b2f82d5a82460e96ece9 (diff) | |
download | tor-dc3af04ba8c65e1217f834f04be2a055e8084ec8.tar.gz tor-dc3af04ba8c65e1217f834f04be2a055e8084ec8.zip |
Make scheduler_compare_channels() mockable
-rw-r--r-- | src/or/scheduler.c | 4 | ||||
-rw-r--r-- | src/or/scheduler.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/or/scheduler.c b/src/or/scheduler.c index bf86810517..c161393b5a 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -167,8 +167,8 @@ scheduler_free_all(void) * Comparison function to use when sorting pending channels */ -STATIC int -scheduler_compare_channels(const void *c1_v, const void *c2_v) +MOCK_IMPL(STATIC int, +scheduler_compare_channels, (const void *c1_v, const void *c2_v)) { channel_t *c1 = NULL, *c2 = NULL; /* These are a workaround for -Wbad-function-cast throwing a fit */ diff --git a/src/or/scheduler.h b/src/or/scheduler.h index b0b66ee957..8854d5a508 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -37,7 +37,8 @@ void scheduler_touch_channel(channel_t *chan); /* Things only scheduler.c and its test suite should see */ #ifdef SCHEDULER_PRIVATE_ -STATIC int scheduler_compare_channels(const void *c1_v, const void *c2_v); +MOCK_DECL(STATIC int, scheduler_compare_channels, + (const void *c1_v, const void *c2_v)); STATIC uint64_t scheduler_get_queue_heuristic(void); STATIC void scheduler_update_queue_heuristic(time_t now); #endif |