Merge branch 'abe' into identity_abe

[oweals/gnunet.git] / src / identity / identity_api_lookup.c

diff --git a/src/identity/identity_api_lookup.c b/src/identity/identity_api_lookup.c
index 1d45136e338a754da1c820dcf4e2ba61b8018d8d..7d40104fdbdbad931876c42cb55be64563bac79e 100644 (file)
--- a/src/identity/identity_api_lookup.c
+++ b/src/identity/identity_api_lookup.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public Liceidentity as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public Liceidentity
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -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
@@ -75,13 +75,13 @@ struct GNUNET_IDENTITY_EgoLookup
  *
  * @param cls closure with the `struct GNUNET_IDENTITY_EgoLookup`
  * @param ego ego handle
- * @param ego_ctx context for application to store data for this ego
+ * @param ctx context for application to store data for this ego
  *                 (during the lifetime of this process, initially NULL)
  * @param name name assigned by the user for this ego,
  *                   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,