[LEN] to [static LEN] on some function parameters

Also add STATIC_ARRAY macro to hide it in c++ compilation.

diff --git a/src/auth/mech-rpa.c b/src/auth/mech-rpa.c
index 743b323f067fa0aac5ca12aa102520c4a28af597..98b6f9e44063320c440859b090e48377285fc79d 100644 (file)
--- a/src/auth/mech-rpa.c
+++ b/src/auth/mech-rpa.c
@@ -62,7 +62,7 @@ void *ucs2be_str(pool_t pool, const char *str, size_t *size);
  * Compute client -> server authentication response.
  */
 static void rpa_user_response(struct rpa_auth_request *request,
-                             unsigned char digest[MD5_RESULTLEN])
+                             unsigned char digest[STATIC_ARRAY MD5_RESULTLEN])
 {
        struct md5_context ctx;
        unsigned char z[48];
@@ -86,7 +86,7 @@ static void rpa_user_response(struct rpa_auth_request *request,
  * Compute server -> client authentication response.
  */
 static void rpa_server_response(struct rpa_auth_request *request,
-                               unsigned char digest[MD5_RESULTLEN])
+                               unsigned char digest[STATIC_ARRAY MD5_RESULTLEN])
 {
        struct md5_context ctx;
        unsigned char tmp[MD5_RESULTLEN];

diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index ec47e2c34735a42f3c3c9e4ddd3735ac816f7419..a9068d72e1f44bbc40710e68c7bc68ce60e8e894 100644 (file)
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -252,7 +252,7 @@ void passdb_deinit(struct passdb_module *passdb)
        passdb->iface = passdb_iface_deinit;
 }
 
-void passdbs_generate_md5(unsigned char md5[MD5_RESULTLEN])
+void passdbs_generate_md5(unsigned char md5[STATIC_ARRAY MD5_RESULTLEN])
 {
        struct md5_context ctx;
        struct passdb_module *const *passdbs;

diff --git a/src/auth/passdb.h b/src/auth/passdb.h
index 60f05b3b784a74dd9c358ae980cfc2ae3a418fee..57b25391e1e18ea0b49931322132aa99b464b062 100644 (file)
--- a/src/auth/passdb.h
+++ b/src/auth/passdb.h
@@ -102,7 +102,7 @@ void passdb_deinit(struct passdb_module *passdb);
 void passdb_register_module(struct passdb_module_interface *iface);
 void passdb_unregister_module(struct passdb_module_interface *iface);
 
-void passdbs_generate_md5(unsigned char md5[MD5_RESULTLEN]);
+void passdbs_generate_md5(unsigned char md5[STATIC_ARRAY MD5_RESULTLEN]);
 
 void passdbs_init(void);
 void passdbs_deinit(void);

diff --git a/src/auth/userdb.c b/src/auth/userdb.c
index 5b45ddba72804449d4bd61a5f65d498b39f961d4..29e9b2e066806630ecaddbe56a6496f2d7174794 100644 (file)
--- a/src/auth/userdb.c
+++ b/src/auth/userdb.c
@@ -194,7 +194,7 @@ void userdb_deinit(struct userdb_module *userdb)
        userdb->iface = &userdb_iface_deinit;
 }
 
-void userdbs_generate_md5(unsigned char md5[MD5_RESULTLEN])
+void userdbs_generate_md5(unsigned char md5[STATIC_ARRAY MD5_RESULTLEN])
 {
        struct md5_context ctx;
        struct userdb_module *const *userdbs;

diff --git a/src/auth/userdb.h b/src/auth/userdb.h
index 45ba70b3adb94030d93155ec6aaaa28768f7e92c..ac527011e8786b274881cf5b11746ac496ca631a 100644 (file)
--- a/src/auth/userdb.h
+++ b/src/auth/userdb.h
@@ -81,7 +81,7 @@ void userdb_deinit(struct userdb_module *userdb);
 void userdb_register_module(struct userdb_module_interface *iface);
 void userdb_unregister_module(struct userdb_module_interface *iface);
 
-void userdbs_generate_md5(unsigned char md5[MD5_RESULTLEN]);
+void userdbs_generate_md5(unsigned char md5[STATIC_ARRAY MD5_RESULTLEN]);
 
 void userdbs_init(void);
 void userdbs_deinit(void);

diff --git a/src/lib-storage/index/mbox/mbox-md5-all.c b/src/lib-storage/index/mbox/mbox-md5-all.c
index e9831ffbf37fd7dc41d216f5e418face198248af..c8e744ef8031bb01d01eed9bcc6704a5cc7c839d 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-md5-all.c
+++ b/src/lib-storage/index/mbox/mbox-md5-all.c
@@ -26,7 +26,7 @@ static void mbox_md5_all_more(struct mbox_md5_context *ctx,
 }
 
 static void mbox_md5_all_finish(struct mbox_md5_context *ctx,
-                               unsigned char result[16])
+                               unsigned char result[STATIC_ARRAY 16])
 {
        md5_final(&ctx->hdr_md5_ctx, result);
        i_free(ctx);

diff --git a/src/lib-storage/index/mbox/mbox-md5-apop3d.c b/src/lib-storage/index/mbox/mbox-md5-apop3d.c
index e980d0b5961935ab7f269c6d30391712b7189897..7786a6c195a199325a06f806c7b66a223bd83154 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-md5-apop3d.c
+++ b/src/lib-storage/index/mbox/mbox-md5-apop3d.c
@@ -106,7 +106,7 @@ static void mbox_md5_apop3d_more(struct mbox_md5_context *ctx,
 }
 
 static void mbox_md5_apop3d_finish(struct mbox_md5_context *ctx,
-                                  unsigned char result[16])
+                                  unsigned char result[STATIC_ARRAY 16])
 {
        md5_final(&ctx->hdr_md5_ctx, result);
        i_free(ctx);

diff --git a/src/lib-storage/index/mbox/mbox-md5.h b/src/lib-storage/index/mbox/mbox-md5.h
index debd2101a32cd7bb623b47b15aaf21c98a421453..7584052e64bd498576c86d829979e78a20af2937 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-md5.h
+++ b/src/lib-storage/index/mbox/mbox-md5.h
@@ -8,7 +8,7 @@ struct mbox_md5_vfuncs {
        void (*more)(struct mbox_md5_context *ctx,
                     struct message_header_line *hdr);
        void (*finish)(struct mbox_md5_context *ctx,
-                      unsigned char result[16]);
+                      unsigned char result[STATIC_ARRAY 16]);
 };
 
 extern struct mbox_md5_vfuncs mbox_md5_apop3d;

diff --git a/src/lib/guid.c b/src/lib/guid.c
index b0524dbb51fd384032c175873923c94d753479f3..86d746412e8346d001b67a1b9ffa21fa7b901255 100644 (file)
--- a/src/lib/guid.c
+++ b/src/lib/guid.c
@@ -36,7 +36,7 @@ const char *guid_generate(void)
 }
 
 void guid_128_host_hash_get(const char *host,
-                           unsigned char hash_r[GUID_128_HOST_HASH_SIZE])
+                           unsigned char hash_r[STATIC_ARRAY GUID_128_HOST_HASH_SIZE])
 {
        unsigned char full_hash[SHA1_RESULTLEN];
 

diff --git a/src/lib/guid.h b/src/lib/guid.h
index 28fc4a11651c09b65d339dfcf93488f55a2d8b15..867e3d0cb20f5fa0c99bb09ecf6707e59c7658fc 100644 (file)
--- a/src/lib/guid.h
+++ b/src/lib/guid.h
@@ -37,6 +37,6 @@ int guid_128_cmp(const guid_128_t guid1, const guid_128_t guid2) ATTR_PURE;
 
 /* Return the hash of host used by guid_128_generate(). */
 void guid_128_host_hash_get(const char *host,
-                           unsigned char hash_r[GUID_128_HOST_HASH_SIZE]);
+                           unsigned char hash_r[STATIC_ARRAY GUID_128_HOST_HASH_SIZE]);
 
 #endif

