From: Andrea Shepard <andrea@torproject.org>
Date: Tue, 9 Oct 2012 03:08:18 +0000 (-0700)
Subject: Simplify channel_next_with_digest() in channel.c
X-Git-Tag: tor-0.2.4.4-alpha~37^2~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=123a08e4a33f6750c3857c5c7ed3515bb196db53;p=thirdparty%2Ftor.git

Simplify channel_next_with_digest() in channel.c
---

diff --git a/src/or/channel.c b/src/or/channel.c
index f987caed52..2ca9a13238 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -622,15 +622,10 @@ channel_find_by_remote_digest(const char *identity_digest)
 channel_t *
 channel_next_with_digest(channel_t *chan)
 {
-  channel_t *rv = NULL;
-
   tor_assert(chan);
   tor_assert(!(chan->is_listener));
 
-  if (chan->u.cell_chan.next_with_same_id)
-    rv = chan->u.cell_chan.next_with_same_id;
-
-  return rv;
+  return chan->u.cell_chan.next_with_same_id;
 }
 
 /**