1 files changed, 117 insertions, 116 deletions

diff --git a/src/json/json_gnsrecord.c b/src/json/json_gnsrecord.c
index 2ba4da591..5991683bb 100644
--- a/src/json/json_gnsrecord.c
+++ b/src/json/json_gnsrecord.c
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file json/json_gnsrecord.c
@@ -35,8 +35,7 @@
 #define GNUNET_JSON_GNSRECORD_RECORD_NAME "record_name"
 #define GNUNET_JSON_GNSRECORD_NEVER "never"
 
-struct GnsRecordInfo
-{
+struct GnsRecordInfo {
   char **name;
 
   unsigned int *rd_count;
@@ -46,20 +45,20 @@ struct GnsRecordInfo
 
 
 static void
-cleanup_recordinfo (struct GnsRecordInfo *gnsrecord_info)
+cleanup_recordinfo(struct GnsRecordInfo *gnsrecord_info)
 {
   if (NULL != *(gnsrecord_info->rd))
-  {
-    for (int i = 0; i < *(gnsrecord_info->rd_count); i++)
     {
-      if (NULL != (*(gnsrecord_info->rd))[i].data)
-        GNUNET_free ((char *) (*(gnsrecord_info->rd))[i].data);
+      for (int i = 0; i < *(gnsrecord_info->rd_count); i++)
+        {
+          if (NULL != (*(gnsrecord_info->rd))[i].data)
+            GNUNET_free((char *)(*(gnsrecord_info->rd))[i].data);
+        }
+      GNUNET_free(*(gnsrecord_info->rd));
+      *(gnsrecord_info->rd) = NULL;
     }
-    GNUNET_free (*(gnsrecord_info->rd));
-    *(gnsrecord_info->rd) = NULL;
-  }
   if (NULL != *(gnsrecord_info->name))
-    GNUNET_free (*(gnsrecord_info->name));
+    GNUNET_free(*(gnsrecord_info->name));
   *(gnsrecord_info->name) = NULL;
 }
 
@@ -73,7 +72,7 @@ cleanup_recordinfo (struct GnsRecordInfo *gnsrecord_info)
  * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
  */
 static int
-parse_record (json_t *data, struct GNUNET_GNSRECORD_Data *rd)
+parse_record(json_t *data, struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GNUNET_TIME_Absolute abs_expiration_time;
   struct GNUNET_TIME_Relative rel_expiration_time;
@@ -84,59 +83,59 @@ parse_record (json_t *data, struct GNUNET_GNSRECORD_Data *rd)
   int unpack_state = 0;
 
   //interpret single gns record
-  unpack_state = json_unpack (data,
-                              "{s:s, s:s, s:s, s?:i!}",
-                              GNUNET_JSON_GNSRECORD_VALUE,
-                              &value,
-                              GNUNET_JSON_GNSRECORD_TYPE,
-                              &record_type,
-                              GNUNET_JSON_GNSRECORD_EXPIRATION_TIME,
-                              &expiration_time,
-                              GNUNET_JSON_GNSRECORD_FLAG,
-                              &flag);
+  unpack_state = json_unpack(data,
+                             "{s:s, s:s, s:s, s?:i!}",
+                             GNUNET_JSON_GNSRECORD_VALUE,
+                             &value,
+                             GNUNET_JSON_GNSRECORD_TYPE,
+                             &record_type,
+                             GNUNET_JSON_GNSRECORD_EXPIRATION_TIME,
+                             &expiration_time,
+                             GNUNET_JSON_GNSRECORD_FLAG,
+                             &flag);
   if (0 != unpack_state)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error gnsdata object has a wrong format!\n");
-    return GNUNET_SYSERR;
-  }
-  rd->record_type = GNUNET_GNSRECORD_typename_to_number (record_type);
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Error gnsdata object has a wrong format!\n");
+      return GNUNET_SYSERR;
+    }
+  rd->record_type = GNUNET_GNSRECORD_typename_to_number(record_type);
   if (UINT32_MAX == rd->record_type)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unsupported type\n");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (rd->record_type,
-                                                     value,
-                                                     (void**)&rd->data,
-                                                     &rd->data_size))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Value invalid for record type\n");
-    return GNUNET_SYSERR;
-  }
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Unsupported type\n");
+      return GNUNET_SYSERR;
+    }
+  if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value(rd->record_type,
+                                                    value,
+                                                    (void**)&rd->data,
+                                                    &rd->data_size))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Value invalid for record type\n");
+      return GNUNET_SYSERR;
+    }
 
