[tor-commits] [tor/maint-0.4.6] Suppress a clang 12 warning about "suspicious concatenation".

[asn at torproject.org]

commit 2bc02b21992825e1e348f83c31ebbe0ddcee0b9b
Author: Nick Mathewson <nickm at 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"
   };