diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-06-21 15:56:41 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-06-21 15:56:41 +0200 |
commit | d6d7bf7df8e6ff09aa470b4334b9418646c617b5 (patch) | |
tree | 553ffbacab64cb729933225ab05f7a47353f28b6 /src | |
parent | 8af55509fc6f7a411ff2dbc5e8ccde5489290b20 (diff) | |
parent | 79fa977314009e631112918cce3eb0f0d5f296d7 (diff) | |
download | gnunet-d6d7bf7df8e6ff09aa470b4334b9418646c617b5.tar.gz gnunet-d6d7bf7df8e6ff09aa470b4334b9418646c617b5.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_crypto_lib.h | 3 | ||||
-rw-r--r-- | src/include/gnunet_json_lib.h | 18 | ||||
-rw-r--r-- | src/include/gnunet_strings_lib.h | 3 |
3 files changed, 17 insertions, 7 deletions
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index d11c6b58c..320701643 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h | |||
@@ -2172,7 +2172,8 @@ GNUNET_CRYPTO_rsa_signature_cmp (const struct GNUNET_CRYPTO_RsaSignature *s1, | |||
2172 | */ | 2172 | */ |
2173 | int | 2173 | int |
2174 | GNUNET_CRYPTO_rsa_private_key_cmp (const struct GNUNET_CRYPTO_RsaPrivateKey *p1, | 2174 | GNUNET_CRYPTO_rsa_private_key_cmp (const struct GNUNET_CRYPTO_RsaPrivateKey *p1, |
2175 | const struct GNUNET_CRYPTO_RsaPrivateKey *p2); | 2175 | const struct |
2176 | GNUNET_CRYPTO_RsaPrivateKey *p2); | ||
2176 | 2177 | ||
2177 | 2178 | ||
2178 | /** | 2179 | /** |
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h index 27996f18d..95d136239 100644 --- a/src/include/gnunet_json_lib.h +++ b/src/include/gnunet_json_lib.h | |||
@@ -173,7 +173,9 @@ GNUNET_JSON_spec_mark_optional (struct GNUNET_JSON_Specification spec); | |||
173 | * @param size number of bytes expected in @a obj | 173 | * @param size number of bytes expected in @a obj |
174 | */ | 174 | */ |
175 | struct GNUNET_JSON_Specification | 175 | struct GNUNET_JSON_Specification |
176 | GNUNET_JSON_spec_fixed (const char *name, void *obj, size_t size); | 176 | GNUNET_JSON_spec_fixed (const char *name, |
177 | void *obj, | ||
178 | size_t size); | ||
177 | 179 | ||
178 | 180 | ||
179 | /** | 181 | /** |
@@ -196,7 +198,9 @@ GNUNET_JSON_spec_fixed (const char *name, void *obj, size_t size); | |||
196 | * @param[out] size where to store the number of bytes allocated for @a obj | 198 | * @param[out] size where to store the number of bytes allocated for @a obj |
197 | */ | 199 | */ |
198 | struct GNUNET_JSON_Specification | 200 | struct GNUNET_JSON_Specification |
199 | GNUNET_JSON_spec_varsize (const char *name, void **obj, size_t *size); | 201 | GNUNET_JSON_spec_varsize (const char *name, |
202 | void **obj, | ||
203 | size_t *size); | ||
200 | 204 | ||
201 | 205 | ||
202 | /** | 206 | /** |
@@ -206,7 +210,9 @@ GNUNET_JSON_spec_varsize (const char *name, void **obj, size_t *size); | |||
206 | * @param strptr where to store a pointer to the field | 210 | * @param strptr where to store a pointer to the field |
207 | */ | 211 | */ |
208 | struct GNUNET_JSON_Specification | 212 | struct GNUNET_JSON_Specification |
209 | GNUNET_JSON_spec_string (const char *name, const char **strptr); | 213 | GNUNET_JSON_spec_string (const char *name, |
214 | const char **strptr); | ||
215 | |||
210 | 216 | ||
211 | /** | 217 | /** |
212 | * JSON object. | 218 | * JSON object. |
@@ -215,7 +221,8 @@ GNUNET_JSON_spec_string (const char *name, const char **strptr); | |||
215 | * @param[out] jsonp where to store the JSON found under @a name | 221 | * @param[out] jsonp where to store the JSON found under @a name |
216 | */ | 222 | */ |
217 | struct GNUNET_JSON_Specification | 223 | struct GNUNET_JSON_Specification |
218 | GNUNET_JSON_spec_json (const char *name, json_t **jsonp); | 224 | GNUNET_JSON_spec_json (const char *name, |
225 | json_t **jsonp); | ||
219 | 226 | ||
220 | 227 | ||
221 | /** | 228 | /** |
@@ -291,7 +298,8 @@ GNUNET_JSON_spec_int64 (const char *name, | |||
291 | * @param[out] boolean where to store the boolean found under @a name | 298 | * @param[out] boolean where to store the boolean found under @a name |
292 | */ | 299 | */ |
293 | struct GNUNET_JSON_Specification | 300 | struct GNUNET_JSON_Specification |
294 | GNUNET_JSON_spec_boolean (const char *name, int *boolean); | 301 | GNUNET_JSON_spec_boolean (const char *name, |
302 | int *boolean); | ||
295 | 303 | ||
296 | 304 | ||
297 | /* ************ GNUnet-specific parser specifications ******************* */ | 305 | /* ************ GNUnet-specific parser specifications ******************* */ |
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h index 4003590fc..663b44194 100644 --- a/src/include/gnunet_strings_lib.h +++ b/src/include/gnunet_strings_lib.h | |||
@@ -120,7 +120,8 @@ GNUNET_STRINGS_byte_size_fancy (unsigned long long size); | |||
120 | * string is returned. | 120 | * string is returned. |
121 | */ | 121 | */ |
122 | char * | 122 | char * |
123 | GNUNET_STRINGS_conv (const char *input, size_t len, | 123 | GNUNET_STRINGS_conv (const char *input, |
124 | size_t len, | ||
124 | const char *input_charset, | 125 | const char *input_charset, |
125 | const char *output_charset); | 126 | const char *output_charset); |
126 | 127 | ||