summaryrefslogtreecommitdiff
path: root/include/linux/string.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-17 12:27:22 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-17 12:27:22 +0100
commit67cbf8a216259dceefe570f6dc14746f43b2e627 (patch)
tree1eca0b9922dee01b4d00dc0713b7ff434dddd44c /include/linux/string.h
parent6c941c8556dd9269be621cd8159fc60e955a91b3 (diff)
parent2fbe74b90bafebce615466b4c20f96b0465df1ae (diff)
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'include/linux/string.h')
-rw-r--r--include/linux/string.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h
index b8508868d5ad..651839a2a755 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -62,7 +62,15 @@ 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 *);
#endif