3 files changed, 35 insertions, 19 deletions

diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c
index 6922c7d79..d7fc31d4c 100644
--- a/src/gns/plugin_rest_gns.c
+++ b/src/gns/plugin_rest_gns.c
@@ -226,7 +226,7 @@ do_error (void *cls,
  *
  * @param rd the GNSRECORD_Data
  */
-json_t *
+static json_t *
 gnsrecord_to_json (const struct GNUNET_GNSRECORD_Data *rd)
 {
   const char *typename;
@@ -480,7 +480,7 @@ identity_master_cb (void *cls,
  * @param handle lookup handle to populate
  * @return GNUNET_SYSERR on error
  */
-int
+static int
 parse_url (const char *url, struct LookupHandle *handle)
 {
   char *name;
@@ -513,7 +513,7 @@ parse_url (const char *url, struct LookupHandle *handle)
  * @param proc_cls closure for callback function
  * @return GNUNET_OK if request accepted
  */
-void
+static void
 rest_gns_process_request(struct RestConnectionDataHandle *conndata_handle,
                          GNUNET_REST_ResultProcessor proc,
                          void *proc_cls)
diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index b9aa8db00..53c74dcf2 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -83,6 +83,7 @@ struct EgoEntry
   struct GNUNET_IDENTITY_Ego *ego;
 };
 
+
 struct RequestHandle
 {
   /**
@@ -174,7 +175,7 @@ struct RequestHandle
  * Cleanup lookup handle
  * @param handle Handle to clean up
  */
-void
+static void
 cleanup_handle (struct RequestHandle *handle)
 {
   struct EgoEntry *ego_entry;
@@ -227,7 +228,7 @@ do_error (void *cls,
  * @param ctx the context
  * @param name the id of the ego
  */
-void
+static void
 get_ego_for_subsys (void *cls,
                     struct GNUNET_IDENTITY_Ego *ego,
                     void **ctx,
@@ -281,7 +282,7 @@ get_ego_for_subsys (void *cls,
  *
  * @param handle the RequestHandle
  */
-void
+static void
 ego_info_response (struct RestConnectionDataHandle *con,
                    const char *url,
                    void *cls)
@@ -425,8 +426,9 @@ ego_create_cont (struct RestConnectionDataHandle *con,
   struct JsonApiObject *json_obj;
   struct JsonApiResource *json_res;
   json_t *egoname_json;
-  char term_data[handle->data_size+1];
   const char* egoname;
+  char term_data[handle->data_size+1];
+
   if (strlen (GNUNET_REST_API_NS_IDENTITY) != strlen (handle->url))
   {
     GNUNET_SCHEDULER_add_now (&do_error, handle);
@@ -489,23 +491,31 @@ ego_create_cont (struct RestConnectionDataHandle *con,
                                        handle);
 }
 
-void 
+
+/**
+ * Handle ego edit request
+ *
+ * @param con rest connection handle
+ * @param url the url that is requested
+ * @param cls the RequestHandle
+ */
+static void 
 ego_edit_cont (struct RestConnectionDataHandle *con,
                  const char *url,
                  void *cls)
 {
   struct JsonApiObject *json_obj;
   struct JsonApiResource *json_res;
-  const char *egoname;
-  const char *subsys;
-  const char *newname;
   struct RequestHandle *handle = cls;
-  char term_data[handle->data_size+1];
   struct EgoEntry *ego_entry;
   struct MHD_Response *resp;
-  int ego_exists = GNUNET_NO;
   json_t *subsys_json;
   json_t *name_json;
+  const char *egoname;
+  const char *subsys;
+  const char *newname;
+  char term_data[handle->data_size+1];
+  int ego_exists = GNUNET_NO;
   
   if (strlen (GNUNET_REST_API_NS_IDENTITY) > strlen (handle->url))
   {
@@ -642,7 +652,13 @@ ego_delete_cont (struct RestConnectionDataHandle *con_handle,
 
 }
 
-void
+
+/**
+ * Handle rest request
+ *
+ * @param handle the request handle
+ */
+static void
 init_cont (struct RequestHandle *handle)
 {
   static const struct GNUNET_REST_RestConnectionHandler handlers[] = {
@@ -726,7 +742,7 @@ list_ego (void *cls,
  * @param proc_cls closure for callback function
  * @return GNUNET_OK if request accepted
  */
-void
+static void
 rest_identity_process_request(struct RestConnectionDataHandle *conndata_handle,
                               GNUNET_REST_ResultProcessor proc,
                               void *proc_cls)
diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c
index a5287b158..7f5372a33 100644
--- a/src/namestore/plugin_rest_namestore.c
+++ b/src/namestore/plugin_rest_namestore.c
@@ -220,7 +220,7 @@ struct RequestHandle
  * Cleanup lookup handle
  * @param handle Handle to clean up
  */
-void
+static void
 cleanup_handle (struct RequestHandle *handle)
 {
   struct RecordEntry *record_entry;
@@ -274,7 +274,7 @@ cleanup_handle (struct RequestHandle *handle)
  *
  * @param rd the GNSRECORD_Data
  */
-json_t *
+static json_t *
 gnsrecord_to_json (const struct GNUNET_GNSRECORD_Data *rd)
 {
   const char *typename;
@@ -351,7 +351,7 @@ cleanup_handle_delayed (void *cls,
  *
  * @param handle the RequestHandle
  */
-void
+static void
 namestore_list_response (void *cls,
                          const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
                          const char *rname,
@@ -967,7 +967,7 @@ testservice_id_task (void *cls, int result)
  * @param proc_cls closure for callback function
  * @return GNUNET_OK if request accepted
  */
-void
+static void
 rest_identity_process_request(struct RestConnectionDataHandle *conndata_handle,
                               GNUNET_REST_ResultProcessor proc,
                               void *proc_cls)