From 1375571957d64836c68df5c5d89ee41f987c0ae9 Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Wed, 30 Mar 2022 17:52:41 +0200
Subject: [PATCH] Unify mem utils function names

---
 src_features/signMessageEIP712/encode_type.c | 22 ++++++++++----------
 src_features/signMessageEIP712/mem_utils.c   |  8 +++----
 src_features/signMessageEIP712/mem_utils.h   |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src_features/signMessageEIP712/encode_type.c b/src_features/signMessageEIP712/encode_type.c
index 42ab111..3a229b5 100644
--- a/src_features/signMessageEIP712/encode_type.c
+++ b/src_features/signMessageEIP712/encode_type.c
@@ -19,7 +19,7 @@ static bool format_field_type_array_levels_string(const void *lvl_ptr, uint8_t l
 
     while (lvls_count-- > 0)
     {
-        if (alloc_and_copy_char('[') == NULL)
+        if (mem_alloc_and_copy_char('[') == NULL)
         {
             return false;
         }
@@ -30,13 +30,13 @@ static bool format_field_type_array_levels_string(const void *lvl_ptr, uint8_t l
                 break;
             case ARRAY_FIXED_SIZE:
                 // max value = 255, 3 characters max
-                format_uint_into_mem(array_size, 3);
+                mem_alloc_and_format_uint(array_size, 3);
                 break;
             default:
                 // should not be in here :^)
                 break;
         }
-        if (alloc_and_copy_char(']') == NULL)
+        if (mem_alloc_and_copy_char(']') == NULL)
         {
             return false;
         }
@@ -60,7 +60,7 @@ static bool format_field_string(const void *field_ptr)
 
     // field type name
     name = get_struct_field_typename(field_ptr, &length);
-    if (alloc_and_copy(name, length) == NULL)
+    if (mem_alloc_and_copy(name, length) == NULL)
     {
         return false;
     }
@@ -82,7 +82,7 @@ static bool format_field_string(const void *field_ptr)
                 break;
         }
         // max value = 256, 3 characters max
-        format_uint_into_mem(field_size, 3);
+        mem_alloc_and_format_uint(field_size, 3);
     }
 
     // field type array levels
@@ -92,14 +92,14 @@ static bool format_field_string(const void *field_ptr)
         format_field_type_array_levels_string(lvl_ptr, lvls_count);
     }
     // space between field type name and field name
-    if (alloc_and_copy_char(' ') == NULL)
+    if (mem_alloc_and_copy_char(' ') == NULL)
     {
         return false;
     }
 
     // field name
     name = get_struct_field_keyname(field_ptr, &length);
-    if (alloc_and_copy(name, length) == NULL)
+    if (mem_alloc_and_copy(name, length) == NULL)
     {
         return false;
     }
@@ -122,13 +122,13 @@ static const char *format_struct_string(const uint8_t *const struct_ptr, uint16_
 
     // struct name
     struct_name = get_struct_name(struct_ptr, &struct_name_length);
-    if ((str_start = alloc_and_copy(struct_name, struct_name_length)) == NULL)
+    if ((str_start = mem_alloc_and_copy(struct_name, struct_name_length)) == NULL)
     {
         return NULL;
     }
 
     // opening struct parenthese
-    if (alloc_and_copy_char('(') == NULL)
+    if (mem_alloc_and_copy_char('(') == NULL)
     {
         return NULL;
     }
@@ -139,7 +139,7 @@ static const char *format_struct_string(const uint8_t *const struct_ptr, uint16_
         // comma separating struct fields
         if (idx > 0)
         {
-            if (alloc_and_copy_char(',') == NULL)
+            if (mem_alloc_and_copy_char(',') == NULL)
             {
                 return NULL;
             }
@@ -154,7 +154,7 @@ static const char *format_struct_string(const uint8_t *const struct_ptr, uint16_
         field_ptr = get_next_struct_field(field_ptr);
     }
     // closing struct parenthese
-    if (alloc_and_copy_char(')') == NULL)
+    if (mem_alloc_and_copy_char(')') == NULL)
     {
         return NULL;
     }
diff --git a/src_features/signMessageEIP712/mem_utils.c b/src_features/signMessageEIP712/mem_utils.c
index 4b44214..0220fb0 100644
--- a/src_features/signMessageEIP712/mem_utils.c
+++ b/src_features/signMessageEIP712/mem_utils.c
@@ -4,7 +4,7 @@
 #include "mem.h"
 #include "mem_utils.h"
 
-void    *alloc_and_copy(const void *data, size_t size)
+void    *mem_alloc_and_copy(const void *data, size_t size)
 {
     void    *mem_ptr;
 
@@ -15,9 +15,9 @@ void    *alloc_and_copy(const void *data, size_t size)
     return mem_ptr;
 }
 
-char    *alloc_and_copy_char(char c)
+char    *mem_alloc_and_copy_char(char c)
 {
-    return alloc_and_copy(&c, sizeof(char));
+    return mem_alloc_and_copy(&c, sizeof(char));
 }
 
 /**
@@ -28,7 +28,7 @@ char    *alloc_and_copy_char(char c)
  *
  * @return how many characters have been written in memory, 0 in case of an allocation error
  */
-uint8_t format_uint_into_mem(uint32_t value, const uint8_t max_chars)
+uint8_t mem_alloc_and_format_uint(uint32_t value, const uint8_t max_chars)
 {
     char        *ptr;
     uint8_t     written_chars;
diff --git a/src_features/signMessageEIP712/mem_utils.h b/src_features/signMessageEIP712/mem_utils.h
index 8488d11..dad38d6 100644
--- a/src_features/signMessageEIP712/mem_utils.h
+++ b/src_features/signMessageEIP712/mem_utils.h
@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-char    *alloc_and_copy_char(char c);
-void    *alloc_and_copy(const void *data, size_t size);
-uint8_t format_uint_into_mem(uint32_t value, const uint8_t max_chars);
+char    *mem_alloc_and_copy_char(char c);
+void    *mem_alloc_and_copy(const void *data, size_t size);
+uint8_t mem_alloc_and_format_uint(uint32_t value, const uint8_t max_chars);
 
 #endif // MEM_UTILS_H_