openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Subject: Re: [PATCH] strstrip incorrectly marked __must_check 

Recently, We marked strstrip() as must_check.  because it was frequently
misused and it should be checked.  However, we found one exception.
scsi/ipr.c intentionally ignore return value of strstrip.  Because it
wishes to keep the whitespace at the beginning.

Thus we need to keep with and without checked whitespace trim function.
This patch adds a new strim() and changes ipr.c to use it.

[akpm@linux-foundation.org: coding-style fixes]
Suggested-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
KOSAKI Motohiro 2009-12-14 18:01:15 -08:00 committed by Linus Torvalds
parent 925ede0bf4
commit ca54cb8c9e
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/ipr.c
View File

@ -1333,7 +1333,7 @@ static void ipr_log_enhanced_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
error = &hostrcb->hcam.u.error.u.type_17_error; error = &hostrcb->hcam.u.error.u.type_17_error;
error->failure_reason[sizeof(error->failure_reason) - 1] = '\0'; error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
strstrip(error->failure_reason); strim(error->failure_reason);
ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason, ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
be32_to_cpu(hostrcb->hcam.u.error.prc)); be32_to_cpu(hostrcb->hcam.u.error.prc));
@ -1359,7 +1359,7 @@ static void ipr_log_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
error = &hostrcb->hcam.u.error.u.type_07_error; error = &hostrcb->hcam.u.error.u.type_07_error;
error->failure_reason[sizeof(error->failure_reason) - 1] = '\0'; error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
strstrip(error->failure_reason); strim(error->failure_reason);
ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason, ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
be32_to_cpu(hostrcb->hcam.u.error.prc)); be32_to_cpu(hostrcb->hcam.u.error.prc));

9
include/linux/string.h
View File

@ -63,7 +63,14 @@ extern char * strnchr(const char *, size_t, int);
extern char * strrchr(const char *,int); extern char * strrchr(const char *,int);
#endif #endif
extern char * __must_check skip_spaces(const char *); extern char * __must_check skip_spaces(const char *);
extern char * __must_check strstrip(char *);
extern char *strim(char *);
static inline __must_check char *strstrip(char *str)
{
return strim(str);
}
#ifndef __HAVE_ARCH_STRSTR #ifndef __HAVE_ARCH_STRSTR
extern char * strstr(const char *,const char *); extern char * strstr(const char *,const char *);
#endif #endif

6
lib/string.c
View File

@ -352,14 +352,14 @@ char *skip_spaces(const char *str)
EXPORT_SYMBOL(skip_spaces); EXPORT_SYMBOL(skip_spaces);
/** /**
* strstrip - Removes leading and trailing whitespace from @s. * strim - Removes leading and trailing whitespace from @s.
* @s: The string to be stripped. * @s: The string to be stripped.
* *
* Note that the first trailing whitespace is replaced with a %NUL-terminator * Note that the first trailing whitespace is replaced with a %NUL-terminator
* in the given string @s. Returns a pointer to the first non-whitespace * in the given string @s. Returns a pointer to the first non-whitespace
* character in @s. * character in @s.
*/ */
char *strstrip(char *s) char *strim(char *s)
{ {
size_t size; size_t size;
char *end; char *end;
@ -376,7 +376,7 @@ char *strstrip(char *s)
return s; return s;
} }
EXPORT_SYMBOL(strstrip); EXPORT_SYMBOL(strim);
#ifndef __HAVE_ARCH_STRLEN #ifndef __HAVE_ARCH_STRLEN
/** /**