Replace remaining uses of deprecated test_mem* functions

diff --git a/src/test/test.h b/src/test/test.h
index 799f208f0d3c008a352703c0349431ea31d113b2..5d0c062ae6823722410bbdbf43d06721108c67ef 100644 (file)
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -29,12 +29,6 @@
 #define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2))
 #define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2))
 
-#define test_mem_op(expr1, op, expr2, len)                              \
-  tt_mem_op((expr1), op, (expr2), (len))
-
-#define test_memeq(expr1, expr2, len) test_mem_op((expr1), ==, (expr2), len)
-#define test_memneq(expr1, expr2, len) test_mem_op((expr1), !=, (expr2), len)
-
 /* As test_mem_op, but decodes 'hex' before comparing.  There must be a
  * local char* variable called mem_op_hex_tmp for this to work. */
 #define test_mem_op_hex(expr1, op, hex)                                 \
@@ -44,7 +38,7 @@
   mem_op_hex_tmp = tor_malloc(length/2);                                \
   tor_assert((length&1)==0);                                            \
   base16_decode(mem_op_hex_tmp, length/2, hex, length);                 \
-  test_mem_op(expr1, op, mem_op_hex_tmp, length/2);                     \
+  tt_mem_op(expr1, op, mem_op_hex_tmp, length/2);                       \
   STMT_END
 
 #define test_memeq_hex(expr1, hex) test_mem_op_hex(expr1, ==, hex)

diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c
index 698bced7e5929b8dc9382e4ff2ff403668f30216..35e7fe5ad917fe44250882454c489a09a2ec774b 100644 (file)
--- a/src/test/test_extorport.c
+++ b/src/test/test_extorport.c
@@ -406,7 +406,7 @@ handshake_start(or_connection_t *conn, int receiving)
     tt_int_op(buf_datalen(TO_CONN(conn)->outbuf), ==, (n));     \
     if ((n)) {                                                  \
       fetch_from_buf(b, (n), TO_CONN(conn)->outbuf);            \
-      test_memeq(b, (s), (n));                                  \
+      tt_mem_op(b, ==, (s), (n));                               \
     }                                                           \
   } while (0)