diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-02 08:37:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-02 08:37:57 -0400 |
| commit | fd437f2a0259e60379fbfe9b8bf6ee1e8fb1eae6 (patch) | |
| tree | 089b942843ef8992a5bcffb572c257933305325c /src/or/consdiffmgr.c | |
| parent | 584ab1f29b05b6cd0c63c16668b1c260a957656b (diff) | |
| download | tor-fd437f2a0259e60379fbfe9b8bf6ee1e8fb1eae6.tar.gz tor-fd437f2a0259e60379fbfe9b8bf6ee1e8fb1eae6.zip | |
Remove special-casing for NO_METHOD in consdiffmgr.c
Diffstat (limited to 'src/or/consdiffmgr.c')
| -rw-r--r-- | src/or/consdiffmgr.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index b134578f51..29807e7c6d 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1100,14 +1100,8 @@ uncompress_or_copy(char **out, size_t *outlen, if (lv_compression) method = compression_method_get_by_name(lv_compression); - if (method == NO_METHOD) { - *out = tor_memdup_nulterm(body, bodylen); - *outlen = bodylen; - return 0; - } else { - return tor_uncompress(out, outlen, (const char *)body, bodylen, - method, 1, LOG_WARN); - } + return tor_uncompress(out, outlen, (const char *)body, bodylen, + method, 1, LOG_WARN); } /** |