diff --git a/src/lib/macros.h b/src/lib/macros.h
index f8e4689c193f5ce60edf4c929256ebbc986de762..2faf0c8cf17808aa4f59c3d2ac30dcfdc2ee6796 100644 (file)
--- a/src/lib/macros.h
+++ b/src/lib/macros.h
@@ -226,4 +226,10 @@
 #  define DOVECOT_PREREQ(maj, min) 0
 #endif
 
+#ifdef __cplusplus
+#  define STATIC_ARRAY
+#else
+#  define STATIC_ARRAY static
+#endif
+
 #endif

diff --git a/src/lib/md4.c b/src/lib/md4.c
index fade4d44512f5344e3c06cf22c19a90ccb07415b..de59b38c81fd7df5bafb093181fb0708b0ddfa1e 100644 (file)
--- a/src/lib/md4.c
+++ b/src/lib/md4.c
@@ -208,7 +208,7 @@ void md4_update(struct md4_context *ctx, const void *data, size_t size)
        memcpy(ctx->buffer, data, size);
 }
 
-void md4_final(struct md4_context *ctx, unsigned char result[MD4_RESULTLEN])
+void md4_final(struct md4_context *ctx, unsigned char result[STATIC_ARRAY MD4_RESULTLEN])
 {
        /* @UNSAFE */
        unsigned long used, free;
@@ -261,7 +261,7 @@ void md4_final(struct md4_context *ctx, unsigned char result[MD4_RESULTLEN])
 }
 
 void md4_get_digest(const void *data, size_t size,
-                   unsigned char result[MD4_RESULTLEN])
+                   unsigned char result[STATIC_ARRAY MD4_RESULTLEN])
 {
        struct md4_context ctx;
 

diff --git a/src/lib/md4.h b/src/lib/md4.h
index 771e08c850eb124356abe051c25527d1344abc81..1530d0d0ff5a790d1e685497070e0fdb99740ff7 100644 (file)
--- a/src/lib/md4.h
+++ b/src/lib/md4.h
@@ -22,10 +22,11 @@ struct md4_context {
 
 void md4_init(struct md4_context *ctx);
 void md4_update(struct md4_context *ctx, const void *data, size_t size);
-void md4_final(struct md4_context *ctx, unsigned char result[MD4_RESULTLEN]);
+void md4_final(struct md4_context *ctx,
+               unsigned char result[STATIC_ARRAY MD4_RESULTLEN]);
 
 void md4_get_digest(const void *data, size_t size,
-                   unsigned char result[MD4_RESULTLEN]);
+                   unsigned char result[STATIC_ARRAY MD4_RESULTLEN]);
 
 extern const struct hash_method hash_method_md4;
 

diff --git a/src/lib/md5.c b/src/lib/md5.c
index 6957e054254e486d741bb9809e6e963d3d42f62b..16264290c557727bd9e3e26d799e1bcde80464c3 100644 (file)
--- a/src/lib/md5.c
+++ b/src/lib/md5.c
@@ -220,7 +220,7 @@ void md5_update(struct md5_context *ctx, const void *data, size_t size)
        memcpy(ctx->buffer, data, size);
 }
 
