Browse Source

Make scheduler_compare_channels() mockable

Andrea Shepard 10 years ago
parent
commit
dc3af04ba8
2 changed files with 4 additions and 3 deletions
  1. 2 2
      src/or/scheduler.c
  2. 2 1
      src/or/scheduler.h

+ 2 - 2
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 */

+ 2 - 1
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