1 files changed, 56 insertions, 54 deletions

diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index 3ca4bf729..064f38c9f 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -67,7 +67,8 @@ typedef void (*GNUNET_JSON_Cleaner) (void *cls,
 /**
  * @brief Entry in parser specification for #GNUNET_JSON_parse().
  */
-struct GNUNET_JSON_Specification {
+struct GNUNET_JSON_Specification
+{
   /**
    * Function for how to parse this type of entry.
    */
@@ -125,10 +126,10 @@ struct GNUNET_JSON_Specification {
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_JSON_parse(const json_t *root,
-                  struct GNUNET_JSON_Specification *spec,
-                  const char **error_json_name,
-                  unsigned int *error_line);
+GNUNET_JSON_parse (const json_t *root,
+                   struct GNUNET_JSON_Specification *spec,
+                   const char **error_json_name,
+                   unsigned int *error_line);
 
 
 /**
@@ -138,7 +139,7 @@ GNUNET_JSON_parse(const json_t *root,
  * @param spec specification of the parse operation
  */
 void
-GNUNET_JSON_parse_free(struct GNUNET_JSON_Specification *spec);
+GNUNET_JSON_parse_free (struct GNUNET_JSON_Specification *spec);
 
 
 /* ****************** Canonical parser specifications ******************* */
@@ -148,7 +149,7 @@ GNUNET_JSON_parse_free(struct GNUNET_JSON_Specification *spec);
  * End of a parser specification.
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_end(void);
+GNUNET_JSON_spec_end (void);
 
 
 /**
@@ -158,7 +159,7 @@ GNUNET_JSON_spec_end(void);
  * @return spec copy of @a spec with optional bit set
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_mark_optional(struct GNUNET_JSON_Specification spec);
+GNUNET_JSON_spec_mark_optional (struct GNUNET_JSON_Specification spec);
 
 
 /**
@@ -170,7 +171,7 @@ GNUNET_JSON_spec_mark_optional(struct GNUNET_JSON_Specification spec);
  * @param size number of bytes expected in @a obj
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_fixed(const char *name, void *obj, size_t size);
+GNUNET_JSON_spec_fixed (const char *name, void *obj, size_t size);
 
 
 /**
@@ -181,7 +182,7 @@ GNUNET_JSON_spec_fixed(const char *name, void *obj, size_t size);
  * @param obj pointer where to write the data (type of `*obj` will determine size)
  */
 #define GNUNET_JSON_spec_fixed_auto(name, obj) \
-  GNUNET_JSON_spec_fixed(name, obj, sizeof(*obj))
+  GNUNET_JSON_spec_fixed (name, obj, sizeof(*obj))
 
 
 /**
@@ -193,7 +194,7 @@ GNUNET_JSON_spec_fixed(const char *name, void *obj, size_t size);
  * @param[out] size where to store the number of bytes allocated for @a obj
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_varsize(const char *name, void **obj, size_t *size);
+GNUNET_JSON_spec_varsize (const char *name, void **obj, size_t *size);
 
 
 /**
@@ -203,7 +204,7 @@ GNUNET_JSON_spec_varsize(const char *name, void **obj, size_t *size);
  * @param strptr where to store a pointer to the field
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_string(const char *name, const char **strptr);
+GNUNET_JSON_spec_string (const char *name, const char **strptr);
 
 /**
  * JSON object.
@@ -212,7 +213,7 @@ GNUNET_JSON_spec_string(const char *name, const char **strptr);
  * @param[out] jsonp where to store the JSON found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_json(const char *name, json_t **jsonp);
+GNUNET_JSON_spec_json (const char *name, json_t **jsonp);
 
 
 /**
@@ -222,7 +223,7 @@ GNUNET_JSON_spec_json(const char *name, json_t **jsonp);
  * @param[out] u8 where to store the integer found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_uint8(const char *name, uint8_t *u8);
+GNUNET_JSON_spec_uint8 (const char *name, uint8_t *u8);
 
 
 /**
@@ -232,7 +233,7 @@ GNUNET_JSON_spec_uint8(const char *name, uint8_t *u8);
  * @param[out] u16 where to store the integer found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_uint16(const char *name, uint16_t *u16);
+GNUNET_JSON_spec_uint16 (const char *name, uint16_t *u16);
 
 
 /**
@@ -242,7 +243,7 @@ GNUNET_JSON_spec_uint16(const char *name, uint16_t *u16);
  * @param[out] u32 where to store the integer found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_uint32(const char *name, uint32_t *u32);
+GNUNET_JSON_spec_uint32 (const char *name, uint32_t *u32);
 
 
 /**
@@ -252,7 +253,7 @@ GNUNET_JSON_spec_uint32(const char *name, uint32_t *u32);
  * @param[out] u64 where to store the integer found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_uint64(const char *name, uint64_t *u64);
+GNUNET_JSON_spec_uint64 (const char *name, uint64_t *u64);
 
 
 /**
@@ -262,7 +263,7 @@ GNUNET_JSON_spec_uint64(const char *name, uint64_t *u64);
  * @param[out] boolean where to store the boolean found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_boolean(const char *name, int *boolean);
+GNUNET_JSON_spec_boolean (const char *name, int *boolean);
 
 
 /* ************ GNUnet-specific parser specifications ******************* */
@@ -274,8 +275,8 @@ GNUNET_JSON_spec_boolean(const char *name, int *boolean);
  * @param[out] at where to store the absolute time found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_absolute_time(const char *name,
-                               struct GNUNET_TIME_Absolute *at);
+GNUNET_JSON_spec_absolute_time (const char *name,
+                                struct GNUNET_TIME_Absolute *at);
 
 
 /**
@@ -285,8 +286,8 @@ GNUNET_JSON_spec_absolute_time(const char *name,
  * @param[out] at where to store the absolute time found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_absolute_time_nbo(const char *name,
-                                   struct GNUNET_TIME_AbsoluteNBO *at);
+GNUNET_JSON_spec_absolute_time_nbo (const char *name,
+                                    struct GNUNET_TIME_AbsoluteNBO *at);
 
 
 /**
@@ -296,8 +297,8 @@ GNUNET_JSON_spec_absolute_time_nbo(const char *name,
  * @param[out] rt where to store the relative time found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_relative_time(const char *name,
-                               struct GNUNET_TIME_Relative *rt);
+GNUNET_JSON_spec_relative_time (const char *name,
+                                struct GNUNET_TIME_Relative *rt);
 
 
 /**
@@ -307,8 +308,8 @@ GNUNET_JSON_spec_relative_time(const char *name,
  * @param pk where to store the RSA key found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_rsa_public_key(const char *name,
-                                struct GNUNET_CRYPTO_RsaPublicKey **pk);
+GNUNET_JSON_spec_rsa_public_key (const char *name,
+                                 struct GNUNET_CRYPTO_RsaPublicKey **pk);
 
 
 /**
@@ -318,8 +319,8 @@ GNUNET_JSON_spec_rsa_public_key(const char *name,
  * @param sig where to store the RSA signature found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_rsa_signature(const char *name,
-                               struct GNUNET_CRYPTO_RsaSignature **sig);
+GNUNET_JSON_spec_rsa_signature (const char *name,
+                                struct GNUNET_CRYPTO_RsaSignature **sig);
 
 
 /**
@@ -329,9 +330,9 @@ GNUNET_JSON_spec_rsa_signature(const char *name,
  * @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);
 
 
 /* ****************** Generic generator interface ******************* */
@@ -346,7 +347,7 @@ GNUNET_JSON_spec_gnsrecord(struct GNUNET_GNSRECORD_Data **rd,
  * @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);
 
 
 /**
@@ -357,7 +358,7 @@ GNUNET_JSON_from_data(const void *data, size_t size);
  * @return json string that encodes @a data
  */
 #define GNUNET_JSON_from_data_auto(ptr) \
-  GNUNET_JSON_from_data(ptr, sizeof(*ptr))
+  GNUNET_JSON_from_data (ptr, sizeof(*ptr))
 
 
 /**
@@ -367,7 +368,7 @@ GNUNET_JSON_from_data(const void *data, size_t size);
  * @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);
 
 
 /**
@@ -377,7 +378,7 @@ 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);
 
 
 /**
@@ -387,7 +388,7 @@ 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);
 
 
 /**
@@ -397,7 +398,7 @@ 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);
 
 
 /**
@@ -407,7 +408,7 @@ 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);
 
 /**
  * Convert Gns record to JSON.
@@ -417,16 +418,17 @@ 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);
 
 /* ******************* Helpers for MHD upload handling ******************* */
 
 /**
  * Return codes from #GNUNET_JSON_post_parser().
  */
-enum GNUNET_JSON_PostResult {
+enum GNUNET_JSON_PostResult
+{
   /**
    * Parsing successful, JSON result is in `*json`.
    */
@@ -470,12 +472,12 @@ enum GNUNET_JSON_PostResult {
  * @return result code indicating the status of the operation
  */
 enum GNUNET_JSON_PostResult
-GNUNET_JSON_post_parser(size_t buffer_max,
-                        struct MHD_Connection *connection,
-                        void **con_cls,
-                        const char *upload_data,
-                        size_t *upload_data_size,
-                        json_t **json);
+GNUNET_JSON_post_parser (size_t buffer_max,
+                         struct MHD_Connection *connection,
+                         void **con_cls,
+                         const char *upload_data,
+                         size_t *upload_data_size,
+                         json_t **json);
 
 
 /**
@@ -486,7 +488,7 @@ GNUNET_JSON_post_parser(size_t buffer_max,
  *        #GNUNET_JSON_post_parser(), to be cleaned up
  */
 void
-GNUNET_JSON_post_parser_cleanup(void *con_cls);
+GNUNET_JSON_post_parser_cleanup (void *con_cls);
 
 
 /* ****************** GETOPT JSON helper ******************* */
@@ -502,11 +504,11 @@ GNUNET_JSON_post_parser_cleanup(void *con_cls);
  * @param[out] val set to the JSON specified at the command line
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_JSON_getopt(char shortName,
-                   const char *name,
-                   const char *argumentHelp,
-                   const char *description,
-                   json_t **json);
+GNUNET_JSON_getopt (char shortName,
+                    const char *name,
+                    const char *argumentHelp,
+                    const char *description,
+                    json_t **json);
 
 #endif