2013-07-17 09:05:33

by Dragos Foianu

Subject: [PATCH] staging/lustre/libcfs: removed dead code from libcfs_string

Confirmed by cscope that the functions are not used anymore. A fresh compilation does not yield any errors.

Signed-off-by: Dragos Foianu <[email protected]>
---
.../staging/lustre/lustre/libcfs/libcfs_string.c | 48 --------------------
1 file changed, 48 deletions(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
index 9edccc9..c7a1971 100644
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
@@ -132,54 +132,6 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
}
EXPORT_SYMBOL(cfs_str2mask);

-/* Duplicate a string in a platform-independent way */
-char *cfs_strdup(const char *str, u_int32_t flags)
-{
- size_t lenz; /* length of str + zero byte */
- char *dup_str;
-
- lenz = strlen(str) + 1;
-
- dup_str = kmalloc(lenz, flags);
- if (dup_str == NULL)
- return NULL;
-
- memcpy(dup_str, str, lenz);
-
- return dup_str;
-}
-EXPORT_SYMBOL(cfs_strdup);
-
-/**
- * cfs_{v}snprintf() return the actual size that is printed rather than
- * the size that would be printed in standard functions.
- */
-/* safe vsnprintf */
-int cfs_vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
-{
- int i;
-
- LASSERT(size > 0);
- i = vsnprintf(buf, size, fmt, args);
-
- return (i >= size ? size - 1 : i);
-}
-EXPORT_SYMBOL(cfs_vsnprintf);
-
-/* safe snprintf */
-int cfs_snprintf(char *buf, size_t size, const char *fmt, ...)
-{
- va_list args;
- int i;
-
- va_start(args, fmt);
- i = cfs_vsnprintf(buf, size, fmt, args);
- va_end(args);
-
- return i;
-}
-EXPORT_SYMBOL(cfs_snprintf);
-
/* get the first string out of @str */
char *cfs_firststr(char *str, size_t size)
{
--
1.7.10.4

2013-07-17 23:46:12

by Dilger, Andreas

Subject: Re: [PATCH] staging/lustre/libcfs: removed dead code from libcfs_string

On 2013/07/17 5:05 AM, "Dragos Foianu" <[email protected]> wrote:

>Confirmed by cscope that the functions are not used anymore. A fresh
>compilation does not yield any errors.
>
>Signed-off-by: Dragos Foianu <[email protected]>

Reviewed-by: Andreas Dilger <[email protected]>

>---
> .../staging/lustre/lustre/libcfs/libcfs_string.c | 48
>--------------------
> 1 file changed, 48 deletions(-)
>
>diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
>b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
>index 9edccc9..c7a1971 100644
>--- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
>+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
>@@ -132,54 +132,6 @@ int cfs_str2mask(const char *str, const char
>*(*bit2str)(int bit),
> }
> EXPORT_SYMBOL(cfs_str2mask);
>
>-/* Duplicate a string in a platform-independent way */
>-char *cfs_strdup(const char *str, u_int32_t flags)
>-{
>- size_t lenz; /* length of str + zero byte */
>- char *dup_str;
>-
>- lenz = strlen(str) + 1;
>-
>- dup_str = kmalloc(lenz, flags);
>- if (dup_str == NULL)
>- return NULL;
>-
>- memcpy(dup_str, str, lenz);
>-
>- return dup_str;
>-}
>-EXPORT_SYMBOL(cfs_strdup);
>-
>-/**
>- * cfs_{v}snprintf() return the actual size that is printed rather than
>- * the size that would be printed in standard functions.
>- */
>-/* safe vsnprintf */
>-int cfs_vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
>-{
>- int i;
>-
>- LASSERT(size > 0);
>- i = vsnprintf(buf, size, fmt, args);
>-
>- return (i >= size ? size - 1 : i);
>-}
>-EXPORT_SYMBOL(cfs_vsnprintf);
>-
>-/* safe snprintf */
>-int cfs_snprintf(char *buf, size_t size, const char *fmt, ...)
>-{
>- va_list args;
>- int i;
>-
>- va_start(args, fmt);
>- i = cfs_vsnprintf(buf, size, fmt, args);
>- va_end(args);
>-
>- return i;
>-}
>-EXPORT_SYMBOL(cfs_snprintf);
>-
> /* get the first string out of @str */
> char *cfs_firststr(char *str, size_t size)
> {
>--
>1.7.10.4
>
>


Cheers, Andreas
--
Andreas Dilger

Lustre Software Architect
Intel High Performance Data Division