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

[tor/maint-0.4.6] Suppress a clang 12 warning about "suspicious concatenation".
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit 2bc02b21992825e1e348f83c31ebbe0ddcee0b9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 1 13:03:19 2021 -0400 Suppress a clang 12 warning about "suspicious concatenation". My clang doesn't like it when we write code like this: char *list[] = { "abc", "def", "ghi" "jkl" } It wonders whether we meant to put a comma between "ghi" and "jkl" or not, and gives a warning. To suppress this warning (since in this case, we did mean to omit the comma), we just wrap the two strings in parentheses. Closes #40426; bugfix on 0.4.0.4-rc. --- src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index d62dd3fb9e..467b740d71 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2135,8 +2135,8 @@ test_dir_measured_bw_kb(void *arg) /* Test that a line with vote=0 will fail too, so that it is ignored. */ "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0\n", /* Test that a line with vote=0 will fail even if unmeasured=0. */ - "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " - "unmeasured=0\n", + ("node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " + "unmeasured=0\n"), "end" };

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit a522aabd3b436b56d5575ea808451e1577185bcd Merge: 167f3bc4ec 4865eabd18 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 6 13:52:15 2021 +0300 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit 4865eabd18d0b5a70bf971814213327c0ca8b106 Merge: 98b9df61f6 2bc02b2199 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 6 13:51:58 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5 src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.5] Suppress a clang 12 warning about "suspicious concatenation".
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit 2bc02b21992825e1e348f83c31ebbe0ddcee0b9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 1 13:03:19 2021 -0400 Suppress a clang 12 warning about "suspicious concatenation". My clang doesn't like it when we write code like this: char *list[] = { "abc", "def", "ghi" "jkl" } It wonders whether we meant to put a comma between "ghi" and "jkl" or not, and gives a warning. To suppress this warning (since in this case, we did mean to omit the comma), we just wrap the two strings in parentheses. Closes #40426; bugfix on 0.4.0.4-rc. --- src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index d62dd3fb9e..467b740d71 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2135,8 +2135,8 @@ test_dir_measured_bw_kb(void *arg) /* Test that a line with vote=0 will fail too, so that it is ignored. */ "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0\n", /* Test that a line with vote=0 will fail even if unmeasured=0. */ - "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " - "unmeasured=0\n", + ("node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " + "unmeasured=0\n"), "end" };

1 0

[tor/release-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit 4865eabd18d0b5a70bf971814213327c0ca8b106 Merge: 98b9df61f6 2bc02b2199 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 6 13:51:58 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5 src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit a522aabd3b436b56d5575ea808451e1577185bcd Merge: 167f3bc4ec 4865eabd18 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 6 13:52:15 2021 +0300 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Suppress a clang 12 warning about "suspicious concatenation".
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit 2bc02b21992825e1e348f83c31ebbe0ddcee0b9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 1 13:03:19 2021 -0400 Suppress a clang 12 warning about "suspicious concatenation". My clang doesn't like it when we write code like this: char *list[] = { "abc", "def", "ghi" "jkl" } It wonders whether we meant to put a comma between "ghi" and "jkl" or not, and gives a warning. To suppress this warning (since in this case, we did mean to omit the comma), we just wrap the two strings in parentheses. Closes #40426; bugfix on 0.4.0.4-rc. --- src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index d62dd3fb9e..467b740d71 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2135,8 +2135,8 @@ test_dir_measured_bw_kb(void *arg) /* Test that a line with vote=0 will fail too, so that it is ignored. */ "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0\n", /* Test that a line with vote=0 will fail even if unmeasured=0. */ - "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " - "unmeasured=0\n", + ("node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " + "unmeasured=0\n"), "end" };

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit 67e412c25e68dbaf32317510bb6665e4b68d7c4d Merge: 5b1cd6e538 4865eabd18 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 6 13:52:15 2021 +0300 Merge branch 'maint-0.4.5' into release-0.4.5 src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit d89bffb8c75c6e58d698c17fec2d0462efd77e61 Merge: 7f34440063 a522aabd3b Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 6 13:52:16 2021 +0300 Merge branch 'maint-0.4.6' into release-0.4.6 src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/main] Merge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5
by asn＠torproject.org 06 Jul '21

06 Jul '21

commit 4865eabd18d0b5a70bf971814213327c0ca8b106 Merge: 98b9df61f6 2bc02b2199 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 6 13:51:58 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5 src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0