-void md5_final(struct md5_context *ctx, unsigned char result[MD5_RESULTLEN])
+void md5_final(struct md5_context *ctx, unsigned char result[STATIC_ARRAY MD5_RESULTLEN])
 {
        /* @UNSAFE */
        unsigned long used, free;
@@ -273,7 +273,7 @@ void md5_final(struct md5_context *ctx, unsigned char result[MD5_RESULTLEN])
 }
 
 void md5_get_digest(const void *data, size_t size,
-                   unsigned char result[MD5_RESULTLEN])
+                   unsigned char result[STATIC_ARRAY MD5_RESULTLEN])
 {
        struct md5_context ctx;
 

diff --git a/src/lib/md5.h b/src/lib/md5.h
index 3da87fba375e14fb760d5b08cebe38b8061b69c6..682a6c5fe9429b62f2ab0664ad57f0a6325d1b10 100644 (file)
--- a/src/lib/md5.h
+++ b/src/lib/md5.h
@@ -22,10 +22,11 @@ struct md5_context {
 
 void md5_init(struct md5_context *ctx);
 void md5_update(struct md5_context *ctx, const void *data, size_t size);
-void md5_final(struct md5_context *ctx, unsigned char result[MD5_RESULTLEN]);
+void md5_final(struct md5_context *ctx,
+              unsigned char result[STATIC_ARRAY MD5_RESULTLEN]);
 
 void md5_get_digest(const void *data, size_t size,
-                   unsigned char result[MD5_RESULTLEN]);
+                   unsigned char result[STATIC_ARRAY MD5_RESULTLEN]);
 
 extern const struct hash_method hash_method_md5;
 

diff --git a/src/lib/sha1.c b/src/lib/sha1.c
index 947f3f7d8fb114f934fe1ee50101d7925f3998e5..edb1735e7fb30081a507a2d0693b9df97a91cf81 100644 (file)
--- a/src/lib/sha1.c
+++ b/src/lib/sha1.c
@@ -253,7 +253,7 @@ sha1_result(struct sha1_ctxt *ctxt, void *digest0)
 }
 
 void sha1_get_digest(const void *data, size_t size,
-                    unsigned char result[SHA1_RESULTLEN])
+                    unsigned char result[STATIC_ARRAY SHA1_RESULTLEN])
 {
        struct sha1_ctxt ctx;
 

diff --git a/src/lib/sha1.h b/src/lib/sha1.h
index 539f3c50c535c5c00a396730be6ae340995eca27..73b3110582c0b1b11da4b8fff7e2b82a044af23f 100644 (file)
--- a/src/lib/sha1.h
+++ b/src/lib/sha1.h
@@ -77,7 +77,7 @@ typedef struct sha1_ctxt SHA1_CTX;
 #define        SHA1_RESULTLEN  (160/8)
 
 extern void sha1_get_digest(const void *, size_t,
-       unsigned char [SHA1_RESULTLEN]);
+       unsigned char [STATIC_ARRAY SHA1_RESULTLEN]);
 
 extern const struct hash_method hash_method_sha1;
 