-  if (0 == strcmp (expiration_time, GNUNET_JSON_GNSRECORD_NEVER))
-  {
-    rd->expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
-  }
+  if (0 == strcmp(expiration_time, GNUNET_JSON_GNSRECORD_NEVER))
+    {
+      rd->expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+    }
   else if (GNUNET_OK ==
-           GNUNET_STRINGS_fancy_time_to_absolute (expiration_time,
-                                                  &abs_expiration_time))
-  {
-    rd->expiration_time = abs_expiration_time.abs_value_us;
-  }
+           GNUNET_STRINGS_fancy_time_to_absolute(expiration_time,
+                                                 &abs_expiration_time))
+    {
+      rd->expiration_time = abs_expiration_time.abs_value_us;
+    }
   else if (GNUNET_OK ==
-           GNUNET_STRINGS_fancy_time_to_relative (expiration_time,
-                                                  &rel_expiration_time))
-  {
-    rd->expiration_time = rel_expiration_time.rel_value_us;
-  }
+           GNUNET_STRINGS_fancy_time_to_relative(expiration_time,
+                                                 &rel_expiration_time))
+    {
+      rd->expiration_time = rel_expiration_time.rel_value_us;
+    }
   else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Expiration time invalid\n");
-    return GNUNET_SYSERR;
-  }
-  rd->flags = (enum GNUNET_GNSRECORD_Flags) flag;
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Expiration time invalid\n");
+      return GNUNET_SYSERR;
+    }
+  rd->flags = (enum GNUNET_GNSRECORD_Flags)flag;
   return GNUNET_OK;
 }
 
@@ -150,23 +149,23 @@ parse_record (json_t *data, struct GNUNET_GNSRECORD_Data *rd)
  * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
  */
 static int
-parse_record_data (struct GnsRecordInfo *gnsrecord_info, json_t *data)
+parse_record_data(struct GnsRecordInfo *gnsrecord_info, json_t *data)
 {
-  GNUNET_assert (NULL != data);
-  if (! json_is_array (data))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error gns record data JSON is not an array!\n");
-    return GNUNET_SYSERR;
-  }
-  *(gnsrecord_info->rd_count) = json_array_size (data);
-  *(gnsrecord_info->rd) = GNUNET_malloc (sizeof (struct GNUNET_GNSRECORD_Data) *
-                                         json_array_size (data));
+  GNUNET_assert(NULL != data);
+  if (!json_is_array(data))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Error gns record data JSON is not an array!\n");
+      return GNUNET_SYSERR;
+    }
+  *(gnsrecord_info->rd_count) = json_array_size(data);
+  *(gnsrecord_info->rd) = GNUNET_malloc(sizeof(struct GNUNET_GNSRECORD_Data) *
+                                        json_array_size(data));
   size_t index;
   json_t *value;
-  json_array_foreach (data, index, value)
+  json_array_foreach(data, index, value)
   {
-    if (GNUNET_OK != parse_record (value, &(*(gnsrecord_info->rd))[index]))
+    if (GNUNET_OK != parse_record(value, &(*(gnsrecord_info->rd))[index]))
       return GNUNET_SYSERR;
   }
   return GNUNET_OK;
@@ -174,42 +173,42 @@ parse_record_data (struct GnsRecordInfo *gnsrecord_info, json_t *data)
 
 
 static int
-parse_gnsrecordobject (void *cls,
-                       json_t *root,
-                       struct GNUNET_JSON_Specification *spec)
+parse_gnsrecordobject(void *cls,
+                      json_t *root,
+                      struct GNUNET_JSON_Specification *spec)
 {
   struct GnsRecordInfo *gnsrecord_info;
   int unpack_state = 0;
   const char *name;
   json_t *data;
 
-  GNUNET_assert (NULL != root);
-  if (! json_is_object (root))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error record JSON is not an object!\n");
-    return GNUNET_SYSERR;
-  }
+  GNUNET_assert(NULL != root);
+  if (!json_is_object(root))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Error record JSON is not an object!\n");
+      return GNUNET_SYSERR;
+    }
   //interpret single gns record
