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

[tor/maint-0.3.0] Only disable -Wfloat-conversion on mingw when it exists.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit dfc06148407a1610d515d45b344558850486bd98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:10:45 2017 -0400 Only disable -Wfloat-conversion on mingw when it exists. The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion didn't exist in every relevant mingw; it was added in GCC 4.9.x some time, if the documentation can be trusted. Bug not in any released version of tor. --- src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index b7468df..9e61eb7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5695,13 +5695,14 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(__MINGW32__) || defined(__MINGW64__) +#if (defined(__MINGW32__) || defined(__MINGW64__)) && GCC_VERSION >= 409 /* 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. */ +#define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) #endif /* NaN is a special case that can't be used with the logic below. */ @@ -5729,7 +5730,7 @@ DISABLE_GCC_WARNING(float-conversion) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; -#if defined(__MINGW32__) || defined(__MINGW64__) +#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING ENABLE_GCC_WARNING(float-conversion) #endif }

1 0

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

05 Jul '17

commit 55777b3ff90311212ac3f38829229fed7b7beffe Merge: 546f5b3 dfc0614 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/master] Only disable -Wfloat-conversion on mingw when it exists.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit dfc06148407a1610d515d45b344558850486bd98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:10:45 2017 -0400 Only disable -Wfloat-conversion on mingw when it exists. The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion didn't exist in every relevant mingw; it was added in GCC 4.9.x some time, if the documentation can be trusted. Bug not in any released version of tor. --- src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index b7468df..9e61eb7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5695,13 +5695,14 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(__MINGW32__) || defined(__MINGW64__) +#if (defined(__MINGW32__) || defined(__MINGW64__)) && GCC_VERSION >= 409 /* 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. */ +#define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) #endif /* NaN is a special case that can't be used with the logic below. */ @@ -5729,7 +5730,7 @@ DISABLE_GCC_WARNING(float-conversion) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; -#if defined(__MINGW32__) || defined(__MINGW64__) +#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING 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 55777b3ff90311212ac3f38829229fed7b7beffe Merge: 546f5b3 dfc0614 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.1] Only disable -Wfloat-conversion on mingw when it exists.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit dfc06148407a1610d515d45b344558850486bd98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:10:45 2017 -0400 Only disable -Wfloat-conversion on mingw when it exists. The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion didn't exist in every relevant mingw; it was added in GCC 4.9.x some time, if the documentation can be trusted. Bug not in any released version of tor. --- src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index b7468df..9e61eb7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5695,13 +5695,14 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(__MINGW32__) || defined(__MINGW64__) +#if (defined(__MINGW32__) || defined(__MINGW64__)) && GCC_VERSION >= 409 /* 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. */ +#define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) #endif /* NaN is a special case that can't be used with the logic below. */ @@ -5729,7 +5730,7 @@ DISABLE_GCC_WARNING(float-conversion) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; -#if defined(__MINGW32__) || defined(__MINGW64__) +#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING ENABLE_GCC_WARNING(float-conversion) #endif }

1 0

[tor/master] Make the strings from #1667 static.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit a85ee62e74905af0c685d378be9dfc8ae1935af5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:59:17 2017 -0400 Make the strings from #1667 static. --- src/or/buffers.c | 2 +- src/or/control.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 2002f4f..d5ecfb8 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1478,7 +1478,7 @@ socks_request_set_socks5_error(socks_request_t *req, req->reply[3] = 0x01; // ATYP field. } -const char SOCKS_PROXY_IS_NOT_AN_HTTP_PROXY_MSG[] = +static const char SOCKS_PROXY_IS_NOT_AN_HTTP_PROXY_MSG[] = "HTTP/1.0 501 Tor is not an HTTP Proxy\r\n" "Content-Type: text/html; charset=iso-8859-1\r\n\r\n" "<html>\n" diff --git a/src/or/control.c b/src/or/control.c index dc431d6..724d4b3 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4918,7 +4918,7 @@ peek_connection_has_http_command(connection_t *conn) return peek_buf_has_http_command(conn->inbuf); } -const char CONTROLPORT_IS_NOT_AN_HTTP_PROXY_MSG[] = +static const char CONTROLPORT_IS_NOT_AN_HTTP_PROXY_MSG[] = "HTTP/1.0 501 Tor ControlPort is not an HTTP proxy" "\r\nContent-Type: text/html; charset=iso-8859-1\r\n\r\n" "<html>\n"

1 0

[tor/master] Fix mixed-sign comparison warning in fix for 22797.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 9383fa3851a47e4db83bccdb923760e059ac7941 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:56:57 2017 -0400 Fix mixed-sign comparison warning in fix for 22797. --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index fb712f2..3bea626 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1733,7 +1733,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) int bad = 1; #ifdef OPEN_MAX uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; - if (errno == EINVAL && try_limit < rlim.rlim_cur) { + if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ rlim.rlim_cur = try_limit;

1 0

[tor/release-0.3.1] Fix mixed-sign comparison warning in fix for 22797.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 9383fa3851a47e4db83bccdb923760e059ac7941 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:56:57 2017 -0400 Fix mixed-sign comparison warning in fix for 22797. --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index fb712f2..3bea626 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1733,7 +1733,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) int bad = 1; #ifdef OPEN_MAX uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; - if (errno == EINVAL && try_limit < rlim.rlim_cur) { + if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ rlim.rlim_cur = try_limit;

1 0

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

05 Jul '17

commit 13024c79328ac29a037aeb8d6d4d3325068bd167 Merge: 15fddaf 9383fa3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:57:09 2017 -0400 Merge branch 'maint-0.3.1' src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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 c8e6b2e4bf2b98ac227ddbfc8796e401bba0b674 Merge: d9663a2 9383fa3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:57:09 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0