Merge branch 'master' of ssh://gnunet.org/gnunet

3 files changed, 9 insertions, 6 deletions

diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index cf44afd1f..d0f5546f3 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -406,7 +406,8 @@ run (void *cls,
       GNUNET_STRINGS_string_to_data (privkey_ego,
                                      strlen (privkey_ego),
                                      &pk,
-                                     sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey));
+                                     sizeof(struct
+                                            GNUNET_CRYPTO_EcdsaPrivateKey));
       create_op =
         GNUNET_IDENTITY_create (sh,
                                 create_ego,
@@ -452,7 +453,8 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_option_string ('P',
                                  "privkey",
                                  "PRIVATE_KEY",
-                                 gettext_noop ("set the private key for the identity to PRIVATE_KEY (use together with -C)"),
+                                 gettext_noop (
+                                   "set the private key for the identity to PRIVATE_KEY (use together with -C)"),
                                  &privkey_ego),
     GNUNET_GETOPT_option_flag ('d',
                                "display",
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 5d17ac5d5..f7aca1655 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -150,9 +150,9 @@ struct GNUNET_IDENTITY_Handle
 /**
  * Obtain the ego representing 'anonymous' users.
  *
- * @return handle for the anonymous user, must not be freed
+ * @return handle for the anonymous user, MUST NOT be freed
  */
-const struct GNUNET_IDENTITY_Ego *
+struct GNUNET_IDENTITY_Ego *
 GNUNET_IDENTITY_ego_get_anonymous ()
 {
   static struct GNUNET_IDENTITY_Ego anon;
diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index 009a01f16..02e42d03f 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -1065,7 +1065,8 @@ ego_create (struct GNUNET_REST_RequestHandle *con_handle,
     GNUNET_STRINGS_string_to_data (privkey,
                                    strlen (privkey),
                                    &pk,
-                                   sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey));
+                                   sizeof(struct
+                                          GNUNET_CRYPTO_EcdsaPrivateKey));
     pk_ptr = &pk;
   }
   else
@@ -1422,7 +1423,7 @@ libgnunet_plugin_rest_identity_done (void *cls)
 
   plugin->cfg = NULL;
 
-  GNUNET_free_non_null (allow_methods);
+  GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Identity REST plugin is finished\n");
   return NULL;