-remove trailing whitespace

9 files changed, 119 insertions, 119 deletions

diff --git a/src/arm/arm.h b/src/arm/arm.h
index aad16fd71..7010a0842 100644
--- a/src/arm/arm.h
+++ b/src/arm/arm.h
@@ -42,10 +42,10 @@ struct GNUNET_ARM_StatusMessage
 {
 
   /**
-   * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_STATUS. 
+   * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_STATUS.
    */
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * Status from the 'enum GNUNET_ARM_ServiceStatus'
    */
@@ -58,12 +58,12 @@ struct GNUNET_ARM_Message
 {
   /**
    * Reply to client, type is GNUNET_MESSAGE_TYPE_ARM_RESULT or
-   * GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT. 
+   * GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT.
    * OR
    * Request from client, type is GNUNET_MESSAGE_TYPE_ARM_REQUEST
    */
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * ID of a request that is being replied to.
    * OR
@@ -85,7 +85,7 @@ struct GNUNET_ARM_ResultMessage
    * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_RESULT, with an ID.
    */
   struct GNUNET_ARM_Message arm_msg;
-  
+
   /**
    * Result from the 'enum GNUNET_ARM_Result'
    */
@@ -93,8 +93,8 @@ struct GNUNET_ARM_ResultMessage
 };
 
 /**
- * Reply from ARM to client for the 
- * GNUNET_MESSAGE_TYPE_ARM_LIST request followed by count 
+ * Reply from ARM to client for the
+ * GNUNET_MESSAGE_TYPE_ARM_LIST request followed by count
  * '\0' terminated strings. header->size contains the
  * total size (including all strings).
  */
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index f844551e4..6dfe65702 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -243,7 +243,7 @@ reconnect_arm_later (struct GNUNET_ARM_Handle *h)
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->reconnect_task);
   h->reconnect_task =
       GNUNET_SCHEDULER_add_delayed (h->retry_backoff, &reconnect_arm_task, h);
-  /* Don't clear pending messages on disconnection, deliver them later 
+  /* Don't clear pending messages on disconnection, deliver them later
   clear_pending_messages (h, GNUNET_ARM_REQUEST_DISCONNECTED);
   GNUNET_assert (NULL == h->control_pending_head);
   */
@@ -285,7 +285,7 @@ arm_termination_handler (void *cls, const struct GNUNET_MessageHeader *msg)
 
   if (NULL != msg)
   {
-    GNUNET_break (0);   
+    GNUNET_break (0);
     GNUNET_CLIENT_receive (h->client, &arm_termination_handler, h,
                            GNUNET_TIME_UNIT_FOREVER_REL);
     return;
@@ -296,10 +296,10 @@ arm_termination_handler (void *cls, const struct GNUNET_MessageHeader *msg)
   GNUNET_CLIENT_disconnect (h->client);
   h->client = NULL;
   if (NULL != cm->result_cont)
-    cm->result_cont (cm->cont_cls, 
+    cm->result_cont (cm->cont_cls,
                      GNUNET_ARM_REQUEST_SENT_OK,
-                     (const char *) &cm->msg[1], 
-                     GNUNET_ARM_RESULT_STOPPED); 
+                     (const char *) &cm->msg[1],
+                     GNUNET_ARM_RESULT_STOPPED);
   GNUNET_free (cm->msg);
   GNUNET_free (cm);
 }
@@ -354,7 +354,7 @@ client_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Message with unknown id %llu\n", id);
     return;
