summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>2015-01-01 17:58:32 +0100
committerIlya Dryomov <idryomov@gmail.com>2015-02-19 13:31:38 +0300
commit3a25cf43e00842ce51f7ce48ea5e38e516b574a8 (patch)
tree47a9c0f84a06ec8c15b590e323058038a82b0b73
parent03f4fcb02884859b584c709652bb48f8125ceb45 (diff)
downloadlinux-3a25cf43e00842ce51f7ce48ea5e38e516b574a8.tar.bz2
rbd: nuke copy_token()
It's been largely superseded by dup_token() and unused for over 2 years, identified by cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> [idryomov@redhat.com: changelog] Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
-rw-r--r--drivers/block/rbd.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 8a86b62466f7..ef070d7c5e3c 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4771,36 +4771,6 @@ static inline size_t next_token(const char **buf)
}
/*
- * Finds the next token in *buf, and if the provided token buffer is
- * big enough, copies the found token into it. The result, if
- * copied, is guaranteed to be terminated with '\0'. Note that *buf
- * must be terminated with '\0' on entry.
- *
- * Returns the length of the token found (not including the '\0').
- * Return value will be 0 if no token is found, and it will be >=
- * token_size if the token would not fit.
- *
- * The *buf pointer will be updated to point beyond the end of the
- * found token. Note that this occurs even if the token buffer is
- * too small to hold it.
- */
-static inline size_t copy_token(const char **buf,
- char *token,
- size_t token_size)
-{
- size_t len;
-
- len = next_token(buf);
- if (len < token_size) {
- memcpy(token, *buf, len);
- *(token + len) = '\0';
- }
- *buf += len;
-
- return len;
-}
-
-/*
* Finds the next token in *buf, dynamically allocates a buffer big
* enough to hold a copy of it, and copies the token into the new
* buffer. The copy is guaranteed to be terminated with '\0'. Note