From c4c5fd41124f38a5afee02b8f604ddc21d3b199a Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Tue, 30 Dec 2025 11:32:19 +0100
Subject: Change __access into __fortify_access to fix potential conflicts

---
 include/string.h | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'include/string.h')

diff --git a/include/string.h b/include/string.h
index 987b50c..8f0167f 100644
--- a/include/string.h
+++ b/include/string.h
@@ -37,8 +37,8 @@ extern "C" {
 #undef strncat
 #undef strncpy
 
-__access(write_only, 1, 3)
-__access(read_only, 2, 3)
+__fortify_access(write_only, 1, 3)
+__fortify_access(read_only, 2, 3)
 _FORTIFY_FN(memcpy) void *memcpy(void * _FORTIFY_POS0 __od,
                                  const void * _FORTIFY_POS0 __os, size_t __n)
 {
@@ -57,8 +57,8 @@ _FORTIFY_FN(memcpy) void *memcpy(void * _FORTIFY_POS0 __od,
 	return __builtin_memcpy(__od, __os, __n);
 }
 
-__access(write_only, 1, 3)
-__access(read_only, 2, 3)
+__fortify_access(write_only, 1, 3)
+__fortify_access(read_only, 2, 3)
 _FORTIFY_FN(memmove) void *memmove(void * _FORTIFY_POS0 __d,
                                    const void * _FORTIFY_POS0 __s, size_t __n)
 {
@@ -70,7 +70,7 @@ _FORTIFY_FN(memmove) void *memmove(void * _FORTIFY_POS0 __d,
 	return __orig_memmove(__d, __s, __n);
 }
 
-__access(write_only, 1, 3)
+__fortify_access(write_only, 1, 3)
 __warning_if(__c != 0 && __n == 0, "'memset' will set `0` bytes; did you invert the arguments?")
 _FORTIFY_FN(memset) void *memset(void * _FORTIFY_POS0 __d, int __c, size_t __n)
 {
@@ -85,8 +85,8 @@ _FORTIFY_FN(memset) void *memset(void * _FORTIFY_POS0 __d, int __c, size_t __n)
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
  || defined(_BSD_SOURCE)
 #undef stpcpy
-__access(write_only, 1)
-__access(read_only, 2)
+__fortify_access(write_only, 1)
+__fortify_access(read_only, 2)
 _FORTIFY_FN(stpcpy) char *stpcpy(char * _FORTIFY_POS0 __d, const char *__s)
 {
 	size_t __b = __bos(__d, 0);
@@ -97,8 +97,8 @@ _FORTIFY_FN(stpcpy) char *stpcpy(char * _FORTIFY_POS0 __d, const char *__s)
 }
 
 #undef stpncpy
-__access(write_only, 1)
-__access(read_only, 2)
+__fortify_access(write_only, 1)
+__fortify_access(read_only, 2)
 _FORTIFY_FN(stpncpy) char *stpncpy(char * _FORTIFY_POS0 __d, const char *__s,
                                    size_t __n)
 {
@@ -110,8 +110,8 @@ _FORTIFY_FN(stpncpy) char *stpncpy(char * _FORTIFY_POS0 __d, const char *__s,
 }
 #endif
 
-__access(read_write, 1)
-__access(read_only, 2)
+__fortify_access(read_write, 1)
+__fortify_access(read_only, 2)
 _FORTIFY_FN(strcat) char *strcat(char * _FORTIFY_POS0 __d, const char *__s)
 {
 	size_t __b = __bos(__d, 0);
@@ -121,8 +121,8 @@ _FORTIFY_FN(strcat) char *strcat(char * _FORTIFY_POS0 __d, const char *__s)
 	return __orig_strcat(__d, __s);
 }
 
-__access(write_only, 1)
-__access(read_only, 2)
+__fortify_access(write_only, 1)
+__fortify_access(read_only, 2)
 _FORTIFY_FN(strcpy) char *strcpy(char * _FORTIFY_POS0 __d, const char *__s)
 {
 	size_t __b = __bos(__d, 0);
@@ -132,8 +132,8 @@ _FORTIFY_FN(strcpy) char *strcpy(char * _FORTIFY_POS0 __d, const char *__s)
 	return __orig_strcpy(__d, __s);
 }
 
-__access(read_write, 1)
-__access(read_only, 2)
+__fortify_access(read_write, 1)
+__fortify_access(read_only, 2)
 _FORTIFY_FN(strncat) char *strncat(char * _FORTIFY_POS0 __d, const char *__s,
                                    size_t __n)
 {
@@ -151,8 +151,8 @@ _FORTIFY_FN(strncat) char *strncat(char * _FORTIFY_POS0 __d, const char *__s,
 	return __orig_strncat(__d, __s, __n);
 }
 
-__access(write_only, 1)
-__access(read_only, 2)
+__fortify_access(write_only, 1)
+__fortify_access(read_only, 2)
 _FORTIFY_FN(strncpy) char *strncpy(char * _FORTIFY_POS0 __d,
                                    const char *__s, size_t __n)
 {
@@ -165,8 +165,8 @@ _FORTIFY_FN(strncpy) char *strncpy(char * _FORTIFY_POS0 __d,
 
 #ifdef _GNU_SOURCE
 #undef mempcpy
-__access(write_only, 1, 3)
-__access(read_only, 2, 3)
+__fortify_access(write_only, 1, 3)
+__fortify_access(read_only, 2, 3)
 _FORTIFY_FN(mempcpy) void *mempcpy(void * _FORTIFY_POS0 __d,
                                    const void * _FORTIFY_POS0 __s, size_t __n)
 {
@@ -182,8 +182,8 @@ _FORTIFY_FN(mempcpy) void *mempcpy(void * _FORTIFY_POS0 __d,
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #undef strlcat
 #undef strlcpy
-__access(read_write, 1)
-__access(read_only, 2)
+__fortify_access(read_write, 1)
+__fortify_access(read_only, 2)
 _FORTIFY_FN(strlcat) size_t strlcat(char * _FORTIFY_POS0 __d,
                                     const char *__s, size_t __n)
 {
@@ -194,8 +194,8 @@ _FORTIFY_FN(strlcat) size_t strlcat(char * _FORTIFY_POS0 __d,
 	return __orig_strlcat(__d, __s, __n);
 }
 
-__access(write_only, 1)
-__access(read_only, 2)
+__fortify_access(write_only, 1)
+__fortify_access(read_only, 2)
 _FORTIFY_FN(strlcpy) size_t strlcpy(char * _FORTIFY_POS0 __d,
                                     const char *__s, size_t __n)
 {
-- 
cgit v1.3