From: Taylor Yu <catalyst@torproject.org>
Date: Tue, 25 Jun 2019 14:54:50 +0000 (-0500)
Subject: Make control_write_reply() mockable
X-Git-Tag: tor-0.4.2.1-alpha~149^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5e6953be74ab5d09608dcf6af48caae4e57464c;p=thirdparty%2Ftor.git

Make control_write_reply() mockable

Part of ticket 30889.
---

diff --git a/src/feature/control/control_proto.c b/src/feature/control/control_proto.c
index 1dd62da2be..d2541e7308 100644
--- a/src/feature/control/control_proto.c
+++ b/src/feature/control/control_proto.c
@@ -176,8 +176,9 @@ send_control_done(control_connection_t *conn)
  * @param c separator character, usually ' ', '-', or '+'
  * @param s string
  */
-void
-control_write_reply(control_connection_t *conn, int code, int c, const char *s)
+MOCK_IMPL(void,
+control_write_reply, (control_connection_t *conn, int code, int c,
+                      const char *s))
 {
   connection_printf_to_buf(conn, "%03d%c%s\r\n", code, c, s);
 }
diff --git a/src/feature/control/control_proto.h b/src/feature/control/control_proto.h
index 101b808d88..3182f3d415 100644
--- a/src/feature/control/control_proto.h
+++ b/src/feature/control/control_proto.h
@@ -21,8 +21,8 @@ size_t write_escaped_data(const char *data, size_t len, char **out);
 size_t read_escaped_data(const char *data, size_t len, char **out);
 void send_control_done(control_connection_t *conn);
 
-void control_write_reply(control_connection_t *conn, int code, int c,
-                         const char *s);
+MOCK_DECL(void, control_write_reply, (control_connection_t *conn, int code,
+                                      int c, const char *s));
 void control_vprintf_reply(control_connection_t *conn, int code, int c,
                            const char *fmt, va_list ap)
   CHECK_PRINTF(4, 0);