New upstream version 4.18.0

lib/string/strcpy/stpecpy.h

@@ -32,7 +32,7 @@ inline char *stpecpy(char *dst, char *end, const char *restrict src);
  *
  *	end	Pointer to one after the last element of the buffer
  *		pointed to by `dst`.  Usually, it should be calculated
- *		as `dst + NITEMS(dst)`.
+ *		as `dst + countof(dst)`.
  *
  *	src	Source string to be copied into dst.
  *

lib/string/strcpy/strncat.h

@@ -13,7 +13,7 @@
 #include "sizeof.h"
 
 
-#define STRNCAT(dst, src)  strncat(dst, src, NITEMS(src))
+#define STRNCAT(dst, src)  strncat(dst, src, countof(src))
 
 
 #endif  // include guard

lib/string/strcpy/strncpy.h

@@ -13,7 +13,7 @@
 #include "sizeof.h"
 
 
-#define STRNCPY(dst, src)  strncpy(dst, src, NITEMS(dst))
+#define STRNCPY(dst, src)  strncpy(dst, src, countof(dst))
 
 
 #endif  // include guard

lib/string/strcpy/strtcpy.h

@@ -31,7 +31,7 @@
  *	at the buffer pointed to by dst.  If the destination buffer,
  *	isn't large enough to hold the copy, the resulting string is
  *	truncated.  The size of the buffer is calculated internally via
- *	NITEMS().
+ *	countof().
  *
  * RETURN VALUE
  *	-1	If this call truncated the resulting string.
@@ -44,7 +44,7 @@
  */
 
 
-#define STRTCPY(dst, src)  strtcpy(dst, src, NITEMS(dst))
+#define STRTCPY(dst, src)  strtcpy(dst, src, countof(dst))
 
 
 ATTR_STRING(2)