diff options
| author | Garrett D'Amore <garrett@damore.org> | 2020-01-02 17:47:46 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2020-01-02 17:47:46 -0800 |
| commit | 67dc8e0063986da4798b0bcf2949178d6184e266 (patch) | |
| tree | 4cf6804230d458707792c1b3f3f387f1b13b6458 | |
| parent | 835821497a9bbd0d65c20714279c6a2c102016c1 (diff) | |
| download | nng-67dc8e0063986da4798b0bcf2949178d6184e266.tar.gz nng-67dc8e0063986da4798b0bcf2949178d6184e266.tar.bz2 nng-67dc8e0063986da4798b0bcf2949178d6184e266.zip | |
fixes #1090 nni_strlcat is unused
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/core/strs.c | 31 | ||||
| -rw-r--r-- | src/core/strs.h | 3 |
3 files changed, 3 insertions, 34 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2789e0bd..a888c09d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2019 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> # Copyright (c) 2012 Martin Sustrik All rights reserved. # Copyright (c) 2013 GoPivotal, Inc. All rights reserved. # Copyright (c) 2015-2016 Jack R. Dunaway. All rights reserved. @@ -348,7 +348,6 @@ else () endif () -nng_check_sym(strlcat string.h NNG_HAVE_STRLCAT) nng_check_sym(strlcpy string.h NNG_HAVE_STRLCPY) nng_check_sym(strnlen string.h NNG_HAVE_STRNLEN) nng_check_sym(strcasecmp string.h NNG_HAVE_STRCASECMP) 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 <garrett@damore.org> +// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2017 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a @@ -69,35 +69,6 @@ nni_strlcpy(char *dst, const char *src, size_t len) } 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) { #ifdef NNG_HAVE_STRNLEN 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 <garrett@damore.org> +// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2017 Capitar IT Group BV <info@capitar.com> // // 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); |