global: Made all struct initialization using memset() use the same style.

diff --git a/src/lib-dcrypt/dcrypt-openssl.c b/src/lib-dcrypt/dcrypt-openssl.c
index 0c32f3ae9d8cce31bd4e8c17e599544ab6bbd622..a58de4bbbaa63a745bcbff065034db0a352b6bf9 100644 (file)
--- a/src/lib-dcrypt/dcrypt-openssl.c
+++ b/src/lib-dcrypt/dcrypt-openssl.c
@@ -731,7 +731,7 @@ static
 bool dcrypt_openssl_generate_keypair(struct dcrypt_keypair *pair_r, enum dcrypt_key_type kind, unsigned int bits, const char *curve, const char **error_r)
 {
        EVP_PKEY *pkey = NULL;
-       memset(pair_r, 0, sizeof(struct dcrypt_keypair));
+       memset(pair_r, 0, sizeof(*pair_r));
        if (kind == DCRYPT_KEY_RSA) {
                if (dcrypt_openssl_generate_rsa_key(bits, &pkey, error_r)) {
                        pair_r->priv = i_new(struct dcrypt_private_key, 1);

diff --git a/src/lib-dict/dict-cdb.c b/src/lib-dict/dict-cdb.c
index 25e1def4e03cfe9373ca344f3660be161aaf3c96..5fd9a4ddb4831c34b1be85f0d4054d0268c5606c 100644 (file)
--- a/src/lib-dict/dict-cdb.c
+++ b/src/lib-dict/dict-cdb.c
@@ -37,7 +37,7 @@ cdb_dict_init(struct dict *driver, const char *uri,
        dict->flag = CDB_WITH_NULL | CDB_WITHOUT_NULL;
 
        /* initialize cdb to 0 (unallocated) */
-       memset(&dict->cdb, 0, sizeof(struct cdb));
+       memset(&dict->cdb, 0, sizeof(dict->cdb));
 
        dict->fd = open(dict->path, O_RDONLY);
        if (dict->fd == -1) {

diff --git a/src/lib-dict/dict-db.c b/src/lib-dict/dict-db.c
index 45eaf03e5c1d0fd18c76a824905ca4d522e7555c..f48962d1eaef1d27cba7ddb9dd0d0e76a607066b 100644 (file)
--- a/src/lib-dict/dict-db.c
+++ b/src/lib-dict/dict-db.c
@@ -234,8 +234,8 @@ static int db_dict_lookup(struct dict *_dict, pool_t pool,
        uint32_t value;
        int ret;
 
-       memset(&pkey, 0, sizeof(DBT));
-       memset(&pdata, 0, sizeof(DBT));
+       memset(&pkey, 0, sizeof(pkey));
+       memset(&pdata, 0, sizeof(pdata));
 
        pkey.data = (char *)key;
        pkey.size = strlen(key);

diff --git a/src/lib-http/http-url.c b/src/lib-http/http-url.c
index 7133d268796ae29e30dbab1cd3ee851014eef560..1bb2ced78308a6c5c8dedce505711d752df9da23 100644 (file)
--- a/src/lib-http/http-url.c
+++ b/src/lib-http/http-url.c
@@ -335,7 +335,7 @@ int http_url_parse(const char *url, struct http_url *base,
           flags may also dictate whether relative URLs are allowed/required. */
        i_assert((flags & HTTP_URL_PARSE_SCHEME_EXTERNAL) == 0 || base == NULL);
 
-       memset(&url_parser, '\0', sizeof(url_parser));
+       memset(&url_parser, 0, sizeof(url_parser));
        uri_parser_init(&url_parser.parser, pool, url);
 
        url_parser.url = p_new(pool, struct http_url, 1);
@@ -359,7 +359,7 @@ int http_url_request_target_parse(const char *request_target,
        struct uri_authority auth;
        struct http_url base;
 
-       memset(&url_parser, '\0', sizeof(url_parser));
+       memset(&url_parser, 0, sizeof(url_parser));
        parser = &url_parser.parser;
        uri_parser_init(parser, pool, host_header);
 
@@ -386,7 +386,7 @@ int http_url_request_target_parse(const char *request_target,
        base.host = auth.host;
        base.port = auth.port;
 
-       memset(parser, '\0', sizeof(*parser));
+       memset(parser, 0, sizeof(*parser));
        uri_parser_init(parser, pool, request_target);
 
        url_parser.url = p_new(pool, struct http_url, 1);

diff --git a/src/lib-imap/imap-date.c b/src/lib-imap/imap-date.c
index 23a810c47356f0e4b9c9e31d155964499ff11d88..43577270ba85e5a7134d887c3f57ba76ebea46ca 100644 (file)
--- a/src/lib-imap/imap-date.c
+++ b/src/lib-imap/imap-date.c
@@ -34,7 +34,7 @@ static const char *imap_parse_date_internal(const char *str, struct tm *tm)
        if (str == NULL || *str == '\0')
                return NULL;
 
-       memset(tm, 0, sizeof(struct tm));
+       memset(tm, 0, sizeof(*tm));
 
        /* "dd-mon-yyyy [hh:mi:ss +|-zone]"
           dd is 1-2 digits and may be prefixed with space or zero. */

diff --git a/src/lib-imap/imap-url.c b/src/lib-imap/imap-url.c
index 344cecd441e0e7b29715591c8be13f76c19c5950..fcffc08221c76295b064737a03c5217fcd678b51 100644 (file)
--- a/src/lib-imap/imap-url.c
+++ b/src/lib-imap/imap-url.c
@@ -900,7 +900,7 @@ int imap_url_parse(const char *url, const struct imap_url *base,
        i_assert((flags & IMAP_URL_PARSE_REQUIRE_RELATIVE) == 0 || base != NULL);
        i_assert((flags & IMAP_URL_PARSE_SCHEME_EXTERNAL) == 0 || base == NULL);
 
-       memset(&url_parser, '\0', sizeof(url_parser));
+       memset(&url_parser, 0, sizeof(url_parser));
        uri_parser_init(&url_parser.parser, pool_datastack_create(), url);
 
        url_parser.url = t_new(struct imap_url, 1);

diff --git a/src/lib/net.c b/src/lib/net.c
index 75e42a075c70fcf4df29451a07c134f7454ba0e6..28f1499282b71593ea6503f61606a41410883580 100644 (file)
--- a/src/lib/net.c
+++ b/src/lib/net.c
@@ -654,7 +654,7 @@ int net_gethostbyname(const char *addr, struct ip_addr **ips,
                return 0;
        }
 
-       memset(&hints, 0, sizeof(struct addrinfo));
+       memset(&hints, 0, sizeof(hints));
        hints.ai_socktype = SOCK_STREAM;
 
        /* save error to host_error for later use */
@@ -852,9 +852,9 @@ int net_getunixcred(int fd, struct net_unix_cred *cred_r)
 
        sc = (struct sockcred *)cdata.buf;
        sc->sc_uid = sc->sc_euid = sc->sc_gid = sc->sc_egid = -1;
-       memset(&cdata.ch, 0, sizeof cdata.ch);
+       memset(&cdata.ch, 0, sizeof(cdata.ch));
 
-       memset(&msg, 0, sizeof msg);
+       memset(&msg, 0, sizeof(msg));
 
        msg.msg_iov = &iov;
        msg.msg_iovlen = 1;