diff --git a/src/lib/sha2.c b/src/lib/sha2.c
index 9ea500d6f095dab9f5a1fae2ade88ca20f66f14e..c3aa91dee548f96cbd35cfec70a47d17a121af4a 100644 (file)
--- a/src/lib/sha2.c
+++ b/src/lib/sha2.c
@@ -265,7 +265,7 @@ void sha256_loop(struct sha256_ctx *ctx, const void *data,
 }
 
 void sha256_result(struct sha256_ctx *ctx,
-                  unsigned char digest[SHA256_RESULTLEN])
+                  unsigned char digest[STATIC_ARRAY SHA256_RESULTLEN])
 {
        size_t block_nb;
        size_t pm_len;
@@ -290,7 +290,7 @@ void sha256_result(struct sha256_ctx *ctx,
 }
 
 void sha256_get_digest(const void *data, size_t size,
-                      unsigned char digest[SHA256_RESULTLEN])
+                      unsigned char digest[STATIC_ARRAY SHA256_RESULTLEN])
 {
        struct sha256_ctx ctx;
 
@@ -390,7 +390,7 @@ void sha512_loop(struct sha512_ctx *ctx, const void *data,
 }
 
 void sha512_result(struct sha512_ctx *ctx,
-                  unsigned char digest[SHA512_RESULTLEN])
+                  unsigned char digest[STATIC_ARRAY SHA512_RESULTLEN])
 {
        unsigned int block_nb;
        unsigned int pm_len;
@@ -415,7 +415,7 @@ void sha512_result(struct sha512_ctx *ctx,
 }
 
 void sha512_get_digest(const void *data, size_t size,
-                      unsigned char digest[SHA512_RESULTLEN])
+                      unsigned char digest[STATIC_ARRAY SHA512_RESULTLEN])
 {
        struct sha512_ctx ctx;
 

diff --git a/src/lib/sha2.h b/src/lib/sha2.h
index 3ee937441d6d82b550f3b2e588ec0dc1fc2c3c1f..b04f93ae5a0d0076ca4684ce0e55a8b0ac180418 100644 (file)
--- a/src/lib/sha2.h
+++ b/src/lib/sha2.h
@@ -59,18 +59,18 @@ struct sha512_ctx {
 void sha256_init(struct sha256_ctx *ctx);
 void sha256_loop(struct sha256_ctx *ctx, const void *data, size_t len);
 void sha256_result(struct sha256_ctx *ctx,
-                  unsigned char digest[SHA256_RESULTLEN]);
+                  unsigned char digest[STATIC_ARRAY SHA256_RESULTLEN]);
 
 void sha256_get_digest(const void *data, size_t size,
-                      unsigned char digest[SHA256_RESULTLEN]);
+                      unsigned char digest[STATIC_ARRAY SHA256_RESULTLEN]);
 
 void sha512_init(struct sha512_ctx *ctx);
 void sha512_loop(struct sha512_ctx *ctx, const void *data, size_t len);
 void sha512_result(struct sha512_ctx *ctx,
-                  unsigned char digest[SHA512_RESULTLEN]);
+                  unsigned char digest[STATIC_ARRAY SHA512_RESULTLEN]);
 
 void sha512_get_digest(const void *data, size_t size,
-                      unsigned char digest[SHA512_RESULTLEN]);
+                      unsigned char digest[STATIC_ARRAY SHA512_RESULTLEN]);
 
 extern const struct hash_method hash_method_sha256;
 extern const struct hash_method hash_method_sha512;

