* nettle-types.h: Deleted some unnecessary parenthesis from

function typedefs.
(nettle_realloc_func): Moved typedef here...
* realloc.h: ...from here.

Rev: nettle/nettle-types.h:1.3
Rev: nettle/realloc.h:1.2

diff --git a/nettle-types.h b/nettle-types.h
index 2a9771523389468d625266ed168111e8c32a1ad5..4c4e0917036ec3ee4c2205733296a1f425f1b87e 100644 (file)
--- a/nettle-types.h
+++ b/nettle-types.h
@@ -30,17 +30,19 @@ extern "C" {
 #endif
 
 /* Randomness. Used by key generation and dsa signature creation. */
-typedef void (nettle_random_func)(void *ctx,
-                                 unsigned length, uint8_t *dst);
+typedef void nettle_random_func(void *ctx,
+                               unsigned length, uint8_t *dst);
 
 /* Progress report function, mainly for key generation. */
-typedef void (nettle_progress_func)(void *ctx,
-                                   int c);
+typedef void nettle_progress_func(void *ctx, int c);
+
+/* Realloc function, used by struct nettle_buffer. */
+typedef void *nettle_realloc_func(void *ctx, void *p, unsigned length);
 
 /* Ciphers */
-typedef void (nettle_set_key_func)(void *ctx,
-                                  unsigned length,
-                                  const uint8_t *key);
+typedef void nettle_set_key_func(void *ctx,
+                                unsigned length,
+                                const uint8_t *key);
 
 /* Uses a void * for cipher contexts.
 
@@ -48,37 +50,37 @@ typedef void (nettle_set_key_func)(void *ctx,
    context, but we use the same typedef for stream ciphers where the
    internal state changes during the encryption. */
 
-typedef void (nettle_crypt_func)(void *ctx,
-                                unsigned length, uint8_t *dst,
-                                const uint8_t *src);
+typedef void nettle_crypt_func(void *ctx,
+                              unsigned length, uint8_t *dst,
+                              const uint8_t *src);
 
 /* Hash algorithms */
-typedef void (nettle_hash_init_func)(void *ctx);
-typedef void (nettle_hash_update_func)(void *ctx,
-                                      unsigned length,
-                                      const uint8_t *src);
-typedef void (nettle_hash_digest_func)(void *ctx,
-                                      unsigned length, uint8_t *dst);
+typedef void nettle_hash_init_func(void *ctx);
+typedef void nettle_hash_update_func(void *ctx,
+                                    unsigned length,
+                                    const uint8_t *src);
+typedef void nettle_hash_digest_func(void *ctx,
+                                    unsigned length, uint8_t *dst);
 
 /* ASCII armor codecs. NOTE: Experimental and subject to change. */
 
-typedef unsigned (nettle_armor_length_func)(unsigned length);
-typedef void (nettle_armor_init_func)(void *ctx);
+typedef unsigned nettle_armor_length_func(unsigned length);
+typedef void nettle_armor_init_func(void *ctx);
 
-typedef unsigned (nettle_armor_encode_update_func)(void *ctx,
-                                                  uint8_t *dst,
-                                                  unsigned src_length,
-                                                  const uint8_t *src);
+typedef unsigned nettle_armor_encode_update_func(void *ctx,
+                                                uint8_t *dst,
+                                                unsigned src_length,
+                                                const uint8_t *src);
 
-typedef unsigned (nettle_armor_encode_final_func)(void *ctx, uint8_t *dst);
+typedef unsigned nettle_armor_encode_final_func(void *ctx, uint8_t *dst);
 
-typedef int (nettle_armor_decode_update_func)(void *ctx,
-                                             unsigned *dst_length,
-                                             uint8_t *dst,
-                                             unsigned src_length,
-                                             const uint8_t *src);
+typedef int nettle_armor_decode_update_func(void *ctx,
+                                           unsigned *dst_length,
+                                           uint8_t *dst,
+                                           unsigned src_length,
+                                           const uint8_t *src);
 
-typedef int (nettle_armor_decode_final_func)(void *ctx);
+typedef int nettle_armor_decode_final_func(void *ctx);
 
 #ifdef __cplusplus
 }

diff --git a/realloc.h b/realloc.h
index c8c6aa4ce5d04ffce5400f621ee96be1a887584a..5406ec838bcf15fbaa6b2aa3087b60e13ce27dfc 100644 (file)
--- a/realloc.h
+++ b/realloc.h
@@ -31,8 +31,6 @@
 extern "C" {
 #endif
 
-typedef void *nettle_realloc_func(void *ctx, void *p, unsigned length);
-
 nettle_realloc_func nettle_realloc;
 nettle_realloc_func nettle_xrealloc;