From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 19 May 2025 11:52:22 +0000 (-0400)
Subject: Merge branch 'gcc-15-warnings-048' into gcc-15-warnings-049
X-Git-Tag: tor-0.4.9.3-alpha~54^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34c2daf3ca23a7d8cd31a7757ea5a17aa98aad5b;p=thirdparty%2Ftor.git

Merge branch 'gcc-15-warnings-048' into gcc-15-warnings-049
---

34c2daf3ca23a7d8cd31a7757ea5a17aa98aad5b
diff --cc src/test/test_cell_formats.c
index 3456650ca7,6ed69d1f8b..337f09d11a
--- a/src/test/test_cell_formats.c
+++ b/src/test/test_cell_formats.c
@@@ -33,12 -32,12 +33,12 @@@ static voi
  test_cfmt_relay_header(void *arg)
  {
    relay_header_t rh;
-   const uint8_t hdr_1[RELAY_HEADER_SIZE_V0] =
 -  NONSTRING const uint8_t hdr_1[RELAY_HEADER_SIZE] =
++  NONSTRING const uint8_t hdr_1[RELAY_HEADER_SIZE_V0] =
      "\x03" "\x00\x00" "\x21\x22" "ABCD" "\x01\x03";
 -  uint8_t hdr_out[RELAY_HEADER_SIZE];
 +  uint8_t hdr_out[RELAY_HEADER_SIZE_V0];
    (void)arg;
  
 -  tt_int_op(sizeof(hdr_1), OP_EQ, RELAY_HEADER_SIZE);
 +  tt_int_op(sizeof(hdr_1), OP_EQ, RELAY_HEADER_SIZE_V0);
    relay_header_unpack(&rh, hdr_1);
    tt_int_op(rh.command, OP_EQ, 3);
    tt_int_op(rh.recognized, OP_EQ, 0);