2 files changed, 16 insertions, 22 deletions

diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/cadet/gnunet-service-cadet_hello.c
index 7a33b0e05..1e3322733 100644
--- a/src/cadet/gnunet-service-cadet_hello.c
+++ b/src/cadet/gnunet-service-cadet_hello.c
@@ -68,7 +68,6 @@ got_hello (void *cls,
            const char *err_msg)
 {
   struct CadetPeer *peer;
-  struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (hello);
 
   if ((NULL == id) ||
       (NULL == hello))
@@ -81,19 +80,17 @@ got_hello (void *cls,
     GCD_hello_update ();
     return;
   }
-  
+
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Hello for %s (%d bytes), expires on %s\n",
        GNUNET_i2s (id),
        sizeof (hello),
        GNUNET_STRINGS_absolute_time_to_string (
-                                               GNUNET_HELLO_builder_get_expiration_time (builder,
-                                                                                         hello)));
+         GNUNET_HELLO_builder_get_expiration_time (hello)));
   peer = GCP_get (id,
                   GNUNET_YES);
   GCP_set_hello (peer,
                  hello);
-  GNUNET_HELLO_builder_free (builder);
 }
 
 
@@ -108,8 +105,8 @@ GCH_init (const struct GNUNET_CONFIGURATION_Handle *c)
   GNUNET_assert (NULL == peerstore_notify);
   peerstore = GNUNET_PEERSTORE_connect (c);
   peerstore_notify =
-      GNUNET_PEERSTORE_hello_changed_notify (peerstore, GNUNET_NO, &got_hello,
-                                             NULL);
+    GNUNET_PEERSTORE_hello_changed_notify (peerstore, GNUNET_NO, &got_hello,
+                                           NULL);
 }
 
 
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index c46e968dc..5c810e926 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -491,15 +491,13 @@ consider_peer_destroy (struct CadetPeer *cp)
     return; /* still relevant! */
   if (NULL != cp->hello)
   {
-    struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (cp->hello);
-
     /* relevant only until HELLO expires */
-    exp = GNUNET_TIME_absolute_get_remaining (GNUNET_HELLO_builder_get_expiration_time (builder,
-                                                                                        cp->hello));
+    exp = GNUNET_TIME_absolute_get_remaining (
+      GNUNET_HELLO_builder_get_expiration_time (cp
+                                                ->hello));
     cp->destroy_task = GNUNET_SCHEDULER_add_delayed (exp,
                                                      &destroy_peer,
                                                      cp);
-    GNUNET_HELLO_builder_free (builder);
     return;
   }
   cp->destroy_task = GNUNET_SCHEDULER_add_delayed (IDLE_PEER_TIMEOUT,
@@ -1323,14 +1321,15 @@ GCP_set_hello (struct CadetPeer *cp,
   if (NULL != cp->hello)
   {
     struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
-    struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (hello);
-    struct GNUNET_HELLO_Builder *cp_builder = GNUNET_HELLO_builder_from_msg (cp->hello);
-    struct GNUNET_TIME_Absolute new_hello_exp = GNUNET_HELLO_builder_get_expiration_time (builder,
-                                                                                          hello);
-    struct GNUNET_TIME_Absolute old_hello_exp = GNUNET_HELLO_builder_get_expiration_time (cp_builder,
-                                                                                          cp->hello);
-
-    if (GNUNET_TIME_absolute_cmp (new_hello_exp, > , now) && GNUNET_TIME_absolute_cmp (new_hello_exp, > , old_hello_exp))
+    
+    struct GNUNET_TIME_Absolute new_hello_exp =
+      GNUNET_HELLO_builder_get_expiration_time (hello);
+    struct GNUNET_TIME_Absolute old_hello_exp =
+      GNUNET_HELLO_builder_get_expiration_time (cp
+                                                ->hello);
+
+    if (GNUNET_TIME_absolute_cmp (new_hello_exp, >, now) &&
+        GNUNET_TIME_absolute_cmp (new_hello_exp, >, old_hello_exp))
     {
       GNUNET_free (cp->hello);
       cp->hello = GNUNET_malloc (size);
@@ -1340,8 +1339,6 @@ GCP_set_hello (struct CadetPeer *cp,
     {
       return;
     }
-    GNUNET_HELLO_builder_free (builder);
-    GNUNET_HELLO_builder_free (cp_builder);
   }
   else
   {