diff options
| author | Andrea Shepard <andrea@torproject.org> | 2016-06-09 11:50:25 +0000 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2016-06-09 11:50:25 +0000 |
| commit | 9eeaeddbb1aa04248841890e244c4714f165522d (patch) | |
| tree | bbc12338bf35d7b4890fdaf9076144f05f416adb /src/common | |
| parent | 1e330e1947b750be12b217c944534f9284509751 (diff) | |
| download | tor-9eeaeddbb1aa04248841890e244c4714f165522d.tar.gz tor-9eeaeddbb1aa04248841890e244c4714f165522d.zip | |
Reduce make check-spaces noise
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/di_ops.c | 1 | ||||
| -rw-r--r-- | src/common/di_ops.h | 3 | ||||
| -rw-r--r-- | src/common/pubsub.h | 4 | ||||
| -rw-r--r-- | src/common/util_bug.h | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/common/di_ops.c b/src/common/di_ops.c index e671af6fac..4ed49e1164 100644 --- a/src/common/di_ops.c +++ b/src/common/di_ops.c @@ -271,3 +271,4 @@ select_array_member_cumulative_timei(const uint64_t *entries, int n_entries, return i_chosen; } + diff --git a/src/common/di_ops.h b/src/common/di_ops.h index f1050a00db..0a154302bf 100644 --- a/src/common/di_ops.h +++ b/src/common/di_ops.h @@ -42,7 +42,8 @@ void dimap_add_entry(di_digest256_map_t **map, const uint8_t *key, void *val); void *dimap_search(const di_digest256_map_t *map, const uint8_t *key, void *dflt_val); -int select_array_member_cumulative_timei(const uint64_t *entries, int n_entries, +int select_array_member_cumulative_timei(const uint64_t *entries, + int n_entries, uint64_t total, uint64_t rand_val); #endif diff --git a/src/common/pubsub.h b/src/common/pubsub.h index 09e492ec4f..bbb4f02a42 100644 --- a/src/common/pubsub.h +++ b/src/common/pubsub.h @@ -21,7 +21,9 @@ * unsigned priority); * int T_unsubscribe(const T_subscriber_t *) * - * Elsewhere you can say DECLARE_NOTIFY_PUBSUB_TOPIC(static, T), which declares: + * Elsewhere you can say DECLARE_NOTIFY_PUBSUB_TOPIC(static, T), which + * declares: + * * static int T_notify(T_event_data_t *, unsigned notify_flags); * static void T_clear(void); * diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 36056aa4bd..3f77e0a99e 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -104,14 +104,14 @@ #ifdef __GNUC__ #define IF_BUG_ONCE__(cond,var) \ - if (({ \ + if (( { \ static int var = 0; \ int bool_result = (cond); \ if (PREDICT_UNLIKELY(bool_result) && !var) { \ var = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ } \ - PREDICT_UNLIKELY(bool_result); })) + PREDICT_UNLIKELY(bool_result); } )) #else #define IF_BUG_ONCE__(cond,var) \ static int var = 0; \ |