[tor-commits] [tor/master] Remove special-casing for NO_METHOD in consdiffmgr.c

[nickm at torproject.org]

commit fd437f2a0259e60379fbfe9b8bf6ee1e8fb1eae6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 2 08:37:57 2017 -0400

    Remove special-casing for NO_METHOD in consdiffmgr.c
---
 src/or/consdiffmgr.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c
index b134578..29807e7 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);
 }
 
 /**