diff options
| author | Peter Eisentraut | 2025-09-30 10:24:38 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2025-09-30 10:35:50 +0000 |
| commit | efcd5199d8cb8e5098f79b38d0c46004e69d1a46 (patch) | |
| tree | 9ea7da179f7b983147bdbb5614d0e6dba12b774f /contrib | |
| parent | 57d46dff9b0ba8dc50fb37166373ea7638ecd2b9 (diff) | |
Make some use of anonymous unions [pgcrypto]
Make some use of anonymous unions, which are allowed as of C11, as
examples and encouragement for future code, and to test compilers.
This commit changes some structures in pgcrypto.
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/f00a9968-388e-4f8c-b5ef-5102e962d997%40eisentraut.org
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pgcrypto/openssl.c | 14 | ||||
| -rw-r--r-- | contrib/pgcrypto/px.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index f179e80c842..276d8306588 100644 --- a/contrib/pgcrypto/openssl.c +++ b/contrib/pgcrypto/openssl.c @@ -98,7 +98,7 @@ free_openssl_digest(OSSLDigest *digest) static unsigned digest_result_size(PX_MD *h) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; int result = EVP_MD_CTX_size(digest->ctx); if (result < 0) @@ -110,7 +110,7 @@ digest_result_size(PX_MD *h) static unsigned digest_block_size(PX_MD *h) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; int result = EVP_MD_CTX_block_size(digest->ctx); if (result < 0) @@ -122,7 +122,7 @@ digest_block_size(PX_MD *h) static void digest_reset(PX_MD *h) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; if (!EVP_DigestInit_ex(digest->ctx, digest->algo, NULL)) elog(ERROR, "EVP_DigestInit_ex() failed"); @@ -131,7 +131,7 @@ digest_reset(PX_MD *h) static void digest_update(PX_MD *h, const uint8 *data, unsigned dlen) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; if (!EVP_DigestUpdate(digest->ctx, data, dlen)) elog(ERROR, "EVP_DigestUpdate() failed"); @@ -140,7 +140,7 @@ digest_update(PX_MD *h, const uint8 *data, unsigned dlen) static void digest_finish(PX_MD *h, uint8 *dst) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; if (!EVP_DigestFinal_ex(digest->ctx, dst, NULL)) elog(ERROR, "EVP_DigestFinal_ex() failed"); @@ -149,7 +149,7 @@ digest_finish(PX_MD *h, uint8 *dst) static void digest_free(PX_MD *h) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; free_openssl_digest(digest); pfree(h); @@ -204,7 +204,7 @@ px_find_digest(const char *name, PX_MD **res) h->update = digest_update; h->finish = digest_finish; h->free = digest_free; - h->p.ptr = digest; + h->ptr = digest; *res = h; return 0; diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h index 4b81fceab8e..7846a63f301 100644 --- a/contrib/pgcrypto/px.h +++ b/contrib/pgcrypto/px.h @@ -117,7 +117,7 @@ struct px_digest { unsigned code; void *ptr; - } p; + }; }; struct px_alias |