X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flibcfs_string.h;h=238be3502bdacb030c198f9df38364ab1abb6f0d;hb=05d13ca333a3158a98f0c0e048a85564c6b9ed88;hp=5afaec74a18e870c436a8873972a2bb717822226;hpb=917b0a17d4e50db9f966763925a2dc860d932a3b;p=fs%2Flustre-release.git diff --git a/libcfs/include/libcfs/libcfs_string.h b/libcfs/include/libcfs/libcfs_string.h index 5afaec7..238be35 100644 --- a/libcfs/include/libcfs/libcfs_string.h +++ b/libcfs/include/libcfs/libcfs_string.h @@ -27,7 +27,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -45,17 +45,10 @@ /* libcfs_string.c */ char *cfs_strrstr(const char *haystack, const char *needle); -/* string comparison ignoring case */ -int cfs_strncasecmp(const char *s1, const char *s2, size_t n); /* Convert a text string to a bitmask */ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit), int *oldmask, int minmask, int allmask); -/* Allocate space for and copy an existing string. - * Must free with kfree(). - */ -char *cfs_strdup(const char *str, u_int32_t flags); - /* safe vsnprintf */ int cfs_vsnprintf(char *buf, size_t size, const char *fmt, va_list args); @@ -91,21 +84,6 @@ struct cfs_expr_list { struct list_head el_exprs; }; -static inline int -cfs_iswhite(char c) -{ - switch (c) { - case ' ': - case '\t': - case '\n': - case '\r': - return 1; - default: - break; - } - return 0; -} - char *cfs_trimwhite(char *str); int cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res); int cfs_str2num_check(char *str, int nob, unsigned *num, @@ -132,10 +110,5 @@ int cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max, void cfs_expr_list_free_list(struct list_head *list); int cfs_ip_addr_parse(char *str, int len, struct list_head *list); int cfs_ip_addr_match(__u32 addr, struct list_head *list); -void cfs_ip_addr_free(struct list_head *list); - -#ifdef __KERNEL__ -#define strtoul(str, endp, base) simple_strtoul(str, endp, base) -#endif #endif