commit 216f3ad062aad11cee6bcb6518c7b45cdc53f440
author Elliott Hughes <enh@google.com> Mon Mar 31 13:36:43 2025 -0700
committer Elliott Hughes <enh@google.com> Mon Mar 31 13:36:43 2025 -0700
tree 9ba42b269c8a048002852935bc36be1fb71a92b7
parent d5f0b6c53de9775e621a1b499f4885a20df163eb

Fix up __BIONIC_AVAILABILITY_GUARD() formatting.

There were some weird whitespace issues, plus unclear scope where one #if covered multiple functions.

(I'm tempted to remove the #endif comments now they're less necessary, but that can be another change on another day.)

Change-Id: I335464a12bcb39837b76c58558f7236e4d3b060b

libc/include/string.h

diff --git a/libc/include/string.h b/libc/include/string.h
index a0a7cc4..b6f2dfa 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -51,13 +51,13 @@
 #endif
 int memcmp(const void* _Nonnull __lhs, const void* _Nonnull __rhs, size_t __n) __attribute_pure__;
 void* _Nonnull memcpy(void* _Nonnull, const void* _Nonnull, size_t);
-#if defined(__USE_GNU)
 
+#if defined(__USE_GNU)
 #if __BIONIC_AVAILABILITY_GUARD(23)
 void* _Nonnull mempcpy(void* _Nonnull __dst, const void* _Nonnull __src, size_t __n) __INTRODUCED_IN(23);
 #endif /* __BIONIC_AVAILABILITY_GUARD(23) */
-
 #endif
+
 void* _Nonnull memmove(void* _Nonnull __dst, const void* _Nonnull __src, size_t __n);
 
 /**
@@ -75,7 +75,6 @@
  *
  * Returns `dst`.
  */
-
 #if __BIONIC_AVAILABILITY_GUARD(34)
 void* _Nonnull memset_explicit(void* _Nonnull __dst, int __ch, size_t __n) __INTRODUCED_IN(34);
 #endif /* __BIONIC_AVAILABILITY_GUARD(34) */
@@ -90,6 +89,8 @@
 
 #if __BIONIC_AVAILABILITY_GUARD(24)
 extern "C++" char* _Nonnull strchrnul(char* _Nonnull __s, int __ch) __RENAME(strchrnul) __attribute_pure__ __INTRODUCED_IN(24);
+#endif /* __BIONIC_AVAILABILITY_GUARD(24) */
+#if __BIONIC_AVAILABILITY_GUARD(24)
 extern "C++" const char* _Nonnull strchrnul(const char* _Nonnull __s, int __ch) __RENAME(strchrnul) __attribute_pure__ __INTRODUCED_IN(24);
 #endif /* __BIONIC_AVAILABILITY_GUARD(24) */
 
@@ -172,11 +173,9 @@
  * Available since API level 35.
  */
 #if defined(__USE_GNU)
-
 #if __BIONIC_AVAILABILITY_GUARD(35)
 const char* _Nullable strerrorname_np(int __errno_value) __INTRODUCED_IN(35);
 #endif /* __BIONIC_AVAILABILITY_GUARD(35) */
-
 #endif
 
 /**
@@ -222,6 +221,8 @@
 
 #if __BIONIC_AVAILABILITY_GUARD(23)
 extern "C++" char* _Nonnull basename(char* _Nullable __path) __RENAME(__gnu_basename) __INTRODUCED_IN(23);
+#endif /* __BIONIC_AVAILABILITY_GUARD(23) */
+#if __BIONIC_AVAILABILITY_GUARD(23)
 extern "C++" const char* _Nonnull basename(const char* _Nonnull __path) __RENAME(__gnu_basename) __INTRODUCED_IN(23);
 #endif /* __BIONIC_AVAILABILITY_GUARD(23) */