nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve some warnings from OSX clang.

Browse Source
This commit is contained in:
Nick Mathewson 2016-06-01 16:35:00 -04:00
parent 26e979b342
commit c3adbf755b
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@ -75,7 +75,7 @@ dnl 1:flags
dnl 2:also try to link (yes: non-empty string) dnl 2:also try to link (yes: non-empty string)
dnl will set yes or no in $tor_can_link_$1 (as modified by AS_VAR_PUSHDEF) dnl will set yes or no in $tor_can_link_$1 (as modified by AS_VAR_PUSHDEF)
AC_DEFUN([TOR_CHECK_CFLAGS], [ AC_DEFUN([TOR_CHECK_CFLAGS], [
TOR_TRY_COMPILE_WITH_CFLAGS($1, $2, CFLAGS="$CFLAGS $1", /bin/true) TOR_TRY_COMPILE_WITH_CFLAGS($1, $2, CFLAGS="$CFLAGS $1", true)
]) ])
dnl 1:flags dnl 1:flags

2
src/or/channeltls.c
View File

@ -445,7 +445,7 @@ channel_tls_free_method(channel_t *chan)
static double static double
channel_tls_get_overhead_estimate_method(channel_t *chan) channel_tls_get_overhead_estimate_method(channel_t *chan)
{ {
double overhead = 1.0f; double overhead = 1.0;
channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);
tor_assert(tlschan); tor_assert(tlschan);

2
src/test/test_channel.c
View File

@ -1584,7 +1584,7 @@ test_channel_queue_size(void *arg)
/* One cell, times an overhead factor of 1.0 */ /* One cell, times an overhead factor of 1.0 */
tt_u64_op(ch->bytes_queued_for_xmit, ==, 512); tt_u64_op(ch->bytes_queued_for_xmit, ==, 512);
/* Try a different overhead factor */ /* Try a different overhead factor */
test_overhead_estimate = 0.5f; test_overhead_estimate = 0.5;
/* This one should be ignored since it's below 1.0 */ /* This one should be ignored since it's below 1.0 */
channel_update_xmit_queue_size(ch); channel_update_xmit_queue_size(ch);
tt_u64_op(ch->bytes_queued_for_xmit, ==, 512); tt_u64_op(ch->bytes_queued_for_xmit, ==, 512);

9
src/test/test_util.c
View File

@ -30,6 +30,9 @@
#include <ctype.h> #include <ctype.h>
#include <float.h> #include <float.h>
#define INFINITY_DBL ((double)INFINITY)
#define NAN_DBL ((double)NAN)
/* XXXX this is a minimal wrapper to make the unit tests compile with the /* XXXX this is a minimal wrapper to make the unit tests compile with the
* changed tor_timegm interface. */ * changed tor_timegm interface. */
static time_t static time_t
@ -4392,7 +4395,7 @@ test_util_clamp_double_to_int64(void *arg)
{ {
(void)arg; (void)arg;
tt_i64_op(INT64_MIN, ==, clamp_double_to_int64(-INFINITY)); tt_i64_op(INT64_MIN, ==, clamp_double_to_int64(-INFINITY_DBL));
tt_i64_op(INT64_MIN, ==, tt_i64_op(INT64_MIN, ==,
clamp_double_to_int64(-1.0 * pow(2.0, 64.0) - 1.0)); clamp_double_to_int64(-1.0 * pow(2.0, 64.0) - 1.0));
tt_i64_op(INT64_MIN, ==, tt_i64_op(INT64_MIN, ==,
@ -4405,7 +4408,7 @@ test_util_clamp_double_to_int64(void *arg)
tt_i64_op(0, ==, clamp_double_to_int64(-0.9)); tt_i64_op(0, ==, clamp_double_to_int64(-0.9));
tt_i64_op(0, ==, clamp_double_to_int64(-0.1)); tt_i64_op(0, ==, clamp_double_to_int64(-0.1));
tt_i64_op(0, ==, clamp_double_to_int64(0.0)); tt_i64_op(0, ==, clamp_double_to_int64(0.0));
tt_i64_op(0, ==, clamp_double_to_int64(NAN)); tt_i64_op(0, ==, clamp_double_to_int64(NAN_DBL));
tt_i64_op(0, ==, clamp_double_to_int64(0.1)); tt_i64_op(0, ==, clamp_double_to_int64(0.1));
tt_i64_op(0, ==, clamp_double_to_int64(0.9)); tt_i64_op(0, ==, clamp_double_to_int64(0.9));
tt_i64_op(1, ==, clamp_double_to_int64(1.0)); tt_i64_op(1, ==, clamp_double_to_int64(1.0));
@ -4417,7 +4420,7 @@ test_util_clamp_double_to_int64(void *arg)
clamp_double_to_int64(pow(2.0, 63.0))); clamp_double_to_int64(pow(2.0, 63.0)));
tt_i64_op(INT64_MAX, ==, tt_i64_op(INT64_MAX, ==,
clamp_double_to_int64(pow(2.0, 64.0))); clamp_double_to_int64(pow(2.0, 64.0)));
tt_i64_op(INT64_MAX, ==, clamp_double_to_int64(INFINITY)); tt_i64_op(INT64_MAX, ==, clamp_double_to_int64(INFINITY_DBL));
done: done:
; ;