diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-07 15:29:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-07 15:29:56 -0400 |
| commit | e086db795238da9187aa9824fda3d708cff10bf6 (patch) | |
| tree | 13dc823d24ea89a6fbf47c92994b8fa997887a53 /src/common/tortls.c | |
| parent | a2a6a19db165dd08b2dd6e7e493f21d2336a85d0 (diff) | |
| parent | 79e85313aa611b599f19fea61c38ff3928e1fd59 (diff) | |
| download | tor-e086db795238da9187aa9824fda3d708cff10bf6.tar.gz tor-e086db795238da9187aa9824fda3d708cff10bf6.zip | |
Merge branch 'writing_tests'
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index bd7e95c033..63b40258c2 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2092,8 +2092,8 @@ tor_tls_free(tor_tls_t *tls) * number of characters read. On failure, returns TOR_TLS_ERROR, * TOR_TLS_CLOSE, TOR_TLS_WANTREAD, or TOR_TLS_WANTWRITE. */ -int -tor_tls_read(tor_tls_t *tls, char *cp, size_t len) +MOCK_IMPL(int, +tor_tls_read,(tor_tls_t *tls, char *cp, size_t len)) { int r, err; tor_assert(tls); |