From 03883eb2ced012a5fd024d156b428ef27bbbd552 Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Mon, 30 Oct 2023 12:27:47 +0200
Subject: [PATCH] mte: rename arm_mte_store_tags_and_clear() to
 arm_mte_tag_and_clear_mem()

---
 arm_mte.h  | 2 +-
 h_malloc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arm_mte.h b/arm_mte.h
index 28ff2c0..b5e6fcf 100644
--- a/arm_mte.h
+++ b/arm_mte.h
@@ -21,7 +21,7 @@ static inline void *arm_mte_create_random_tag(void *p, u64 exclusion_mask) {
 //
 // scudo is licensed under the Apache License v2.0 with LLVM Exceptions, which is compatible with
 // the hardened_malloc's MIT license
-static inline void arm_mte_store_tags_and_clear(void *tagged_ptr, size_t len) {
+static inline void arm_mte_tag_and_clear_mem(void *tagged_ptr, size_t len) {
     uintptr_t Begin = (uintptr_t) tagged_ptr;
     uintptr_t End = Begin + len;
     uintptr_t LineSize, Next, Tmp;
diff --git a/h_malloc.c b/h_malloc.c
index 8c4d487..aff5211 100644
--- a/h_malloc.c
+++ b/h_malloc.c
@@ -589,7 +589,7 @@ static void *tag_and_clear_slab_slot(struct slab_metadata *metadata, void *slot_
 
     void *tagged_ptr = arm_mte_create_random_tag(slot_ptr, tem);
     // slot addresses and sizes are always aligned by 16
-    arm_mte_store_tags_and_clear(tagged_ptr, slot_size);
+    arm_mte_tag_and_clear_mem(tagged_ptr, slot_size);
 
     // store new tag of this slot
     u4_arr_set(slot_tags, slot_idx + 1, get_pointer_tag(tagged_ptr));
@@ -798,7 +798,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
         bool skip_zero = false;
 #ifdef HAS_ARM_MTE
         if (likely(is_memtag_enabled())) {
-            arm_mte_store_tags_and_clear(set_pointer_tag(p, RESERVED_TAG), size);
+            arm_mte_tag_and_clear_mem(set_pointer_tag(p, RESERVED_TAG), size);
             // metadata->arm_mte_tags is intentionally not updated, it should keep the previous slot
             // tag after slot is freed
             skip_zero = true;