3 files changed, 4 insertions, 11 deletions

diff --git a/src/service/hostlist/gnunet-daemon-hostlist_client.c b/src/service/hostlist/gnunet-daemon-hostlist_client.c
index 2a03caaac..826f6b444 100644
--- a/src/service/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/service/hostlist/gnunet-daemon-hostlist_client.c
@@ -1041,9 +1041,9 @@ download_hostlist ()
   }
   CURL_EASY_SETOPT (curl, CURLOPT_FOLLOWLOCATION, 1);
   CURL_EASY_SETOPT (curl,
-                    CURLOPT_REDIR_PROTOCOLS,
+                    CURLOPT_REDIR_PROTOCOLS_STR,
                     CURLPROTO_HTTP | CURLPROTO_HTTPS);
-  CURL_EASY_SETOPT (curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+  CURL_EASY_SETOPT (curl, CURLOPT_PROTOCOLS_STR, CURLPROTO_HTTP | CURLPROTO_HTTPS);
   CURL_EASY_SETOPT (curl, CURLOPT_MAXREDIRS, 4);
   /* no need to abort if the above failed */
   CURL_EASY_SETOPT (curl, CURLOPT_URL, current_url);
diff --git a/src/service/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c
index f37abaae0..d61755890 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -3135,8 +3135,6 @@ free_pending_message (struct PendingMessage *pm)
   free_fragment_tree (pm);
   if (NULL != pm->qe)
   {
-    struct QueueEntry *qe = pm->qe;
-
     GNUNET_assert (pm == pm->qe->pm);
     pm->qe->pm = NULL;
   }
@@ -3291,9 +3289,6 @@ free_virtual_link (struct VirtualLink *vl)
 static void
 free_validation_state (struct ValidationState *vs)
 {
-  struct GNUNET_HashCode hkey;
-  struct GNUNET_HashCode hc;
-
   if (NULL != vs->revalidation_task)
   {
     GNUNET_SCHEDULER_cancel (vs->revalidation_task);
@@ -10927,8 +10922,6 @@ static void
 validation_transmit_on_queue (struct Queue *q, struct ValidationState *vs)
 {
   struct TransportValidationChallengeMessage tvc;
-  struct GNUNET_HashCode hkey;
-  struct GNUNET_HashCode hc;
   struct GNUNET_TIME_Absolute monotonic_time;
 
   if (NULL != vs->revalidation_task)
diff --git a/src/service/transport/test_communicator_basic.c b/src/service/transport/test_communicator_basic.c
index 52a4cf2c4..aa11ca5e0 100644
--- a/src/service/transport/test_communicator_basic.c
+++ b/src/service/transport/test_communicator_basic.c
@@ -394,7 +394,7 @@ process_statistics (void *cls,
     ret = 2;
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Not enough BOX messages! (want: %u, have %llu)\n",
-                9000, value);
+                9000, (unsigned long long) value);
     GNUNET_SCHEDULER_shutdown ();
   }
   if ((0 == strcmp ("rekey", test_name)) &&
@@ -406,7 +406,7 @@ process_statistics (void *cls,
     ret = 2;
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Not enough BOX messages! (want: %u, have %llu)\n",
-                6000, value);
+                6000, (unsigned long long) value);
     GNUNET_SCHEDULER_shutdown ();
   }
   return GNUNET_OK;