1 files changed, 74 insertions, 71 deletions

diff --git a/src/json/json_generator.c b/src/json/json_generator.c
index 61993c86a..72ee05dfc 100644
--- a/src/json/json_generator.c
+++ b/src/json/json_generator.c
@@ -36,15 +36,15 @@
  * @return json string that encodes @a data
  */
 json_t *
-GNUNET_JSON_from_data(const void *data,
-                      size_t size)
+GNUNET_JSON_from_data (const void *data,
+                       size_t size)
 {
   char *buf;
   json_t *json;
 
-  buf = GNUNET_STRINGS_data_to_string_alloc(data, size);
-  json = json_string(buf);
-  GNUNET_free(buf);
+  buf = GNUNET_STRINGS_data_to_string_alloc (data, size);
+  json = json_string (buf);
+  GNUNET_free (buf);
   return json;
 }
 
@@ -56,22 +56,23 @@ GNUNET_JSON_from_data(const void *data,
  * @return a json string with the timestamp in @a stamp
  */
 json_t *
-GNUNET_JSON_from_time_abs(struct GNUNET_TIME_Absolute stamp)
+GNUNET_JSON_from_time_abs (struct GNUNET_TIME_Absolute stamp)
 {
   json_t *j;
   char *mystr;
   int ret;
 
-  GNUNET_assert(GNUNET_OK ==
-                GNUNET_TIME_round_abs(&stamp));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_TIME_round_abs (&stamp));
   if (stamp.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us)
-    return json_string("/never/");
-  ret = GNUNET_asprintf(&mystr,
-                        "/Date(%llu)/",
-                        (unsigned long long)(stamp.abs_value_us / (1000LL * 1000LL)));
-  GNUNET_assert(ret > 0);
-  j = json_string(mystr);
-  GNUNET_free(mystr);
+    return json_string ("/never/");
+  ret = GNUNET_asprintf (&mystr,
+                         "/Date(%llu)/",
+                         (unsigned long long) (stamp.abs_value_us / (1000LL
+                                                                     * 1000LL)));
+  GNUNET_assert (ret > 0);
+  j = json_string (mystr);
+  GNUNET_free (mystr);
   return j;
 }
 
@@ -83,9 +84,9 @@ GNUNET_JSON_from_time_abs(struct GNUNET_TIME_Absolute stamp)
  * @return a json string with the timestamp in @a stamp
  */
 json_t *
-GNUNET_JSON_from_time_abs_nbo(struct GNUNET_TIME_AbsoluteNBO stamp)
+GNUNET_JSON_from_time_abs_nbo (struct GNUNET_TIME_AbsoluteNBO stamp)
 {
-  return GNUNET_JSON_from_time_abs(GNUNET_TIME_absolute_ntoh(stamp));
+  return GNUNET_JSON_from_time_abs (GNUNET_TIME_absolute_ntoh (stamp));
 }
 
 
@@ -96,22 +97,23 @@ GNUNET_JSON_from_time_abs_nbo(struct GNUNET_TIME_AbsoluteNBO stamp)
  * @return a json string with the timestamp in @a stamp
  */
 json_t *
-GNUNET_JSON_from_time_rel(struct GNUNET_TIME_Relative stamp)
+GNUNET_JSON_from_time_rel (struct GNUNET_TIME_Relative stamp)
 {
   json_t *j;
   char *mystr;
   int ret;
 
-  GNUNET_assert(GNUNET_OK ==
-                GNUNET_TIME_round_rel(&stamp));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_TIME_round_rel (&stamp));
   if (stamp.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
-    return json_string("/forever/");
-  ret = GNUNET_asprintf(&mystr,
-                        "/Delay(%llu)/",
-                        (unsigned long long)(stamp.rel_value_us / (1000LL * 1000LL)));
-  GNUNET_assert(ret > 0);
-  j = json_string(mystr);
-  GNUNET_free(mystr);
+    return json_string ("/forever/");
+  ret = GNUNET_asprintf (&mystr,
+                         "/Delay(%llu)/",
+                         (unsigned long long) (stamp.rel_value_us / (1000LL
+                                                                     * 1000LL)));
+  GNUNET_assert (ret > 0);
+  j = json_string (mystr);
+  GNUNET_free (mystr);
   return j;
 }
 
@@ -123,17 +125,17 @@ GNUNET_JSON_from_time_rel(struct GNUNET_TIME_Relative stamp)
  * @return corresponding JSON encoding
  */
 json_t *
