From 67dc8e0063986da4798b0bcf2949178d6184e266 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Thu, 2 Jan 2020 17:47:46 -0800 Subject: fixes #1090 nni_strlcat is unused --- src/core/strs.c | 31 +------------------------------ src/core/strs.h | 3 +-- 2 files changed, 2 insertions(+), 32 deletions(-) (limited to 'src/core') diff --git a/src/core/strs.c b/src/core/strs.c index ed403a3b..ce03de22 100644 --- a/src/core/strs.c +++ b/src/core/strs.c @@ -1,5 +1,5 @@ // -// Copyright 2017 Garrett D'Amore +// Copyright 2020 Staysail Systems, Inc. // Copyright 2017 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a @@ -68,35 +68,6 @@ nni_strlcpy(char *dst, const char *src, size_t len) #endif } -size_t -nni_strlcat(char *dst, const char *src, size_t len) -{ -#ifdef NNG_HAVE_STRLCAT - return (strlcat(dst, src, len)); -#else - size_t n; - char c; - - n = 0; - while ((*dst != '\0') && (n < len)) { - n++; - dst++; - } - - do { - c = *src++; - n++; - if (n < len) { - *dst++ = c; - } else if (n == len) { - *dst = '\0'; - } - } while (c); - - return (n - 1); -#endif -} - size_t nni_strnlen(const char *s, size_t len) { diff --git a/src/core/strs.h b/src/core/strs.h index 4ed1fb57..91639c64 100644 --- a/src/core/strs.h +++ b/src/core/strs.h @@ -1,5 +1,5 @@ // -// Copyright 2017 Garrett D'Amore +// Copyright 2020 Staysail Systems, Inc. // Copyright 2017 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a @@ -16,7 +16,6 @@ extern char * nni_strdup(const char *); extern void nni_strfree(char *); extern size_t nni_strlcpy(char *, const char *, size_t); -extern size_t nni_strlcat(char *, const char *, size_t); extern size_t nni_strnlen(const char *, size_t); extern char * nni_strcasestr(const char *, const char *); extern int nni_strncasecmp(const char *, const char *, size_t); -- cgit v1.2.3-70-g09d2