1 files changed, 160 insertions, 156 deletions

diff --git a/src/rest/plugin_rest_config.c b/src/rest/plugin_rest_config.c
index 55797f543..16f5d2ec1 100644
--- a/src/rest/plugin_rest_config.c
+++ b/src/rest/plugin_rest_config.c
@@ -35,13 +35,15 @@
 /**
  * @brief struct returned by the initialization function of the plugin
  */
-struct Plugin {
+struct Plugin
+{
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 };
 
 const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-struct RequestHandle {
+struct RequestHandle
+{
   /**
    * Handle to rest request
    */
@@ -75,12 +77,12 @@ struct RequestHandle {
  * @param handle Handle to clean up
  */
 static void
-cleanup_handle(struct RequestHandle *handle)
+cleanup_handle (struct RequestHandle *handle)
 {
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
   if (NULL != handle->url)
-    GNUNET_free(handle->url);
-  GNUNET_free(handle);
+    GNUNET_free (handle->url);
+  GNUNET_free (handle);
 }
 
 
@@ -91,46 +93,46 @@ cleanup_handle(struct RequestHandle *handle)
  * @param tc scheduler context
  */
 static void
-do_error(void *cls)
+do_error (void *cls)
 {
   struct RequestHandle *handle = cls;
   struct MHD_Response *resp;
 
-  resp = GNUNET_REST_create_response(NULL);
-  handle->proc(handle->proc_cls, resp, handle->response_code);
-  cleanup_handle(handle);
+  resp = GNUNET_REST_create_response (NULL);
+  handle->proc (handle->proc_cls, resp, handle->response_code);
+  cleanup_handle (handle);
 }
 
 
 static void
-add_sections(void *cls,
-             const char *section,
-             const char *option,
-             const char *value)
+add_sections (void *cls,
+              const char *section,
+              const char *option,
+              const char *value)
 {
   json_t *sections_obj = cls;
   json_t *sec_obj;
 
-  sec_obj = json_object_get(sections_obj, section);
+  sec_obj = json_object_get (sections_obj, section);
   if (NULL != sec_obj)
-    {
-      json_object_set_new(sec_obj, option, json_string(value));
-      return;
-    }
-  sec_obj = json_object();
-  json_object_set_new(sec_obj, option, json_string(value));
-  json_object_set_new(sections_obj, section, sec_obj);
+  {
+    json_object_set_new (sec_obj, option, json_string (value));
+    return;
+  }
+  sec_obj = json_object ();
+  json_object_set_new (sec_obj, option, json_string (value));
+  json_object_set_new (sections_obj, section, sec_obj);
 }
 
 static void
-add_section_contents(void *cls,
-                     const char *section,
-                     const char *option,
-                     const char *value)
+add_section_contents (void *cls,
+                      const char *section,
+                      const char *option,
+                      const char *value)
 {
   json_t *section_obj = cls;
 
-  json_object_set_new(section_obj, option, json_string(value));
+  json_object_set_new (section_obj, option, json_string (value));
 }
 
 /**
@@ -139,9 +141,9 @@ add_section_contents(void *cls,
  * @param handle the lookup handle
  */
 static void
-get_cont(struct GNUNET_REST_RequestHandle *con_handle,
-         const char *url,
-         void *cls)
+get_cont (struct GNUNET_REST_RequestHandle *con_handle,
+          const char *url,
+          void *cls)
 {
   struct MHD_Response *resp;
   struct RequestHandle *handle = cls;
@@ -149,50 +151,52 @@ get_cont(struct GNUNET_REST_RequestHandle *con_handle,
   char *response;
   json_t *result;
 
-  if (strlen(GNUNET_REST_API_NS_CONFIG) > strlen(handle->url))
-    {
-      handle->response_code = MHD_HTTP_BAD_REQUEST;
-      GNUNET_SCHEDULER_add_now(&do_error, handle);
-      return;
-    }
-  if (strlen(GNUNET_REST_API_NS_CONFIG) == strlen(handle->url))
-    {
-      result = json_object();
-      GNUNET_CONFIGURATION_iterate(cfg, &add_sections, result);
-    }
+  if (strlen (GNUNET_REST_API_NS_CONFIG) > strlen (handle->url))
+  {
+    handle->response_code = MHD_HTTP_BAD_REQUEST;
+    GNUNET_SCHEDULER_add_now (&do_error, handle);
+    return;
+  }
+  if (strlen (GNUNET_REST_API_NS_CONFIG) == strlen (handle->url))
+  {
+    result = json_object ();
+    GNUNET_CONFIGURATION_iterate (cfg, &add_sections, result);
+  }
   else
-    {
-      result = json_object();
-      section = &handle->url[strlen(GNUNET_REST_API_NS_CONFIG) + 1];
-      GNUNET_CONFIGURATION_iterate_section_values(cfg,
-                                                  section,
-                                                  &add_section_contents,
-                                                  result);
-    }
-  response = json_dumps(result, 0);
-  resp = GNUNET_REST_create_response(response);
-  handle->proc(handle->proc_cls, resp, MHD_HTTP_OK);
-  cleanup_handle(handle);
-  GNUNET_free(response);
-  json_decref(result);
+  {
+    result = json_object ();
+    section = &handle->url[strlen (GNUNET_REST_API_NS_CONFIG) + 1];
+    GNUNET_CONFIGURATION_iterate_section_values (cfg,
+                                                 section,
+                                                 &add_section_contents,
+                                                 result);
+  }
+  response = json_dumps (result, 0);
+  resp = GNUNET_REST_create_response (response);
+  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
+  cleanup_handle (handle);
+  GNUNET_free (response);
+  json_decref (result);
 }
 
 struct GNUNET_CONFIGURATION_Handle *
-set_value(struct GNUNET_CONFIGURATION_Handle *config,
-          const char *section,
-          const char *option,
-          json_t *value)
+set_value (struct GNUNET_CONFIGURATION_Handle *config,
+           const char *section,
+           const char *option,
+           json_t *value)
 {
-  if (json_is_string(value))
-    GNUNET_CONFIGURATION_set_value_string(config, section, option, json_string_value(value));
-  else if (json_is_number(value))
-    GNUNET_CONFIGURATION_set_value_number(config, section, option, json_integer_value(value));
-  else if (json_is_null(value))
-    GNUNET_CONFIGURATION_set_value_string(config, section, option, NULL);
-  else if (json_is_true(value))
-    GNUNET_CONFIGURATION_set_value_string(config, section, option, "yes");
-  else if (json_is_false(value))
-    GNUNET_CONFIGURATION_set_value_string(config, section, option, "no");
+  if (json_is_string (value))
+    GNUNET_CONFIGURATION_set_value_string (config, section, option,
+                                           json_string_value (value));
+  else if (json_is_number (value))
+    GNUNET_CONFIGURATION_set_value_number (config, section, option,
+                                           json_integer_value (value));
+  else if (json_is_null (value))
+    GNUNET_CONFIGURATION_set_value_string (config, section, option, NULL);
+  else if (json_is_true (value))
+    GNUNET_CONFIGURATION_set_value_string (config, section, option, "yes");
+  else if (json_is_false (value))
+    GNUNET_CONFIGURATION_set_value_string (config, section, option, "no");
   else
     return NULL;
   return config; // for error handling (0 -> success, 1 -> error)
@@ -204,13 +208,13 @@ set_value(struct GNUNET_CONFIGURATION_Handle *config,
  * @param handle the lookup handle
  */
 static void
-set_cont(struct GNUNET_REST_RequestHandle *con_handle,
-         const char *url,
-         void *cls)
+set_cont (struct GNUNET_REST_RequestHandle *con_handle,
+          const char *url,
+          void *cls)
 {
   struct RequestHandle *handle = cls;
   char term_data[handle->rest_handle->data_size + 1];
-  struct GNUNET_CONFIGURATION_Handle *out = GNUNET_CONFIGURATION_dup(cfg);
+  struct GNUNET_CONFIGURATION_Handle *out = GNUNET_CONFIGURATION_dup (cfg);
 
   json_error_t err;
   json_t *data_json;
@@ -221,87 +225,87 @@ set_cont(struct GNUNET_REST_RequestHandle *con_handle,
   char *cfg_fn;
 
   // invalid url
-  if (strlen(GNUNET_REST_API_NS_CONFIG) > strlen(handle->url))
-    {
-      handle->response_code = MHD_HTTP_BAD_REQUEST;
-      GNUNET_SCHEDULER_add_now(&do_error, handle);
-      return;
-    }
+  if (strlen (GNUNET_REST_API_NS_CONFIG) > strlen (handle->url))
+  {
+    handle->response_code = MHD_HTTP_BAD_REQUEST;
+    GNUNET_SCHEDULER_add_now (&do_error, handle);
+    return;
+  }
 
   // extract data from handle
   term_data[handle->rest_handle->data_size] = '\0';
-  GNUNET_memcpy(term_data,
-                handle->rest_handle->data,
-                handle->rest_handle->data_size);
-  data_json = json_loads(term_data, JSON_DECODE_ANY, &err);
+  GNUNET_memcpy (term_data,
+                 handle->rest_handle->data,
+                 handle->rest_handle->data_size);
+  data_json = json_loads (term_data, JSON_DECODE_ANY, &err);
 
   if (NULL == data_json)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "Unable to parse JSON Object from %s\n",
-                 term_data);
-      GNUNET_SCHEDULER_add_now(&do_error, handle);
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unable to parse JSON Object from %s\n",
+                term_data);
+    GNUNET_SCHEDULER_add_now (&do_error, handle);
+    return;
+  }
 
   // POST /config => {<section> : {<option> : <value>}}
-  if (strlen(GNUNET_REST_API_NS_CONFIG) == strlen(handle->url))   // POST /config
+  if (strlen (GNUNET_REST_API_NS_CONFIG) == strlen (handle->url))   // POST /config
+  {
+    // iterate over sections
+    json_object_foreach (data_json, section, sec_obj)
     {
-      // iterate over sections
-      json_object_foreach(data_json, section, sec_obj)
+      // iterate over options
+      json_object_foreach (sec_obj, option, value)
       {
-        // iterate over options
-        json_object_foreach(sec_obj, option, value)
+        out = set_value (out, section, option, value);
+        if (NULL == out)
         {
-          out = set_value(out, section, option, value);
-          if (NULL == out)
-            {
-              handle->response_code = MHD_HTTP_BAD_REQUEST;
-              GNUNET_SCHEDULER_add_now(&do_error, handle);
-              json_decref(data_json);
-              return;
-            }
+          handle->response_code = MHD_HTTP_BAD_REQUEST;
+          GNUNET_SCHEDULER_add_now (&do_error, handle);
+          json_decref (data_json);
+          return;
         }
       }
     }
+  }
   else // POST /config/<section> => {<option> : <value>}
+  {
+    // extract the "<section>" part from the url
+    section = &handle->url[strlen (GNUNET_REST_API_NS_CONFIG) + 1];
+    // iterate over options
+    json_object_foreach (data_json, option, value)
     {
-      // extract the "<section>" part from the url
-      section = &handle->url[strlen(GNUNET_REST_API_NS_CONFIG) + 1];
-      // iterate over options
-      json_object_foreach(data_json, option, value)
+      out = set_value (out, section, option, value);
+      if (NULL == out)
       {
-        out = set_value(out, section, option, value);
-        if (NULL == out)
-          {
-            handle->response_code = MHD_HTTP_BAD_REQUEST;
-            GNUNET_SCHEDULER_add_now(&do_error, handle);
-            json_decref(data_json);
-            return;
-          }
+        handle->response_code = MHD_HTTP_BAD_REQUEST;
+        GNUNET_SCHEDULER_add_now (&do_error, handle);
+        json_decref (data_json);
+        return;
       }
     }
-  json_decref(data_json);
+  }
+  json_decref (data_json);
 
 
   // get cfg file path
   cfg_fn = NULL;
-  const char *xdg = getenv("XDG_CONFIG_HOME");
+  const char *xdg = getenv ("XDG_CONFIG_HOME");
   if (NULL != xdg)
-    GNUNET_asprintf(&cfg_fn,
-                    "%s%s%s",
-                    xdg,
-                    DIR_SEPARATOR_STR,
-                    GNUNET_OS_project_data_get()->config_file);
+    GNUNET_asprintf (&cfg_fn,
+                     "%s%s%s",
+                     xdg,
+                     DIR_SEPARATOR_STR,
+                     GNUNET_OS_project_data_get ()->config_file);
   else
-    cfg_fn = GNUNET_strdup(GNUNET_OS_project_data_get()->user_config_file);
+    cfg_fn = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
 
-  GNUNET_CONFIGURATION_write(out, cfg_fn);
+  GNUNET_CONFIGURATION_write (out, cfg_fn);
   cfg = out;
-  handle->proc(handle->proc_cls,
-               GNUNET_REST_create_response(NULL),
-               MHD_HTTP_OK);
-  cleanup_handle(handle);
+  handle->proc (handle->proc_cls,
+                GNUNET_REST_create_response (NULL),
+                MHD_HTTP_OK);
+  cleanup_handle (handle);
 }
 
 /**
@@ -310,19 +314,19 @@ set_cont(struct GNUNET_REST_RequestHandle *con_handle,
  * @param handle the lookup handle
  */
 static void
-options_cont(struct GNUNET_REST_RequestHandle *con_handle,
-             const char *url,
-             void *cls)
+options_cont (struct GNUNET_REST_RequestHandle *con_handle,
+              const char *url,
+              void *cls)
 {
   struct MHD_Response *resp;
   struct RequestHandle *handle = cls;
 
-  resp = GNUNET_REST_create_response(NULL);
-  MHD_add_response_header(resp,
-                          "Access-Control-Allow-Methods",
-                          MHD_HTTP_METHOD_GET);
-  handle->proc(handle->proc_cls, resp, MHD_HTTP_OK);
-  cleanup_handle(handle);
+  resp = GNUNET_REST_create_response (NULL);
+  MHD_add_response_header (resp,
+                           "Access-Control-Allow-Methods",
+                           MHD_HTTP_METHOD_GET);
+  handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
+  cleanup_handle (handle);
 }
 
 
@@ -338,9 +342,9 @@ options_cont(struct GNUNET_REST_RequestHandle *con_handle,
  * @return #GNUNET_OK if request accepted
  */
 static void
-rest_config_process_request(struct GNUNET_REST_RequestHandle *conndata_handle,
-                            GNUNET_REST_ResultProcessor proc,
-                            void *proc_cls)
+rest_config_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
+                             GNUNET_REST_ResultProcessor proc,
+                             void *proc_cls)
 {
   static const struct GNUNET_REST_RequestHandler handlers[] = {
     { MHD_HTTP_METHOD_GET, GNUNET_REST_API_NS_CONFIG, &get_cont },
@@ -348,22 +352,22 @@ rest_config_process_request(struct GNUNET_REST_RequestHandle *conndata_handle,
     { MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_CONFIG, &options_cont },
     GNUNET_REST_HANDLER_END
   };
-  struct RequestHandle *handle = GNUNET_new(struct RequestHandle);
+  struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
   struct GNUNET_REST_RequestHandlerError err;
 
   handle->proc_cls = proc_cls;
   handle->proc = proc;
   handle->rest_handle = conndata_handle;
-  handle->url = GNUNET_strdup(conndata_handle->url);
-  if (handle->url[strlen(handle->url) - 1] == '/')
-    handle->url[strlen(handle->url) - 1] = '\0';
+  handle->url = GNUNET_strdup (conndata_handle->url);
+  if (handle->url[strlen (handle->url) - 1] == '/')
+    handle->url[strlen (handle->url) - 1] = '\0';
 
   if (GNUNET_NO ==
-      GNUNET_REST_handle_request(conndata_handle, handlers, &err, handle))
-    {
-      handle->response_code = err.error_code;
-      GNUNET_SCHEDULER_add_now(&do_error, handle);
-    }
+      GNUNET_REST_handle_request (conndata_handle, handlers, &err, handle))
+  {
+    handle->response_code = err.error_code;
+    GNUNET_SCHEDULER_add_now (&do_error, handle);
+  }
 }
 
 
@@ -374,7 +378,7 @@ rest_config_process_request(struct GNUNET_REST_RequestHandle *conndata_handle,
  * @return NULL on error, otherwise the plugin context
  */
 void *
-libgnunet_plugin_rest_config_init(void *cls)
+libgnunet_plugin_rest_config_init (void *cls)
 {
   static struct Plugin plugin;
 
@@ -383,13 +387,13 @@ libgnunet_plugin_rest_config_init(void *cls)
 
   if (NULL != plugin.cfg)
     return NULL; /* can only initialize once! */
-  memset(&plugin, 0, sizeof(struct Plugin));
+  memset (&plugin, 0, sizeof(struct Plugin));
   plugin.cfg = cfg;
-  api = GNUNET_new(struct GNUNET_REST_Plugin);
+  api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_CONFIG;
   api->process_request = &rest_config_process_request;
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("CONFIG REST API initialized\n"));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("CONFIG REST API initialized\n"));
   return api;
 }
 
@@ -401,14 +405,14 @@ libgnunet_plugin_rest_config_init(void *cls)
  * @return always NULL
  */
 void *
-libgnunet_plugin_rest_config_done(void *cls)
+libgnunet_plugin_rest_config_done (void *cls)
 {
   struct GNUNET_REST_Plugin *api = cls;
   struct Plugin *plugin = api->cls;
 
   plugin->cfg = NULL;
-  GNUNET_free(api);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "CONFIG REST plugin is finished\n");
+  GNUNET_free (api);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CONFIG REST plugin is finished\n");
   return NULL;
 }