Merge pull request #1886 from donaldsharp/strlcpy

lib: Fixup strlcat and strlcpy to be a bit more descriptive

1 files changed, 8 insertions, 6 deletions

diff --git a/lib/strlcat.c b/lib/strlcat.c
index 8186304437..be211f82a8 100644
--- a/lib/strlcat.c
+++ b/lib/strlcat.c
@@ -28,23 +28,25 @@
 #ifndef HAVE_STRLCAT
 #undef strlcat
 
-size_t strlcat(char *__restrict dest, const char *__restrict src, size_t size);
+size_t strlcat(char *__restrict dest,
+	       const char *__restrict src, size_t destsize);
 
-size_t strlcat(char *__restrict dest, const char *__restrict src, size_t size)
+size_t strlcat(char *__restrict dest,
+	       const char *__restrict src, size_t destsize)
 {
 	size_t src_length = strlen(src);
 
 	/* Our implementation strlcat supports dest == NULL if size == 0
 	   (for consistency with snprintf and strlcpy), but strnlen does
 	   not, so we have to cover this case explicitly.  */
-	if (size == 0)
+	if (destsize == 0)
 		return src_length;
 
-	size_t dest_length = strnlen(dest, size);
-	if (dest_length != size) {
+	size_t dest_length = strnlen(dest, destsize);
+	if (dest_length != destsize) {
 		/* Copy at most the remaining number of characters in the
 		   destination buffer.  Leave for the NUL terminator.  */
-		size_t to_copy = size - dest_length - 1;
+		size_t to_copy = destsize - dest_length - 1;
 		/* But not more than what is available in the source string.  */
 		if (to_copy > src_length)
 			to_copy = src_length;