Skip to content

Commit 4e1846b

Browse files
committed
cleanup: rename _cleanup_evp_mac_ctx_ to __cleanup_evp_mac_ctx
Follow the new naming pattern of the compiler attributes which is just __NAME. This is what the kernel is using as well. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 986521e commit 4e1846b

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

libnvme/src/nvme/linux.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ static DEFINE_CLEANUP_FUNC(
600600
cleanup_ossl_lib_ctx, OSSL_LIB_CTX *, OSSL_LIB_CTX_free)
601601
#define _cleanup_ossl_lib_ctx_ __cleanup(cleanup_ossl_lib_ctx)
602602
static DEFINE_CLEANUP_FUNC(cleanup_evp_mac_ctx, EVP_MAC_CTX *, EVP_MAC_CTX_free)
603-
#define _cleanup_evp_mac_ctx_ __cleanup(cleanup_evp_mac_ctx)
603+
#define __cleanup_evp_mac_ctx __cleanup(cleanup_evp_mac_ctx)
604604
static DEFINE_CLEANUP_FUNC(cleanup_evp_mac, EVP_MAC *, EVP_MAC_free)
605605
#define _cleanup_evp_mac_ __cleanup(cleanup_evp_mac)
606606

@@ -611,7 +611,7 @@ __public int libnvme_gen_dhchap_key(struct libnvme_global_ctx *ctx,
611611
{
612612
const char hmac_seed[] = "NVMe-over-Fabrics";
613613
_cleanup_ossl_lib_ctx_ OSSL_LIB_CTX *lib_ctx = NULL;
614-
_cleanup_evp_mac_ctx_ EVP_MAC_CTX *mac_ctx = NULL;
614+
__cleanup_evp_mac_ctx EVP_MAC_CTX *mac_ctx = NULL;
615615
_cleanup_evp_mac_ EVP_MAC *mac = NULL;
616616
OSSL_PARAM params[2], *p = params;
617617
char *progq = NULL;
@@ -679,7 +679,7 @@ static int derive_psk_digest(struct libnvme_global_ctx *ctx,
679679
{
680680
static const char hmac_seed[] = "NVMe-over-Fabrics";
681681
_cleanup_ossl_lib_ctx_ OSSL_LIB_CTX *lib_ctx = NULL;
682-
_cleanup_evp_mac_ctx_ EVP_MAC_CTX *mac_ctx = NULL;
682+
__cleanup_evp_mac_ctx EVP_MAC_CTX *mac_ctx = NULL;
683683
__cleanup_free unsigned char *psk_ctx = NULL;
684684
_cleanup_evp_mac_ EVP_MAC *mac = NULL;
685685
OSSL_PARAM params[2], *p = params;

0 commit comments

Comments
 (0)