July 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 1fb2e467d547ec27803892fa852464437d3e9192 Merge: 03539b7 8bc70a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 0f97f963e3c267852a3f28538c5ddb196ce0bb42 Merge: e88aa98 8bc70a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/maint-0.3.1] Merge branch 'bug22801_028' into maint-0.2.9
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit bb97f680e74170673246b3de32e847ade46840f2 Merge: ec9c6d7 5361032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:18:59 2017 -0400 Merge branch 'bug22801_028' into maint-0.2.9 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --cc src/common/util.c index a7bce2e,b2b9761..b7468df --- a/src/common/util.c +++ b/src/common/util.c @@@ -5693,8 -5535,17 +5693,17 @@@ tor_weak_random_range(tor_weak_rng_t *r int64_t clamp_double_to_int64(double number) { - int exp; + int exponent; + #if defined(__MINGW32__) || defined(__MINGW64__) + /* + Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare + isnan, isfinite, and signbit. But as implemented in at least some + versions of gcc, __builtin_choose_expr() can generate type warnings + even from branches that are not taken. So, suppress those warnings. + */ + DISABLE_GCC_WARNING(float-conversion) + #endif /* NaN is a special case that can't be used with the logic below. */ if (isnan(number)) { return 0; @@@ -5720,26 -5571,8 +5729,29 @@@ /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; + #if defined(__MINGW32__) || defined(__MINGW64__) + ENABLE_GCC_WARNING(float-conversion) + #endif } +/** Return a uint64_t value from a in network byte order. */ +uint64_t +tor_htonll(uint64_t a) +{ +#ifdef WORDS_BIGENDIAN + /* Big endian. */ + return a; +#else /* WORDS_BIGENDIAN */ + /* Little endian. The worst... */ + return htonl((uint32_t)(a>>32)) | + (((uint64_t)htonl((uint32_t)a))<<32); +#endif /* WORDS_BIGENDIAN */ +} + +/** Return a uint64_t value from a in host byte order. */ +uint64_t +tor_ntohll(uint64_t a) +{ + return tor_htonll(a); +} +

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 8bc70a2ad2c0363986e4b002ceaf259908d67e70 Merge: d9427c0 bb97f68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 0f97f963e3c267852a3f28538c5ddb196ce0bb42 Merge: e88aa98 8bc70a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'bug22801_028' into maint-0.2.9
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit bb97f680e74170673246b3de32e847ade46840f2 Merge: ec9c6d7 5361032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:18:59 2017 -0400 Merge branch 'bug22801_028' into maint-0.2.9 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --cc src/common/util.c index a7bce2e,b2b9761..b7468df --- a/src/common/util.c +++ b/src/common/util.c @@@ -5693,8 -5535,17 +5693,17 @@@ tor_weak_random_range(tor_weak_rng_t *r int64_t clamp_double_to_int64(double number) { - int exp; + int exponent; + #if defined(__MINGW32__) || defined(__MINGW64__) + /* + Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare + isnan, isfinite, and signbit. But as implemented in at least some + versions of gcc, __builtin_choose_expr() can generate type warnings + even from branches that are not taken. So, suppress those warnings. + */ + DISABLE_GCC_WARNING(float-conversion) + #endif /* NaN is a special case that can't be used with the logic below. */ if (isnan(number)) { return 0; @@@ -5720,26 -5571,8 +5729,29 @@@ /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; + #if defined(__MINGW32__) || defined(__MINGW64__) + ENABLE_GCC_WARNING(float-conversion) + #endif } +/** Return a uint64_t value from a in network byte order. */ +uint64_t +tor_htonll(uint64_t a) +{ +#ifdef WORDS_BIGENDIAN + /* Big endian. */ + return a; +#else /* WORDS_BIGENDIAN */ + /* Little endian. The worst... */ + return htonl((uint32_t)(a>>32)) | + (((uint64_t)htonl((uint32_t)a))<<32); +#endif /* WORDS_BIGENDIAN */ +} + +/** Return a uint64_t value from a in host byte order. */ +uint64_t +tor_ntohll(uint64_t a) +{ + return tor_htonll(a); +} +

1 0

[tor/release-0.3.0] Merge branch 'bug22801_028' into maint-0.2.9
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit bb97f680e74170673246b3de32e847ade46840f2 Merge: ec9c6d7 5361032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:18:59 2017 -0400 Merge branch 'bug22801_028' into maint-0.2.9 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --cc src/common/util.c index a7bce2e,b2b9761..b7468df --- a/src/common/util.c +++ b/src/common/util.c @@@ -5693,8 -5535,17 +5693,17 @@@ tor_weak_random_range(tor_weak_rng_t *r int64_t clamp_double_to_int64(double number) { - int exp; + int exponent; + #if defined(__MINGW32__) || defined(__MINGW64__) + /* + Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare + isnan, isfinite, and signbit. But as implemented in at least some + versions of gcc, __builtin_choose_expr() can generate type warnings + even from branches that are not taken. So, suppress those warnings. + */ + DISABLE_GCC_WARNING(float-conversion) + #endif /* NaN is a special case that can't be used with the logic below. */ if (isnan(number)) { return 0; @@@ -5720,26 -5571,8 +5729,29 @@@ /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; + #if defined(__MINGW32__) || defined(__MINGW64__) + ENABLE_GCC_WARNING(float-conversion) + #endif } +/** Return a uint64_t value from a in network byte order. */ +uint64_t +tor_htonll(uint64_t a) +{ +#ifdef WORDS_BIGENDIAN + /* Big endian. */ + return a; +#else /* WORDS_BIGENDIAN */ + /* Little endian. The worst... */ + return htonl((uint32_t)(a>>32)) | + (((uint64_t)htonl((uint32_t)a))<<32); +#endif /* WORDS_BIGENDIAN */ +} + +/** Return a uint64_t value from a in host byte order. */ +uint64_t +tor_ntohll(uint64_t a) +{ + return tor_htonll(a); +} +

1 0

[tor/release-0.3.1] Fix -Wfloat-conversion C warnings on mingw in clamp_double_to_int64.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 536103221911692d546d7325435812c29bb32ff1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 3 10:59:31 2017 -0400 Fix -Wfloat-conversion C warnings on mingw in clamp_double_to_int64. We just have to suppress these warnings: Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. Fixes bug 22801; bugfix on 0.2.8.1-alpha. --- changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug22801 b/changes/bug22801 new file mode 100644 index 0000000..7edc79b --- /dev/null +++ b/changes/bug22801 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - When building with certain versions the mingw C header files, avoid + float-conversion warnings when calling the C functions isfinite(), + isnan(), and signbit(). Fixes bug 22801; bugfix on 0.2.8.1-alpha. + diff --git a/src/common/util.c b/src/common/util.c index f3effe0..b2b9761 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5537,6 +5537,15 @@ clamp_double_to_int64(double number) { int exp; +#if defined(__MINGW32__) || defined(__MINGW64__) +/* + Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare + isnan, isfinite, and signbit. But as implemented in at least some + versions of gcc, __builtin_choose_expr() can generate type warnings + even from branches that are not taken. So, suppress those warnings. +*/ +DISABLE_GCC_WARNING(float-conversion) +#endif /* NaN is a special case that can't be used with the logic below. */ if (isnan(number)) { return 0; @@ -5562,5 +5571,8 @@ clamp_double_to_int64(double number) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; +#if defined(__MINGW32__) || defined(__MINGW64__) +ENABLE_GCC_WARNING(float-conversion) +#endif }

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 8bc70a2ad2c0363986e4b002ceaf259908d67e70 Merge: d9427c0 bb97f68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit fe2a9cb3894fc59e812fe0c9cb18a7fe81a6cdb8 Merge: 402f4bc 0f97f96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0