-  }  
+  }
   fail = GNUNET_NO;
   switch (ntohs (msg->type))
   {
@@ -377,7 +377,7 @@ client_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     rcount = ntohs (lres->count);
     {
       unsigned int i;
-      
+
       list = GNUNET_malloc (sizeof (const char *) * rcount);
       pos = (const char *)&lres[1];
       for (i = 0; i < rcount; i++)
@@ -429,9 +429,9 @@ client_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     if (NULL != h->thm)
     {
       GNUNET_break (0);
-      cm->result_cont (h->thm->cont_cls, 
+      cm->result_cont (h->thm->cont_cls,
                        GNUNET_ARM_REQUEST_SENT_OK,
-                       (const char *) &h->thm->msg[1], 
+                       (const char *) &h->thm->msg[1],
                        GNUNET_ARM_RESULT_IS_NOT_KNOWN);
       GNUNET_free (h->thm->msg);
       GNUNET_free (h->thm);
@@ -440,12 +440,12 @@ client_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     GNUNET_CLIENT_receive (h->client, &arm_termination_handler, h,
                            GNUNET_TIME_UNIT_FOREVER_REL);
     return;
-  }       
+  }
   GNUNET_CLIENT_receive (h->client, &client_notify_handler, h,
                          GNUNET_TIME_UNIT_FOREVER_REL);
   switch (ntohs (msg->type))
   {
-  case GNUNET_MESSAGE_TYPE_ARM_RESULT:  
+  case GNUNET_MESSAGE_TYPE_ARM_RESULT:
     res = (const struct GNUNET_ARM_ResultMessage *) msg;
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Received response from ARM for service `%s': %u\n",
@@ -461,7 +461,7 @@ client_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
                        list);
     GNUNET_free (list);
     break;
-  }  
+  }
   GNUNET_free (cm->msg);
   GNUNET_free (cm);
 }
@@ -473,7 +473,7 @@ client_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
  * @param cls closure with the 'struct GNUNET_ARM_Handle'
  * @param size number of bytes available in buf
  * @param buf where the callee should write the message
- * @return number of bytes written to buf 
+ * @return number of bytes written to buf
  */
 static size_t
 transmit_arm_message (void *cls, size_t size, void *buf)
@@ -490,7 +490,7 @@ transmit_arm_message (void *cls, size_t size, void *buf)
       "transmit_arm_message is running with %p buffer of size %lu. ARM is known to be %s\n",
       buf, size, h->currently_down ? "unconnected" : "connected");
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->reconnect_task);
-  h->cth = NULL;  
+  h->cth = NULL;
   if ((GNUNET_YES == h->currently_down) && (NULL != buf))
   {
     h->currently_down = GNUNET_NO;
@@ -658,14 +658,14 @@ void
 GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *h)
 {
   struct ARMControlMessage *cm;
-  
+
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n");
   if (NULL != h->cth)
   {
     GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth);
     h->cth = NULL;
   }
-  while ((NULL != (cm = h->control_pending_head)) 
+  while ((NULL != (cm = h->control_pending_head))
          || (NULL != (cm = h->control_sent_head)) )
   {
     if (NULL != h->control_pending_head)
@@ -764,13 +764,13 @@ arm_service_report (void *cls,
   if ((GNUNET_YES == test_is_active) &&
       (GNUNET_YES == result))
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, 
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Looks like `%s' is already running.\n",
          "gnunet-service-arm");
     /* arm is running! */
     if (cm->result_cont)
-      cm->result_cont (cm->cont_cls, 
-                       GNUNET_ARM_REQUEST_SENT_OK, "arm", 
+      cm->result_cont (cm->cont_cls,
+                       GNUNET_ARM_REQUEST_SENT_OK, "arm",
                        GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
   }
   if (GNUNET_NO == test_is_active)
@@ -802,8 +802,8 @@ arm_service_report (void *cls,
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, "arm", "BINARY");
     if (cm->result_cont)
-      cm->result_cont (cm->cont_cls, 
-                       GNUNET_ARM_REQUEST_SENT_OK, "arm", 
+      cm->result_cont (cm->cont_cls,
+                       GNUNET_ARM_REQUEST_SENT_OK, "arm",
                        GNUNET_ARM_RESULT_IS_NOT_KNOWN);
     GNUNET_free (cm);
     GNUNET_free (loprefix);
@@ -935,9 +935,9 @@ change_service (struct GNUNET_ARM_Handle *h, const char *service_name,
  */
 void
 GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
-                                  const char *service_name, 
+                                  const char *service_name,
                                   enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                                  struct GNUNET_TIME_Relative timeout, 
+                                  struct GNUNET_TIME_Relative timeout,
                                   GNUNET_ARM_ResultCallback cont,
                                   void *cont_cls)
 {
@@ -1026,14 +1026,14 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
  */
 void
 GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
-                                 const char *service_name, 
+                                 const char *service_name,
                                  struct GNUNET_TIME_Relative timeout,
-                                 GNUNET_ARM_ResultCallback cont, 
+                                 GNUNET_ARM_ResultCallback cont,
                                  void *cont_cls)
 {
-  LOG (GNUNET_ERROR_TYPE_DEBUG, 
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Stopping service `%s' within %s\n",
-       service_name, 
+       service_name,
        GNUNET_STRINGS_relative_time_to_string (timeout, GNUNET_NO));
   change_service (h, service_name, timeout, cont, cont_cls,
                   GNUNET_MESSAGE_TYPE_ARM_STOP);
@@ -1051,14 +1051,14 @@ GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
 void
 GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
                                  struct GNUNET_TIME_Relative timeout,
-                                 GNUNET_ARM_ServiceListCallback cont, 
+                                 GNUNET_ARM_ServiceListCallback cont,
                                  void *cont_cls)
 {
   struct ARMControlMessage *cm;
   struct GNUNET_ARM_Message *msg;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, 
-       "Requesting LIST from ARM service with timeout: %s\n", 
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Requesting LIST from ARM service with timeout: %s\n",
        GNUNET_STRINGS_relative_time_to_string (timeout, GNUNET_YES));
   cm = GNUNET_malloc (sizeof (struct ARMControlMessage));
   cm->h = h;
diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c
index f8d41e790..7b403fde8 100644
--- a/src/arm/arm_monitor_api.c
+++ b/src/arm/arm_monitor_api.c
@@ -167,7 +167,7 @@ init_timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param cls closure with the 'struct GNUNET_ARM_MonitorHandle'
  * @param size number of bytes available in buf
  * @param buf where the callee should write the message
- * @return number of bytes written to buf 
+ * @return number of bytes written to buf
  */
 static size_t
 transmit_monitoring_init_message (void *cls, size_t size, void *buf)
diff --git a/src/arm/do_start_process.c b/src/arm/do_start_process.c
index 95ec74405..d8ee1f0c3 100644
--- a/src/arm/do_start_process.c
+++ b/src/arm/do_start_process.c
@@ -122,7 +122,7 @@ do_start_process (int pipe_control, unsigned int std_inheritance,
   va_end (ap);
   argv[argv_size] = NULL;
   binary_path = argv[0];
-  proc = GNUNET_OS_start_process_v (pipe_control, std_inheritance, lsocks, 
+  proc = GNUNET_OS_start_process_v (pipe_control, std_inheritance, lsocks,
                                     binary_path, argv);
   while (argv_size > 0)
     GNUNET_free (argv[--argv_size]);
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 85cb1f45d..80d3e9c03 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -167,7 +167,7 @@ delete_files ()
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _("Failed to remove servicehome directory %s\n"), dir);
-    
+
   }
 }
 
@@ -269,7 +269,7 @@ ret_string (enum GNUNET_ARM_Result result)
  * @param cls closure
  * @param tc scheudler context
  */
-static void 
+static void
 action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
@@ -283,11 +283,11 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
  *                  GNUNET_SYSERR on error.
  */
 static void
-conn_status (void *cls, 
+conn_status (void *cls,
              int connected)
 {
   static int once;
-  
+
   if ( (GNUNET_SYSERR == connected) &&
        (0 == once) )
   {
@@ -335,7 +335,7 @@ start_callback (void *cls,
     GNUNET_free (msg);
     GNUNET_SCHEDULER_shutdown ();
     return;
-  }  
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM service [re]start successful\n");
   start = 0;
   GNUNET_SCHEDULER_add_now (action_loop, NULL);
@@ -355,7 +355,7 @@ start_callback (void *cls,
  *               according to ARM
  */
 static void
-stop_callback (void *cls, 
+stop_callback (void *cls,
                enum GNUNET_ARM_RequestStatus rs, const char *service,
                enum GNUNET_ARM_Result result)
 {
@@ -363,7 +363,7 @@ stop_callback (void *cls,
 
   if (GNUNET_ARM_REQUEST_SENT_OK != rs)
   {
-    GNUNET_asprintf (&msg, "%s", 
+    GNUNET_asprintf (&msg, "%s",
                      _("Failed to send a stop request to the ARM service: %s\n"));
     FPRINTF (stdout, msg, req_string (rs));
     GNUNET_free (msg);
@@ -380,14 +380,14 @@ stop_callback (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "ARM service shutdown successful\n");
   end = 0;
   if (restart)
   {
     restart = 0;
     start = 1;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Initiating an ARM restart\n");
   }
   GNUNET_SCHEDULER_add_now (&action_loop, NULL);
@@ -407,12 +407,12 @@ stop_callback (void *cls,
  *               according to ARM
  */
 static void
-init_callback (void *cls, 
+init_callback (void *cls,
                enum GNUNET_ARM_RequestStatus rs, const char *service,
                enum GNUNET_ARM_Result result)
 {
   char *msg;
-  
+
   if (GNUNET_ARM_REQUEST_SENT_OK != rs)
   {
     GNUNET_asprintf (&msg, _("Failed to send a request to start the `%s' service: %%s\n"), init);
@@ -431,8 +431,8 @@ init_callback (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-              "Service %s [re]started successfully\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Service %s [re]started successfully\n",
               init);
   init = NULL;
   GNUNET_SCHEDULER_add_now (&action_loop, NULL);
@@ -452,7 +452,7 @@ init_callback (void *cls,
  *               according to ARM
  */
 static void
-term_callback (void *cls, 
+term_callback (void *cls,
                enum GNUNET_ARM_RequestStatus rs, const char *service,
                enum GNUNET_ARM_Result result)
 {
@@ -470,7 +470,7 @@ term_callback (void *cls,
   if ((GNUNET_ARM_RESULT_STOPPED != result) &&
       (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result))
   {
-    GNUNET_asprintf (&msg, 
+    GNUNET_asprintf (&msg,
                      _("Failed to kill the `%s' service: %s\n"),
                      term, ret_string (result));
     FPRINTF (stdout, msg, service);
@@ -479,7 +479,7 @@ term_callback (void *cls,
     return;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Service %s stopped successfully\n", term);
   term = NULL;
   GNUNET_SCHEDULER_add_now (&action_loop, NULL);
@@ -497,7 +497,7 @@ term_callback (void *cls,
  * @param list list of services that are running
  */
 static void
-list_callback (void *cls, 
+list_callback (void *cls,
                enum GNUNET_ARM_RequestStatus rs, unsigned int count,
                const char *const*list)
 {
@@ -546,7 +546,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       if (NULL != term)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Termination action\n");
-        GNUNET_ARM_request_service_stop (h, term, 
+        GNUNET_ARM_request_service_stop (h, term,
                                          (0 == timeout.rel_value_us) ? STOP_TIMEOUT : timeout,
                                          &term_callback, NULL);
         return;
@@ -556,7 +556,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       if (end || restart)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "End action\n");
-        GNUNET_ARM_request_service_stop (h, "arm", 
+        GNUNET_ARM_request_service_stop (h, "arm",
                                          (0 == timeout.rel_value_us) ? STOP_TIMEOUT_ARM : timeout,
                                          &stop_callback, NULL);
         return;
@@ -585,7 +585,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       }
       break;
     case 4:
-      if (list) 
+      if (list)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "Going to list all running services controlled by ARM.\n"); 
@@ -593,10 +593,10 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                          (0 == timeout.rel_value_us) ? LIST_TIMEOUT : timeout,
                                          &list_callback, &list);
         return;
-      }    
+      }
       break;
     case 5:
-      if (monitor) 
+      if (monitor)
         {
           if (! quiet)
             fprintf (stderr,
@@ -621,7 +621,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param status status of the service
  */
 static void
-srv_status (void *cls, 
+srv_status (void *cls,
             const char *service, enum GNUNET_ARM_ServiceStatus status)
 {
   const char *msg;
@@ -663,8 +663,8 @@ srv_status (void *cls,
  * @param c configuration
  */
 static void
-run (void *cls, 
-     char *const *args, 
+run (void *cls,
+     char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
@@ -672,7 +672,7 @@ run (void *cls,
 
   cfg = GNUNET_CONFIGURATION_dup (c);
   config_file = cfgfile;
-  if (GNUNET_OK != 
+  if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS", "SERVICEHOME", &dir))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 906f0adde..1196b20aa 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -259,7 +259,7 @@ write_result (void *cls, size_t size, void *buf)
     return 0;                   /* error, not much we can do */
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending status response %u to client\n", 
+              "Sending status response %u to client\n",
               (unsigned int) msg->result);
   msize = msg->arm_msg.header.size;
   GNUNET_assert (size >= msize);
@@ -275,7 +275,7 @@ write_result (void *cls, size_t size, void *buf)
 
 /**
  * Transmit the list of running services.
- * 
+ *
  * @param cls pointer to `struct GNUNET_ARM_ListResultMessage` with the message
  * @param size number of bytes available in @a buf
  * @param buf where to copy the message, NULL on error
@@ -286,7 +286,7 @@ write_list_result (void *cls, size_t size, void *buf)
 {
   struct GNUNET_ARM_ListResultMessage *msg = cls;
   size_t rslt_size;
-  
+
   if (buf == NULL)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -294,14 +294,14 @@ write_list_result (void *cls, size_t size, void *buf)
     GNUNET_free (msg);
     return 0;                   /* error, not much we can do */
   }
-  
+
   rslt_size = msg->arm_msg.header.size;
   GNUNET_assert (size >= rslt_size);
   msg->arm_msg.header.size = htons (msg->arm_msg.header.size);
   msg->arm_msg.header.type = htons (msg->arm_msg.header.type);
   msg->arm_msg.request_id = GNUNET_htonll (msg->arm_msg.request_id);
   msg->count = htons (msg->count);
-  
+
   memcpy (buf, msg, rslt_size);
   GNUNET_free (msg);
   return rslt_size;
@@ -319,7 +319,7 @@ write_list_result (void *cls, size_t size, void *buf)
  * @return NULL if it was not found
  */
 static void
-signal_result (struct GNUNET_SERVER_Client *client, 
+signal_result (struct GNUNET_SERVER_Client *client,
                const char *name,
                uint64_t request_id,
                enum GNUNET_ARM_Result result)
@@ -335,7 +335,7 @@ signal_result (struct GNUNET_SERVER_Client *client,
   msg->arm_msg.request_id = request_id;
 
   GNUNET_SERVER_notify_transmit_ready (client, msize,
-                                       GNUNET_TIME_UNIT_FOREVER_REL, 
+                                       GNUNET_TIME_UNIT_FOREVER_REL,
                                        write_result, msg);
 }
 
@@ -492,7 +492,7 @@ start_process (struct ServiceList *sl, struct GNUNET_SERVER_Client *client, uint
     if (NULL == sl->config)
       sl->proc =
         do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                          lsocks, loprefix, binary, 
+                          lsocks, loprefix, binary,
                           options, NULL);
     else
       sl->proc =
@@ -693,7 +693,7 @@ handle_start (void *cls, struct GNUNET_SERVER_Client *client,
   uint64_t request_id;
   struct GNUNET_ARM_Message *amsg;
 
-  amsg = (struct GNUNET_ARM_Message *) message;  
+  amsg = (struct GNUNET_ARM_Message *) message;
   request_id = GNUNET_ntohll (amsg->request_id);
   size = ntohs (amsg->header.size);
   size -= sizeof (struct GNUNET_ARM_Message);
@@ -762,7 +762,7 @@ handle_stop (void *cls, struct GNUNET_SERVER_Client *client,
   uint64_t request_id;
   struct GNUNET_ARM_Message *amsg;
 
-  amsg = (struct GNUNET_ARM_Message *) message;  
+  amsg = (struct GNUNET_ARM_Message *) message;
   request_id = GNUNET_ntohll (amsg->request_id);
   size = ntohs (amsg->header.size);
   size -= sizeof (struct GNUNET_ARM_Message);
@@ -847,10 +847,10 @@ handle_list (void *cls, struct GNUNET_SERVER_Client *client,
   size_t total_size;
   struct ServiceList *sl;
   uint16_t count;
-  
+
   if (NULL == client)
     return;
-  
+
   request = (struct GNUNET_ARM_Message *) message;
   count = 0;
   string_list_size = 0;
@@ -866,16 +866,16 @@ handle_list (void *cls, struct GNUNET_SERVER_Client *client,
     }
   }
 
-  total_size = sizeof (struct GNUNET_ARM_ListResultMessage) 
+  total_size = sizeof (struct GNUNET_ARM_ListResultMessage)
                + string_list_size;
   msg = GNUNET_malloc (total_size);
   msg->arm_msg.header.size = total_size;
   msg->arm_msg.header.type = GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT;
   msg->arm_msg.request_id = GNUNET_ntohll (request->request_id);
   msg->count = count;
-  
+
   char *pos = (char *)&msg[1];
-  for (sl = running_head; sl != NULL; sl = sl->next) 
+  for (sl = running_head; sl != NULL; sl = sl->next)
   {
     if (sl->proc != NULL)
     {
@@ -884,7 +884,7 @@ handle_list (void *cls, struct GNUNET_SERVER_Client *client,
       pos += s;
     }
   }
-  
+
   GNUNET_SERVER_notify_transmit_ready (client,
                                        total_size,
                                        GNUNET_TIME_UNIT_FOREVER_REL,
@@ -926,7 +926,7 @@ list_count (struct ServiceList *running_head)
   unsigned int res = 0;
 
   for (res = 0, i = running_head; i; i = i->next, res++)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "%s\n",
                 i->name);
   return res;
@@ -946,7 +946,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct ServiceList *nxt;
   struct ServiceListeningInfo *sli;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "First shutdown phase\n");
   if (GNUNET_SCHEDULER_NO_TASK != child_restart_task)
   {
@@ -979,7 +979,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     nxt = pos->next;
     if (pos->proc != NULL)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Stopping service `%s'\n",
                   pos->name);
       pos->killed_at = GNUNET_TIME_absolute_get ();
@@ -996,7 +996,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     do_shutdown ();
   else
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Delaying shutdown, have %u childs still running\n", 
+                "Delaying shutdown, have %u childs still running\n",
                 list_count (running_head));
 }
 
@@ -1063,12 +1063,12 @@ delayed_restart_task (void *cls,
   }
   if (lowestRestartDelay.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Will restart process in %s\n",
                 GNUNET_STRINGS_relative_time_to_string (lowestRestartDelay, GNUNET_YES));
     child_restart_task =
       GNUNET_SCHEDULER_add_delayed_with_priority (lowestRestartDelay,
-                                                  GNUNET_SCHEDULER_PRIORITY_IDLE, 
+                                                  GNUNET_SCHEDULER_PRIORITY_IDLE,
                                                   &delayed_restart_task, NULL);
   }
 }
@@ -1275,7 +1275,7 @@ setup_service (void *cls, const char *section)
   {
     if (NULL != config)
     {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING, 
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
                                  section, "CONFIG",
                                  STRERROR (errno));
       GNUNET_free (config);
@@ -1293,7 +1293,7 @@ setup_service (void *cls, const char *section)
 #else
   if (GNUNET_CONFIGURATION_have_value (cfg, section, "PIPECONTROL"))
     sl->pipe_control = GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "PIPECONTROL");
-#endif  
+#endif
   GNUNET_CONTAINER_DLL_insert (running_head, running_tail, sl);
   if (GNUNET_YES !=
       GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "AUTOSTART"))
@@ -1363,9 +1363,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *serv,
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
     {&handle_start, NULL, GNUNET_MESSAGE_TYPE_ARM_START, 0},
     {&handle_stop, NULL, GNUNET_MESSAGE_TYPE_ARM_STOP, 0},
-    {&handle_monitor, NULL, GNUNET_MESSAGE_TYPE_ARM_MONITOR, 
+    {&handle_monitor, NULL, GNUNET_MESSAGE_TYPE_ARM_MONITOR,
      sizeof (struct GNUNET_MessageHeader)},
-    {&handle_list, NULL, GNUNET_MESSAGE_TYPE_ARM_LIST, 
+    {&handle_list, NULL, GNUNET_MESSAGE_TYPE_ARM_LIST,
      sizeof (struct GNUNET_ARM_Message)},
     {NULL, NULL, 0, 0}
   };
@@ -1456,7 +1456,7 @@ main (int argc, char *const *argv)
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
   ret =
     (GNUNET_OK ==
-     GNUNET_SERVICE_run (argc, argv, "arm", 
+     GNUNET_SERVICE_run (argc, argv, "arm",
                          GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN, &run, NULL)) ? 0 : 1;
   GNUNET_SIGNAL_handler_uninstall (shc_chld);
   shc_chld = NULL;
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index a36d5939b..cdb173d5c 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -43,9 +43,9 @@ static int ok = 1;
 static int phase = 0;
 
 static void
-arm_stop_cb (void *cls, 
-             enum GNUNET_ARM_RequestStatus status, 
-             const char *servicename, 
+arm_stop_cb (void *cls,
+             enum GNUNET_ARM_RequestStatus status,
+             const char *servicename,
              enum GNUNET_ARM_Result result)
 {
   /* (6), a stop request should be sent to ARM successfully */
@@ -59,8 +59,8 @@ arm_stop_cb (void *cls,
 
 
 static void
-resolver_stop_cb (void *cls, 
-                  enum GNUNET_ARM_RequestStatus status, 
+resolver_stop_cb (void *cls,
+                  enum GNUNET_ARM_RequestStatus status,
                   const char *servicename, enum GNUNET_ARM_Result result)
 {
   /* (5), a stop request should be sent to ARM successfully.
@@ -104,9 +104,9 @@ dns_notify (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 
 
 static void
-resolver_start_cb (void *cls, 
-                   enum GNUNET_ARM_RequestStatus status, 
-                   const char *servicename, 
+resolver_start_cb (void *cls,
+                   enum GNUNET_ARM_RequestStatus status,
+                   const char *servicename,
                    enum GNUNET_ARM_Result result)
 {
   /* (2), the start request for resolver should be sent successfully
@@ -129,7 +129,7 @@ trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-arm_conn (void *cls, 
+arm_conn (void *cls,
           int connected)
 {
   if (GNUNET_SYSERR == connected)
@@ -163,9 +163,9 @@ arm_conn (void *cls,
 
 
 static void
-arm_start_cb (void *cls, 
-              enum GNUNET_ARM_RequestStatus status, 
-              const char *servicename, 
+arm_start_cb (void *cls,
+              enum GNUNET_ARM_RequestStatus status,
+              const char *servicename,
               enum GNUNET_ARM_Result result)
 {
   /* (0) The request should be "sent" successfully
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index 08c4fd8ee..0561c3ea8 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -122,12 +122,12 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
 {
   struct ShutdownContext *shutdown_ctx = cls;
 
-  if (NULL == msg) 
+  if (NULL == msg)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service shutdown complete.\n");
     if (shutdown_ctx->cont != NULL)
       shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_NO);
-    
+
     GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
     GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
     GNUNET_free (shutdown_ctx);
@@ -253,7 +253,7 @@ kill_task (void *cbData, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (NULL != cbData)
   {
     waitedFor = GNUNET_TIME_absolute_get_duration (startedWaitingAt);
-    LOG ("Waited for: %s\n", 
+    LOG ("Waited for: %s\n",
          GNUNET_STRINGS_relative_time_to_string (waitedFor, GNUNET_YES));
   }
   else
@@ -347,7 +347,7 @@ arm_start_cb (void *cls, enum GNUNET_ARM_RequestStatus status, const char *servi
   GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
   GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
   GNUNET_break (phase == 0);
-  LOG ("Sent 'START' request for arm to ARM %s\n", 
+  LOG ("Sent 'START' request for arm to ARM %s\n",
        (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
 }
 
@@ -431,7 +431,7 @@ init ()
     return GNUNET_SYSERR;
   GNUNET_assert (0 < GNUNET_asprintf (&binary, "%s/%s", pwd, BINARY));
   GNUNET_CONFIGURATION_set_value_string (cfg, SERVICE, "BINARY", binary);
-  GNUNET_free (binary);  
+  GNUNET_free (binary);
   if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, CFGFILENAME))
   {
     GNUNET_CONFIGURATION_destroy (cfg);
diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c
index e53322aa5..60feb9c19 100644
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file arm/test_gnunet_service_arm.c 
+ * @file arm/test_gnunet_service_arm.c
  * @brief testcase for gnunet-service-arm.c; tests ARM by making it start the resolver
  * @author Safey
  * @author Christian Grothoff
@@ -55,9 +55,9 @@ trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-arm_stop_cb (void *cls, 
-             enum GNUNET_ARM_RequestStatus status, 
-             const char *servicename, 
+arm_stop_cb (void *cls,
+             enum GNUNET_ARM_RequestStatus status,
+             const char *servicename,
              enum GNUNET_ARM_Result result)
 {
   GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
@@ -69,12 +69,12 @@ arm_stop_cb (void *cls,
 
 
 static void
-service_list (void *cls, 
+service_list (void *cls,
               enum GNUNET_ARM_RequestStatus rs,
               unsigned int count, const char *const*list)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-              "%u services are are currently running\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "%u services are are currently running\n",
               count);
   GNUNET_break (count == 1);
   GNUNET_break (0 == strcasecmp (list[0], "resolver (gnunet-service-resolver)"));
@@ -107,9 +107,9 @@ hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 
 
 static void
-arm_start_cb (void *cls, 
-              enum GNUNET_ARM_RequestStatus status, 
-              const char *servicename, 
+arm_start_cb (void *cls,
+              enum GNUNET_ARM_RequestStatus status,
+              const char *servicename,
               enum GNUNET_ARM_Result result)
 {
   GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);