From: Bart Polot <bart@net.in.tum.de>
Date: Fri, 4 Nov 2016 09:47:27 +0000 (+0000)
Subject: -remove dead code
X-Git-Tag: initial-import-from-subversion-38251~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e485ccc97cd07dac659cf37c9208cbf80fb18e0;p=oweals%2Fgnunet.git

-remove dead code
---

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 662fd2644..dc947998a 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -720,15 +720,9 @@ conn_message_sent (void *cls,
     }
     GNUNET_free (q);
   }
-  else if (type == GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED)
-  {
-    /* SHOULD NO LONGER HAPPEN FIXME: REMOVE CASE */
-    // If NULL == q and ENCRYPTED == type, message must have been ch_mngmnt
-    forced = GNUNET_YES;
-    GNUNET_assert (0); // FIXME
-  }
   else /* CONN_CREATE or CONN_ACK */
   {
+    GNUNET_assert (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED != type);
     forced = GNUNET_YES;
   }
 
@@ -758,7 +752,6 @@ conn_message_sent (void *cls,
     case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED:
       if (GNUNET_YES == sent)
       {
-        GNUNET_assert (NULL != q);
         fc->last_pid_sent = pid;
         if (GC_is_pid_bigger (fc->last_pid_sent + 1, fc->last_ack_recv))
           GCC_start_poll (c, fwd);