-GNUNET_JSON_from_rsa_public_key(const struct GNUNET_CRYPTO_RsaPublicKey *pk)
+GNUNET_JSON_from_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *pk)
 {
   char *buf;
   size_t buf_len;
   json_t *ret;
 
-  buf_len = GNUNET_CRYPTO_rsa_public_key_encode(pk,
-                                                &buf);
-  ret = GNUNET_JSON_from_data(buf,
-                              buf_len);
-  GNUNET_free(buf);
+  buf_len = GNUNET_CRYPTO_rsa_public_key_encode (pk,
+                                                 &buf);
+  ret = GNUNET_JSON_from_data (buf,
+                               buf_len);
+  GNUNET_free (buf);
   return ret;
 }
 
@@ -145,17 +147,17 @@ GNUNET_JSON_from_rsa_public_key(const struct GNUNET_CRYPTO_RsaPublicKey *pk)
  * @return corresponding JSON encoding
  */
 json_t *
-GNUNET_JSON_from_rsa_signature(const struct GNUNET_CRYPTO_RsaSignature *sig)
+GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *sig)
 {
   char *buf;
   size_t buf_len;
   json_t *ret;
 
-  buf_len = GNUNET_CRYPTO_rsa_signature_encode(sig,
-                                               &buf);
-  ret = GNUNET_JSON_from_data(buf,
-                              buf_len);
-  GNUNET_free(buf);
+  buf_len = GNUNET_CRYPTO_rsa_signature_encode (sig,
+                                                &buf);
+  ret = GNUNET_JSON_from_data (buf,
+                               buf_len);
+  GNUNET_free (buf);
   return ret;
 }
 
@@ -167,9 +169,9 @@ GNUNET_JSON_from_rsa_signature(const struct GNUNET_CRYPTO_RsaSignature *sig)
  * @return corresponding JSON encoding
  */
 json_t *
-GNUNET_JSON_from_gnsrecord(const char* rname,
-                           const struct GNUNET_GNSRECORD_Data *rd,
-                           unsigned int rd_count)
+GNUNET_JSON_from_gnsrecord (const char*rname,
+                            const struct GNUNET_GNSRECORD_Data *rd,
+                            unsigned int rd_count)
 {
   struct GNUNET_TIME_Absolute expiration_time;
   const char *expiration_time_str;
@@ -179,36 +181,37 @@ GNUNET_JSON_from_gnsrecord(const char* rname,
   json_t *record;
   json_t *records;
 
-  data = json_object();
-  json_object_set_new(data,
-                      "record_name",
-                      json_string(rname));
-  records = json_array();
+  data = json_object ();
+  json_object_set_new (data,
+                       "record_name",
+                       json_string (rname));
+  records = json_array ();
   for (int i = 0; i < rd_count; i++)
-    {
-      value_str = GNUNET_GNSRECORD_value_to_string(rd[i].record_type,
-                                                   rd[i].data,
-                                                   rd[i].data_size);
-      expiration_time = GNUNET_GNSRECORD_record_get_expiration_time(1, &rd[i]);
-      expiration_time_str = GNUNET_STRINGS_absolute_time_to_string(expiration_time);
-      record_type_str = GNUNET_GNSRECORD_number_to_typename(rd[i].record_type);
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Packing %s %s %s %d\n",
-                 value_str, record_type_str, expiration_time_str, rd[i].flags);
-      record = json_pack("{s:s,s:s,s:s,s:i}",
-                         "value",
-                         value_str,
-                         "record_type",
-                         record_type_str,
-                         "expiration_time",
-                         expiration_time_str,
-                         "flag",
-                         rd[i].flags);
-      GNUNET_assert(NULL != record);
-      GNUNET_free(value_str);
-      json_array_append_new(records, record);
-    }
-  json_object_set_new(data, "data", records);
+  {
+    value_str = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
+                                                  rd[i].data,
+                                                  rd[i].data_size);
+    expiration_time = GNUNET_GNSRECORD_record_get_expiration_time (1, &rd[i]);
+    expiration_time_str = GNUNET_STRINGS_absolute_time_to_string (
+      expiration_time);
+    record_type_str = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Packing %s %s %s %d\n",
+                value_str, record_type_str, expiration_time_str, rd[i].flags);
+    record = json_pack ("{s:s,s:s,s:s,s:i}",
+                        "value",
+                        value_str,
+                        "record_type",
+                        record_type_str,
+                        "expiration_time",
+                        expiration_time_str,
+                        "flag",
+                        rd[i].flags);
+    GNUNET_assert (NULL != record);
+    GNUNET_free (value_str);
+    json_array_append_new (records, record);
+  }
+  json_object_set_new (data, "data", records);
   return data;
 }