diff --git a/src/plugins/pop3-migration/pop3-migration-plugin.c b/src/plugins/pop3-migration/pop3-migration-plugin.c
index 8a2795a4f745c3b34a67fff3e1d30b1239c2efa3..5e0e2b33a3922c0d495c4728f6e9a0e6dd568069 100644 (file)
--- a/src/plugins/pop3-migration/pop3-migration-plugin.c
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.c
@@ -177,7 +177,7 @@ pop3_header_filter_callback(struct header_filter_istream *input ATTR_UNUSED,
 
 int pop3_migration_get_hdr_sha1(uint32_t mail_seq, struct istream *input,
                                uoff_t hdr_size,
-                               unsigned char sha1_r[SHA1_RESULTLEN],
+                               unsigned char sha1_r[STATIC_ARRAY SHA1_RESULTLEN],
                                bool *have_eoh_r)
 {
        struct istream *input2;
@@ -231,7 +231,7 @@ static unsigned int get_cache_idx(struct mail *mail)
 }
 
 static int
-get_hdr_sha1(struct mail *mail, unsigned char sha1_r[SHA1_RESULTLEN])
+get_hdr_sha1(struct mail *mail, unsigned char sha1_r[STATIC_ARRAY SHA1_RESULTLEN])
 {
        struct istream *input;
        struct message_size hdr_size;
@@ -290,7 +290,7 @@ get_hdr_sha1(struct mail *mail, unsigned char sha1_r[SHA1_RESULTLEN])
 
 static bool
 get_cached_hdr_sha1(struct mail *mail, buffer_t *cache_buf,
-                   unsigned char sha1_r[SHA1_RESULTLEN])
+                   unsigned char sha1_r[STATIC_ARRAY SHA1_RESULTLEN])
 {
        struct index_mail *imail = (struct index_mail *)mail;
 

diff --git a/src/plugins/pop3-migration/pop3-migration-plugin.h b/src/plugins/pop3-migration/pop3-migration-plugin.h
index 510eca00a890616c6be3455f07a84d5951e21951..398ffb9c4e2a629332afba6fba5234c0377a6527 100644 (file)
--- a/src/plugins/pop3-migration/pop3-migration-plugin.h
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.h
@@ -8,7 +8,7 @@ void pop3_migration_plugin_deinit(void);
 
 int pop3_migration_get_hdr_sha1(uint32_t mail_seq, struct istream *input,
                                uoff_t hdr_size,
-                               unsigned char sha1_r[SHA1_RESULTLEN],
+                               unsigned char sha1_r[STATIC_ARRAY SHA1_RESULTLEN],
                                bool *have_eoh_r);
 
 #endif