7 files changed, 103 insertions, 103 deletions

diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index 8dac356e4..c2c381604 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -104,7 +104,7 @@ shutdown_task (void *cls,
   {
     GNUNET_IDENTITY_cancel (delete_op);
     delete_op = NULL;
-  }  
+  }
   GNUNET_IDENTITY_disconnect (sh);
   sh = NULL;
 }
@@ -121,7 +121,7 @@ test_finished ()
        (NULL == set_op) &&
        (NULL == set_ego) &&
        (! list) &&
-       (! monitor) )  
+       (! monitor) )
     GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -201,11 +201,11 @@ set_done (void *cls,
  * 'ego' does indicate an error (i.e. name is taken or no default
  * value is known).  If 'ego' is non-NULL and if '*ctx'
  * is set in those callbacks, the value WILL be passed to a subsequent
- * call to the identity callback of 'GNUNET_IDENTITY_connect' (if 
+ * call to the identity callback of 'GNUNET_IDENTITY_connect' (if
  * that one was not NULL).
  *
  * When an identity is renamed, this function is called with the
- * (known) ego but the NEW identifier.  
+ * (known) ego but the NEW identifier.
  *
  * When an identity is deleted, this function is called with the
  * (known) ego and "NULL" for the 'identifier'.  In this case,
@@ -232,7 +232,7 @@ print_ego (void *cls,
   if ( (NULL != set_ego) &&
        (NULL != ego) &&
        (NULL != identifier) &&
-       (0 == strcmp (identifier, 
+       (0 == strcmp (identifier,
                      set_ego)) )
     {
       set_op = GNUNET_IDENTITY_set (sh,
@@ -348,7 +348,7 @@ main (int argc, char *const *argv)
     return 2;
 
   res = GNUNET_PROGRAM_run (argc, argv, "gnunet-identity",
-                            gettext_noop ("Maintain egos"), 
+                            gettext_noop ("Maintain egos"),
                             options, &run,
                             NULL);
   GNUNET_free ((void *) argv);
diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c
index 52d072967..c61286bd5 100644
--- a/src/identity/gnunet-service-identity.c
+++ b/src/identity/gnunet-service-identity.c
@@ -47,12 +47,12 @@ struct Ego
 
   /**
    * We keep egos in a DLL.
-   */ 
+   */
   struct Ego *next;
 
   /**
    * We keep egos in a DLL.
-   */ 
+   */
   struct Ego *prev;
 
   /**
@@ -195,7 +195,7 @@ send_result_code (struct GNUNET_SERVER_Client *client,
               "Sending result %d (%s) to client\n",
               (int) result_code,
               emsg);
-  GNUNET_SERVER_notification_context_unicast (nc, client, &rcm->header, GNUNET_NO);  
+  GNUNET_SERVER_notification_context_unicast (nc, client, &rcm->header, GNUNET_NO);
   GNUNET_free (rcm);
 }
 
@@ -211,7 +211,7 @@ create_update_message (struct Ego *ego)
 {
   struct GNUNET_IDENTITY_UpdateMessage *um;
   size_t name_len;
- 
+
   name_len = (NULL == ego->identifier) ? 0 : (strlen (ego->identifier) + 1);
   um = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_UpdateMessage) + name_len);
   um->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE);
@@ -252,7 +252,7 @@ create_set_default_message (struct Ego *ego,
 
 /**
  * Handler for START message from client, sends information
- * about all identities to the client immediately and 
+ * about all identities to the client immediately and
  * adds the client to the notification context for future
  * updates.
  *
@@ -268,7 +268,7 @@ handle_start_message (void *cls, struct GNUNET_SERVER_Client *client,
   struct GNUNET_IDENTITY_UpdateMessage ume;
   struct Ego *ego;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received START message from client\n");
   GNUNET_SERVER_notification_context_add (nc, client);
   for (ego = ego_head; NULL != ego; ego = ego->next)
@@ -282,7 +282,7 @@ handle_start_message (void *cls, struct GNUNET_SERVER_Client *client,
   ume.header.size = htons (sizeof (struct GNUNET_IDENTITY_UpdateMessage));
   ume.end_of_list = htons (GNUNET_YES);
   ume.name_len = htons (0);
-  GNUNET_SERVER_notification_context_unicast (nc, client, &ume.header, GNUNET_NO);  
+  GNUNET_SERVER_notification_context_unicast (nc, client, &ume.header, GNUNET_NO);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -325,7 +325,7 @@ handle_get_default_message (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received GET_DEFAULT for service `%s' from client\n",
               name);
   if (GNUNET_OK !=
@@ -335,7 +335,7 @@ handle_get_default_message (void *cls, struct GNUNET_SERVER_Client *client,
                                              &identifier))
   {
     send_result_code (client, 1, gettext_noop ("no default known"));
-    GNUNET_SERVER_receive_done (client, GNUNET_OK);   
+    GNUNET_SERVER_receive_done (client, GNUNET_OK);
     return;
   }
   for (ego = ego_head; NULL != ego; ego = ego->next)
@@ -356,7 +356,7 @@ handle_get_default_message (void *cls, struct GNUNET_SERVER_Client *client,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Failed to find ego `%s'\n",
               name);
-  send_result_code (client, 1, 
+  send_result_code (client, 1,
                     gettext_noop ("default configured, but ego unknown (internal error)"));
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -364,7 +364,7 @@ handle_get_default_message (void *cls, struct GNUNET_SERVER_Client *client,
 
 /**
  * Compare the given two private keys for equality.
- * 
+ *
  * @param pk1 one private key
  * @param pk2 another private key
  * @return 0 if the keys are equal
@@ -405,7 +405,7 @@ handle_set_default_message (void *cls, struct GNUNET_SERVER_Client *client,
   sdm = (const struct GNUNET_IDENTITY_SetDefaultMessage *) message;
   name_len = ntohs (sdm->name_len);
   GNUNET_break (0 == ntohs (sdm->reserved));
-  if (name_len + sizeof (struct GNUNET_IDENTITY_SetDefaultMessage) != size) 
+  if (name_len + sizeof (struct GNUNET_IDENTITY_SetDefaultMessage) != size)
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
@@ -418,7 +418,7 @@ handle_set_default_message (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received SET_DEFAULT for service `%s' from client\n",
               str);
   for (ego = ego_head; NULL != ego; ego = ego->next)
@@ -430,7 +430,7 @@ handle_set_default_message (void *cls, struct GNUNET_SERVER_Client *client,
                                              str,
                                              "DEFAULT_IDENTIFIER",
                                              ego->identifier);
-      if (GNUNET_OK != 
+      if (GNUNET_OK !=
           GNUNET_CONFIGURATION_write (subsystem_cfg,
                                       subsystem_cfg_file))
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -440,7 +440,7 @@ handle_set_default_message (void *cls, struct GNUNET_SERVER_Client *client,
       GNUNET_SERVER_receive_done (client, GNUNET_OK);
       return;
     }
-  }  
+  }
   send_result_code (client, 1, _("Unknown ego specified for service (internal error)"));
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -481,7 +481,7 @@ handle_create_message (void *cls, struct GNUNET_SERVER_Client *client,
   const char *str;
   char *fn;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received CREATE message from client\n");
   size = ntohs (message->size);
   if (size <= sizeof (struct GNUNET_IDENTITY_CreateRequestMessage))
@@ -493,7 +493,7 @@ handle_create_message (void *cls, struct GNUNET_SERVER_Client *client,
   crm = (const struct GNUNET_IDENTITY_CreateRequestMessage *) message;
   name_len = ntohs (crm->name_len);
   GNUNET_break (0 == ntohs (crm->reserved));
-  if (name_len + sizeof (struct GNUNET_IDENTITY_CreateRequestMessage) != size) 
+  if (name_len + sizeof (struct GNUNET_IDENTITY_CreateRequestMessage) != size)
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
@@ -528,14 +528,14 @@ handle_create_message (void *cls, struct GNUNET_SERVER_Client *client,
   (void) GNUNET_DISK_directory_create_for_file (fn);
   if (sizeof (struct GNUNET_CRYPTO_EccPrivateKey) !=
       GNUNET_DISK_fn_write (fn,
-                            &crm->private_key, 
+                            &crm->private_key,
                             sizeof (struct GNUNET_CRYPTO_EccPrivateKey),
                             GNUNET_DISK_PERM_USER_READ |
                             GNUNET_DISK_PERM_USER_WRITE))
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
                               "write", fn);
   GNUNET_free (fn);
-  notify_listeners (ego);  
+  notify_listeners (ego);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -543,7 +543,7 @@ handle_create_message (void *cls, struct GNUNET_SERVER_Client *client,
 /**
  * Closure for 'handle_ego_rename'.
  */
-struct RenameContext 
+struct RenameContext
 {
   /**
    * Old name.
@@ -579,14 +579,14 @@ handle_ego_rename (void *cls,
     return;
   if (0 != strcmp (id, rc->old_name))
   {
-    GNUNET_free (id);  
+    GNUNET_free (id);
     return;
   }
   GNUNET_CONFIGURATION_set_value_string (subsystem_cfg,
                                          section,
                                          "DEFAULT_IDENTIFIER",
                                          rc->new_name);
-  GNUNET_free (id);  
+  GNUNET_free (id);
 }
 
 
@@ -613,7 +613,7 @@ handle_rename_message (void *cls, struct GNUNET_SERVER_Client *client,
   char *fn_old;
   char *fn_new;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received RENAME message from client\n");
   size = ntohs (message->size);
   if (size <= sizeof (struct GNUNET_IDENTITY_RenameMessage))
@@ -643,7 +643,7 @@ handle_rename_message (void *cls, struct GNUNET_SERVER_Client *client,
                      new_name))
     {
       send_result_code (client, 1, gettext_noop ("target name already exists"));
-      GNUNET_SERVER_receive_done (client, GNUNET_OK);      
+      GNUNET_SERVER_receive_done (client, GNUNET_OK);
       return;
     }
   }
@@ -661,14 +661,14 @@ handle_rename_message (void *cls, struct GNUNET_SERVER_Client *client,
       GNUNET_CONFIGURATION_iterate_sections (subsystem_cfg,
                                              &handle_ego_rename,
                                              &rename_ctx);
-      if (GNUNET_OK != 
+      if (GNUNET_OK !=
           GNUNET_CONFIGURATION_write (subsystem_cfg,
                                       subsystem_cfg_file))
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     _("Failed to write subsystem default identifier map to `%s'.\n"),
                     subsystem_cfg_file);
       ego->identifier = GNUNET_strdup (new_name);
-      fn_new = get_ego_filename (ego);      
+      fn_new = get_ego_filename (ego);
       if (0 != RENAME (fn_old, fn_new))
         GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "rename", fn_old);
       GNUNET_free (fn_old);
@@ -708,14 +708,14 @@ handle_ego_delete (void *cls,
     return;
   if (0 != strcmp (id, identifier))
   {
-    GNUNET_free (id);  
+    GNUNET_free (id);
     return;
   }
   GNUNET_CONFIGURATION_set_value_string (subsystem_cfg,
                                          section,
                                          "DEFAULT_IDENTIFIER",
                                          NULL);
-  GNUNET_free (id);  
+  GNUNET_free (id);
 }
 
 
@@ -738,7 +738,7 @@ handle_delete_message (void *cls, struct GNUNET_SERVER_Client *client,
   const char *name;
   char *fn;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received DELETE message from client\n");
   size = ntohs (message->size);
   if (size <= sizeof (struct GNUNET_IDENTITY_DeleteMessage))
@@ -769,7 +769,7 @@ handle_delete_message (void *cls, struct GNUNET_SERVER_Client *client,
       GNUNET_CONFIGURATION_iterate_sections (subsystem_cfg,
                                              &handle_ego_delete,
                                              ego->identifier);
-      if (GNUNET_OK != 
+      if (GNUNET_OK !=
           GNUNET_CONFIGURATION_write (subsystem_cfg,
                                       subsystem_cfg_file))
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -830,7 +830,7 @@ process_ego_file (void *cls,
     }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Loaded ego `%s'\n",
-              fn + 1);  
+              fn + 1);
   ego->identifier = GNUNET_strdup (fn + 1);
   GNUNET_CONTAINER_DLL_insert (ego_head,
                                ego_tail,
@@ -847,7 +847,7 @@ process_ego_file (void *cls,
  * @param c configuration to use
  */
 static void
-run (void *cls, 
+run (void *cls,
      struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
@@ -892,7 +892,7 @@ run (void *cls,
   subsystem_cfg = GNUNET_CONFIGURATION_create ();
   if ( (GNUNET_YES ==
         GNUNET_DISK_file_test (subsystem_cfg_file)) &&
-       (GNUNET_OK != 
+       (GNUNET_OK !=
         GNUNET_CONFIGURATION_parse (subsystem_cfg,
                                     subsystem_cfg_file)) )
   {
@@ -931,7 +931,7 @@ int
 main (int argc, char *const *argv)
 {
   return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc, argv, "identity", 
+          GNUNET_SERVICE_run (argc, argv, "identity",
                               GNUNET_SERVICE_OPTION_NONE,
                               &run, NULL)) ? 0 : 1;
 }
diff --git a/src/identity/identity.h b/src/identity/identity.h
index 13ac91e46..5e965b2c7 100644
--- a/src/identity/identity.h
+++ b/src/identity/identity.h
@@ -138,7 +138,7 @@ struct GNUNET_IDENTITY_SetDefaultMessage
   uint16_t reserved GNUNET_PACKED;
 
   /**
-   * The private key 
+   * The private key
    */
   struct GNUNET_CRYPTO_EccPrivateKey private_key;
 
@@ -149,7 +149,7 @@ struct GNUNET_IDENTITY_SetDefaultMessage
 
 /**
  * Client requests creation of an identity.  Service
- * will respond with a result code.  
+ * will respond with a result code.
  */
 struct GNUNET_IDENTITY_CreateRequestMessage
 {
@@ -169,7 +169,7 @@ struct GNUNET_IDENTITY_CreateRequestMessage
   uint16_t reserved GNUNET_PACKED;
 
   /**
-   * The private key 
+   * The private key
    */
   struct GNUNET_CRYPTO_EccPrivateKey private_key;
 
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 143f9e7e8..dc4613cdb 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -32,7 +32,7 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "identity-api",__VA_ARGS__)
 
-/** 
+/**
  * Handle for an ego.
  */
 struct GNUNET_IDENTITY_Ego
@@ -59,7 +59,7 @@ struct GNUNET_IDENTITY_Ego
 };
 
 
-/** 
+/**
  * Handle for an operation with the identity service.
  */
 struct GNUNET_IDENTITY_Operation
@@ -69,7 +69,7 @@ struct GNUNET_IDENTITY_Operation
    * Main identity handle.
    */
   struct GNUNET_IDENTITY_Handle *h;
-  
+
   /**
    * We keep operations in a DLL.
    */
@@ -139,12 +139,12 @@ struct GNUNET_IDENTITY_Handle
 
   /**
    * Head of active operations.
-   */ 
+   */
   struct GNUNET_IDENTITY_Operation *op_head;
 
   /**
    * Tail of active operations.
-   */ 
+   */
   struct GNUNET_IDENTITY_Operation *op_tail;
 
   /**
@@ -172,7 +172,7 @@ struct GNUNET_IDENTITY_Handle
 
 /**
  * Obtain the ego representing 'anonymous' users.
- * 
+ *
  * @return handle for the anonymous user, must not be freed
  */
 const struct GNUNET_IDENTITY_Ego *
@@ -240,7 +240,7 @@ reschedule_connect (struct GNUNET_IDENTITY_Handle *h)
  * @param msg message received, NULL on timeout or fatal error
  */
 static void
-message_handler (void *cls, 
+message_handler (void *cls,
                  const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_IDENTITY_Handle *h = cls;
@@ -307,7 +307,7 @@ message_handler (void *cls,
     }
     um = (const struct GNUNET_IDENTITY_UpdateMessage *) msg;
     name_len = ntohs (um->name_len);
-    
+
     str = (const char *) &um[1];
     if ( (size != name_len + sizeof (struct GNUNET_IDENTITY_UpdateMessage)) ||
          ( (0 != name_len) &&
@@ -369,7 +369,7 @@ message_handler (void *cls,
       /* ego changed name */
       GNUNET_free (ego->name);
       ego->name = GNUNET_strdup (str);
-    }    
+    }
     GNUNET_CLIENT_receive (h->client, &message_handler, h,
                            GNUNET_TIME_UNIT_FOREVER_REL);
     /* inform application about change */
@@ -456,14 +456,14 @@ transmit_next (struct GNUNET_IDENTITY_Handle *h);
  * @return number of bytes copied to buf
  */
 static size_t
-send_next_message (void *cls, 
-                   size_t size, 
+send_next_message (void *cls,
+                   size_t size,
                    void *buf)
 {
   struct GNUNET_IDENTITY_Handle *h = cls;
   struct GNUNET_IDENTITY_Operation *op = h->op_head;
   size_t ret;
-  
+
   h->th = NULL;
   if (NULL == op)
     return 0;
@@ -472,7 +472,7 @@ send_next_message (void *cls,
   {
     reschedule_connect (h);
     return 0;
-  }  
+  }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Sending message of type %d to identity service\n",
        ntohs (op->msg->type));
@@ -543,7 +543,7 @@ reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if ( (NULL == h->op_head) ||
        (GNUNET_MESSAGE_TYPE_IDENTITY_START != ntohs (h->op_head->msg->type)) )
   {
-    op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) + 
+    op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
                         sizeof (struct GNUNET_MessageHeader));
     op->h = h;
     op->msg = (const struct GNUNET_MessageHeader *) &op[1];
@@ -633,7 +633,7 @@ GNUNET_IDENTITY_get (struct GNUNET_IDENTITY_Handle *id,
   struct GNUNET_IDENTITY_GetDefaultMessage *gdm;
   size_t slen;
 
-  slen = strlen (service_name) + 1; 
+  slen = strlen (service_name) + 1;
   if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct GNUNET_IDENTITY_GetDefaultMessage))
   {
     GNUNET_break (0);
@@ -641,7 +641,7 @@ GNUNET_IDENTITY_get (struct GNUNET_IDENTITY_Handle *id,
   }
   op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
                       sizeof (struct GNUNET_IDENTITY_GetDefaultMessage) +
-                      slen);  
+                      slen);
   op->h = id;
   op->cb = cb;
   op->cls = cb_cls;
@@ -691,7 +691,7 @@ GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *id,
   }
   op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
                       sizeof (struct GNUNET_IDENTITY_SetDefaultMessage) +
-                      slen);  
+                      slen);
   op->h = id;
   op->cont = cont;
   op->cls = cont_cls;
@@ -713,7 +713,7 @@ GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *id,
 }
 
 
-/** 
+/**
  * Create a new identity with the given name.
  *
  * @param id identity service to use
@@ -744,7 +744,7 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id,
   }
   op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
                       sizeof (struct GNUNET_IDENTITY_CreateRequestMessage) +
-                      slen);  
+                      slen);
   op->h = id;
   op->cont = cont;
   op->cls = cont_cls;
@@ -767,7 +767,7 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id,
 }
 
 
-/** 
+/**
  * Renames an existing identity.
  *
  * @param id identity service to use
@@ -824,7 +824,7 @@ GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *id,
 }
 
 
-/** 
+/**
  * Delete an existing identity.
  *
  * @param id identity service to use
@@ -851,7 +851,7 @@ GNUNET_IDENTITY_delete (struct GNUNET_IDENTITY_Handle *id,
   }
   op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
                       sizeof (struct GNUNET_IDENTITY_DeleteMessage) +
-                      slen);  
+                      slen);
   op->h = id;
   op->cont = cb;
   op->cls = cb_cls;
diff --git a/src/identity/identity_api_lookup.c b/src/identity/identity_api_lookup.c
index 87e4face1..b813f5b41 100644
--- a/src/identity/identity_api_lookup.c
+++ b/src/identity/identity_api_lookup.c
@@ -32,25 +32,25 @@
 
 /**
  * Handle for ego lookup.
- */ 
+ */
 struct GNUNET_IDENTITY_EgoLookup
 {
-  
+
   /**
    * Handle to the identity service.
    */
   struct GNUNET_IDENTITY_Handle *identity;
-  
+
   /**
    * Name of the ego we are looking up.
    */
   char *name;
-  
+
   /**
    * Function to call with the result.
    */
   GNUNET_IDENTITY_EgoCallback cb;
-  
+
   /**
    * Closure for @e cb
    */
@@ -58,7 +58,7 @@ struct GNUNET_IDENTITY_EgoLookup
 };
 
 
-/** 
+/**
  * Method called to inform about the egos of this peer.
  *
  * When used with #GNUNET_IDENTITY_connect, this function is
@@ -81,7 +81,7 @@ struct GNUNET_IDENTITY_EgoLookup
  *                   NULL if the user just deleted the ego and it
  *                   must thus no longer be used
  */
-static void 
+static void
 identity_cb (void *cls,
              struct GNUNET_IDENTITY_Ego *ego,
              void **ctx,
@@ -98,7 +98,7 @@ identity_cb (void *cls,
     GNUNET_IDENTITY_ego_lookup_cancel (el);
     return;
   }
-  if (NULL == ego) 
+  if (NULL == ego)
   {
     /* not found */
     el->cb (el->cb_cls,
diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c
index 60c6c2dad..6e8408ea8 100644
--- a/src/identity/test_identity.c
+++ b/src/identity/test_identity.c
@@ -50,7 +50,7 @@ static struct GNUNET_IDENTITY_Operation *op;
 
 /**
  * Handle for task for timeout termination.
- */ 
+ */
 static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 
@@ -105,7 +105,7 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
  * Finish the testcase (successfully).
  */
-static void 
+static void
 end ()
 {
   if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
@@ -195,9 +195,9 @@ fail_rename_cont (void *cls,
                   const char *emsg)
 {
   GNUNET_assert (NULL != emsg);
-  op = GNUNET_IDENTITY_delete (h, 
+  op = GNUNET_IDENTITY_delete (h,
                                "test",
-                               &delete_cont, 
+                               &delete_cont,
                                NULL);
    end (); /* yepee */
 }
@@ -214,10 +214,10 @@ success_rename_cont (void *cls,
                      const char *emsg)
 {
   GNUNET_assert (NULL == emsg);
-  op = GNUNET_IDENTITY_rename (h, 
+  op = GNUNET_IDENTITY_rename (h,
                                "test-id",
                                "test",
-                               &fail_rename_cont, 
+                               &fail_rename_cont,
                                NULL);
 }
 
@@ -231,12 +231,12 @@ success_rename_cont (void *cls,
 static void
 create_cb (void *cls,
            const char *emsg)
-{  
+{
   GNUNET_assert (NULL == emsg);
-  op = GNUNET_IDENTITY_rename (h, 
+  op = GNUNET_IDENTITY_rename (h,
                                "test-id",
                                "test",
-                               &success_rename_cont, 
+                               &success_rename_cont,
                                NULL);
 }
 
@@ -249,19 +249,19 @@ create_cb (void *cls,
  * @param peer handle to access more of the peer (not used)
  */
 static void
-run (void *cls, 
+run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
-  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, 
-                                                &endbadly, NULL); 
+  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                &endbadly, NULL);
   h = GNUNET_IDENTITY_connect (cfg, &notification_cb, NULL);
   GNUNET_assert (NULL != h);
   op = GNUNET_IDENTITY_create (h,
                                "test-id",
                                &create_cb,
                                NULL);
-  
+
 }
 
 
@@ -270,7 +270,7 @@ main (int argc, char *argv[])
 {
   GNUNET_DISK_directory_remove ("/tmp/test-identity-service");
   res = 1;
-  if (0 != 
+  if (0 !=
       GNUNET_TESTING_service_run ("test-identity",
                                   "identity",
                                   "test_identity.conf",
diff --git a/src/identity/test_identity_defaults.c b/src/identity/test_identity_defaults.c
index 2caf03a1e..ad4b91ae9 100644
--- a/src/identity/test_identity_defaults.c
+++ b/src/identity/test_identity_defaults.c
@@ -50,7 +50,7 @@ static struct GNUNET_IDENTITY_Operation *op;
 
 /**
  * Handle for task for timeout termination.
- */ 
+ */
 static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 
@@ -105,7 +105,7 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
  * Finish the testcase (successfully).
  */
-static void 
+static void
 end ()
 {
   if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
@@ -149,9 +149,9 @@ get_cb (void *cls,
   GNUNET_assert (NULL != ego);
   GNUNET_assert (NULL != identifier);
   GNUNET_assert (0 == strcmp (identifier, "test-id"));
-  op = GNUNET_IDENTITY_delete (h, 
+  op = GNUNET_IDENTITY_delete (h,
                                "test-id",
-                               &delete_cont, 
+                               &delete_cont,
                                NULL);
 }
 
@@ -164,12 +164,12 @@ get_cb (void *cls,
  * @param peer handle to access more of the peer (not used)
  */
 static void
-run_get (void *cls, 
+run_get (void *cls,
          const struct GNUNET_CONFIGURATION_Handle *cfg,
          struct GNUNET_TESTING_Peer *peer)
 {
-  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, 
-                                                &endbadly, NULL); 
+  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                &endbadly, NULL);
   h = GNUNET_IDENTITY_connect (cfg, NULL, NULL);
   GNUNET_assert (NULL != h);
   op = GNUNET_IDENTITY_get (h,
@@ -214,10 +214,10 @@ notification_cb (void *cls,
 {
   if (NULL == ego)
     return; /* skip first call */
-  op = GNUNET_IDENTITY_set (h, 
+  op = GNUNET_IDENTITY_set (h,
                             "test-service",
                             ego,
-                            &success_set_cont, 
+                            &success_set_cont,
                             NULL);
 }
 
@@ -231,7 +231,7 @@ notification_cb (void *cls,
 static void
 create_cb (void *cls,
            const char *emsg)
-{  
+{
   GNUNET_assert (NULL == emsg);
   op = NULL;
 }
@@ -245,19 +245,19 @@ create_cb (void *cls,
  * @param peer handle to access more of the peer (not used)
  */
 static void
-run_set (void *cls, 
+run_set (void *cls,
          const struct GNUNET_CONFIGURATION_Handle *cfg,
          struct GNUNET_TESTING_Peer *peer)
 {
-  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, 
-                                                &endbadly, NULL); 
+  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                &endbadly, NULL);
   h = GNUNET_IDENTITY_connect (cfg, &notification_cb, NULL);
   GNUNET_assert (NULL != h);
   op = GNUNET_IDENTITY_create (h,
                                "test-id",
                                &create_cb,
                                NULL);
-  
+
 }
 
 
@@ -266,14 +266,14 @@ main (int argc, char *argv[])
 {
   GNUNET_DISK_directory_remove ("/tmp/test-identity-service");
   res = 1;
-  if (0 != 
+  if (0 !=
       GNUNET_TESTING_service_run ("test-identity-defaults",
                                   "identity",
                                   "test_identity.conf",
                                   &run_set,
                                   NULL))
     return 1;
-  if (0 != 
+  if (0 !=
       GNUNET_TESTING_service_run ("test-identity-defaults",
                                   "identity",
                                   "test_identity.conf",