diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
| commit | c0391bae75e9eb71f5fa2ab24fc97792c204225d (patch) | |
| tree | 9701969423b86fdc2ba04080338d817c3b5c9864 /src/or/control.c | |
| parent | 2cb59be9993ecec13ceabc0c4754e52f8c5ea4e5 (diff) | |
| parent | ec6c155f827000e337796f1f1c54299fbc5cf72a (diff) | |
| download | tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.tar.gz tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.zip | |
Merge remote-tracking branch 'public/fancy_test_tricks'
Conflicts:
src/common/include.am
Conflict was from adding testsupport.h near where sandbox.h had
already been added.
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index cc917c46aa..3f8d47c554 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -334,7 +334,7 @@ connection_write_str_to_buf(const char *s, control_connection_t *conn) * the end. Replace all LF characters sequences with CRLF. Return the number * of bytes in *<b>out</b>. */ -/* static */ size_t +STATIC size_t write_escaped_data(const char *data, size_t len, char **out) { size_t sz_out = len+8; @@ -382,7 +382,7 @@ write_escaped_data(const char *data, size_t len, char **out) * that appears at the start of a line, and replacing all CRLF sequences * with LF. Return the number of * bytes in *<b>out</b>. */ -/* static */ size_t +STATIC size_t read_escaped_data(const char *data, size_t len, char **out) { char *outp; |