summaryrefslogtreecommitdiff
path: root/lib/strlcat.c
diff options
context:
space:
mode:
authorwhitespace / reindent <invalid@invalid.invalid>2017-07-17 14:03:14 +0200
committerwhitespace / reindent <invalid@invalid.invalid>2017-07-17 14:04:07 +0200
commitd62a17aedeb0eebdba98238874bb13d62c48dbf9 (patch)
tree3b319b1d61c8b85b4d1f06adf8b844bb8a9b5107 /lib/strlcat.c
parent888ac268a0077fc9ebd1218cec6ae472af0bfc40 (diff)
indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'` Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/strlcat.c')
-rw-r--r--lib/strlcat.c63
1 files changed, 30 insertions, 33 deletions
diff --git a/lib/strlcat.c b/lib/strlcat.c
index 6fdb2a4a37..8186304437 100644
--- a/lib/strlcat.c
+++ b/lib/strlcat.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with the GNU C Library; if not, see
- * <http://www.gnu.org/licenses/>.
+ * <http://www.gnu.org/licenses/>.
*/
/* adapted for Quagga from glibc patch submission originally from
@@ -28,45 +28,42 @@
#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 size);
-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 size)
{
- size_t src_length = strlen (src);
+ 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)
- return src_length;
+ /* 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)
+ return src_length;
- size_t dest_length = strnlen (dest, size);
- if (dest_length != size)
- {
- /* 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;
- /* But not more than what is available in the source string. */
- if (to_copy > src_length)
- to_copy = src_length;
+ size_t dest_length = strnlen(dest, size);
+ if (dest_length != size) {
+ /* 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;
+ /* But not more than what is available in the source string. */
+ if (to_copy > src_length)
+ to_copy = src_length;
- char *target = dest + dest_length;
- memcpy (target, src, to_copy);
- target[to_copy] = '\0';
- }
+ char *target = dest + dest_length;
+ memcpy(target, src, to_copy);
+ target[to_copy] = '\0';
+ }
- /* If the sum wraps around, we have more than SIZE_MAX + 2 bytes in
- the two input strings (including both null terminators). If each
- byte in the address space can be assigned a unique size_t value
- (which the static_assert checks), then by the pigeonhole
- principle, the two input strings must overlap, which is
- undefined. */
+/* If the sum wraps around, we have more than SIZE_MAX + 2 bytes in
+ the two input strings (including both null terminators). If each
+ byte in the address space can be assigned a unique size_t value
+ (which the static_assert checks), then by the pigeonhole
+ principle, the two input strings must overlap, which is
+ undefined. */
#if __STDC_VERSION__ >= 201112L
- _Static_assert (sizeof (uintptr_t) == sizeof (size_t),
- "theoretical maximum object size covers address space");
+ _Static_assert(sizeof(uintptr_t) == sizeof(size_t),
+ "theoretical maximum object size covers address space");
#endif
- return dest_length + src_length;
+ return dest_length + src_length;
}
#endif /* HAVE_STRLCAT */