lib/string/strdup/strndupa.h: STRNDUPA(): Simplify implementation

Signed-off-by: Alejandro Colomar <[email protected]>
shadow-maint · Jan 19, 2025 · 9227a34 · 9227a34
1 parent 0e95f99
commit 9227a34
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/lib/string/strdup/strndupa.h b/lib/string/strdup/strndupa.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024, Alejandro Colomar <[email protected]>
+// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
@@ -12,19 +12,15 @@
 #include <string.h>
 
 #include "sizeof.h"
-#include "string/strcpy/strncat.h"
 
 
 #ifndef  strndupa
 # define strndupa(s, n)  strncat(strcpy(alloca(n + 1), ""), s, n)
 #endif
 
 
-// Similar to strndupa(3), but ensure that 's' is an array.
-#define STRNDUPA(s)                                                           \
-(                                                                             \
-	STRNCAT(strcpy(alloca(strnlen(s, NITEMS(s)) + 1), ""), s)             \
-)
+// strndupa(3), but ensure that 's' is an array.
+#define STRNDUPA(s)      strndupa(s, NITEMS(s))
 
 
 #endif  // include guard