-  unpack_state = json_unpack (root,
-                              "{s:s, s:o!}",
-                              GNUNET_JSON_GNSRECORD_RECORD_NAME,
-                              &name,
-                              GNUNET_JSON_GNSRECORD_RECORD_DATA,
-                              &data);
+  unpack_state = json_unpack(root,
+                             "{s:s, s:o!}",
+                             GNUNET_JSON_GNSRECORD_RECORD_NAME,
+                             &name,
+                             GNUNET_JSON_GNSRECORD_RECORD_DATA,
+                             &data);
   if (0 != unpack_state)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error namestore records object has a wrong format!\n");
-    return GNUNET_SYSERR;
-  }
-  gnsrecord_info = (struct GnsRecordInfo *) spec->ptr;
-  *(gnsrecord_info->name) = GNUNET_strdup (name);
-  if (GNUNET_OK != parse_record_data (gnsrecord_info, data))
-  {
-    cleanup_recordinfo (gnsrecord_info);
-    return GNUNET_SYSERR;
-  }
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Error namestore records object has a wrong format!\n");
+      return GNUNET_SYSERR;
+    }
+  gnsrecord_info = (struct GnsRecordInfo *)spec->ptr;
+  *(gnsrecord_info->name) = GNUNET_strdup(name);
+  if (GNUNET_OK != parse_record_data(gnsrecord_info, data))
+    {
+      cleanup_recordinfo(gnsrecord_info);
+      return GNUNET_SYSERR;
+    }
   return GNUNET_OK;
 }
 
@@ -221,10 +220,11 @@ parse_gnsrecordobject (void *cls,
  * @param[out] spec where to free the data
  */
 static void
-clean_gnsrecordobject (void *cls, struct GNUNET_JSON_Specification *spec)
+clean_gnsrecordobject(void *cls, struct GNUNET_JSON_Specification *spec)
 {
-  struct GnsRecordInfo *gnsrecord_info = (struct GnsRecordInfo *) spec->ptr;
-  GNUNET_free (gnsrecord_info);
+  struct GnsRecordInfo *gnsrecord_info = (struct GnsRecordInfo *)spec->ptr;
+
+  GNUNET_free(gnsrecord_info);
 }
 
 
@@ -235,21 +235,22 @@ clean_gnsrecordobject (void *cls, struct GNUNET_JSON_Specification *spec)
  * @return JSON Specification
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_gnsrecord (struct GNUNET_GNSRECORD_Data **rd,
-                            unsigned int *rd_count,
-                            char **name)
+GNUNET_JSON_spec_gnsrecord(struct GNUNET_GNSRECORD_Data **rd,
+                           unsigned int *rd_count,
+                           char **name)
 {
-  struct GnsRecordInfo *gnsrecord_info = GNUNET_new (struct GnsRecordInfo);
+  struct GnsRecordInfo *gnsrecord_info = GNUNET_new(struct GnsRecordInfo);
+
   gnsrecord_info->rd = rd;
   gnsrecord_info->name = name;
   gnsrecord_info->rd_count = rd_count;
-  struct GNUNET_JSON_Specification ret = {.parser = &parse_gnsrecordobject,
-    .cleaner = &clean_gnsrecordobject,
-    .cls = NULL,
-    .field = NULL,
-    .ptr = (struct GnsRecordInfo *)
-      gnsrecord_info,
-    .ptr_size = 0,
-    .size_ptr = NULL};
+  struct GNUNET_JSON_Specification ret = { .parser = &parse_gnsrecordobject,
+                                           .cleaner = &clean_gnsrecordobject,
+                                           .cls = NULL,
+                                           .field = NULL,
+                                           .ptr = (struct GnsRecordInfo *)
+                                                  gnsrecord_info,
+                                           .ptr_size = 0,
+                                           .size_ptr = NULL };
   return ret;
 }