]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'gcc-15-warnings-048' into gcc-15-warnings-049
authorNick Mathewson <nickm@torproject.org>
Mon, 19 May 2025 11:52:22 +0000 (07:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 May 2025 11:52:22 +0000 (07:52 -0400)
1  2 
configure.ac
src/feature/nodelist/networkstatus.c
src/test/test.c
src/test/test_cell_formats.c
src/test/test_dir.c

diff --cc configure.ac
Simple merge
Simple merge
diff --cc src/test/test.c
Simple merge
index 3456650ca7e5f74e0f51c9453b3af0d7c90d4635,6ed69d1f8b649160370fc28e7add5964e0362ef5..337f09d11ae5f1d45e2f17deaa45e8d337bf8fed
@@@ -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);
Simple merge