diff options
| author | James Morris <jmorris@namei.org> | 2010-01-18 01:56:22 +0300 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-18 01:56:22 +0300 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/linux/string.h | |
| parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
| parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
| download | linux-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index b8508868d5ad..a716ee2a8adb 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -62,9 +62,20 @@ extern char * strnchr(const char *, size_t, int); #ifndef __HAVE_ARCH_STRRCHR extern char * strrchr(const char *,int); #endif -extern char * __must_check strstrip(char *); +extern char * __must_check skip_spaces(const char *); + +extern char *strim(char *); + +static inline __must_check char *strstrip(char *str) +{ + return strim(str); +} + #ifndef __HAVE_ARCH_STRSTR -extern char * strstr(const char *,const char *); +extern char * strstr(const char *, const char *); +#endif +#ifndef __HAVE_ARCH_STRNSTR +extern char * strnstr(const char *, const char *, size_t); #endif #ifndef __HAVE_ARCH_STRLEN extern __kernel_size_t strlen(const char *); |