Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / lib / strlcat.c

diff --git a/lib/strlcat.c b/lib/strlcat.c
index 8186304437e333b3be2e82bdf33e1ce8f414c20a..39773d9ac89ef7cfe022cc444266eea243b9eee5 100644 (file)
--- a/lib/strlcat.c
+++ b/lib/strlcat.c
@@ -20,31 +20,35 @@
 /* adapted for Quagga from glibc patch submission originally from
  * Florian Weimer <fweimer@redhat.com>, 2016-05-18 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <string.h>
 
-#include "config.h"
-
 #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;