X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flibcfs_string.c;h=04e1dd56dd4309b1f07e547a97f71436090227dd;hb=66bb2d13f8c4eb9670c8c98655221593f8aaf77d;hp=bb956a294f8a147371d83aae8435165fb198dfdc;hpb=d97075bb9644dba102491280690e58ad8caf1acf;p=fs%2Flustre-release.git diff --git a/libcfs/libcfs/libcfs_string.c b/libcfs/libcfs/libcfs_string.c index bb956a2..04e1dd5 100644 --- a/libcfs/libcfs/libcfs_string.c +++ b/libcfs/libcfs/libcfs_string.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,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, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -139,54 +135,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) { @@ -220,12 +168,12 @@ cfs_trimwhite(char *str) { char *end; - while (cfs_iswhite(*str)) + while (isspace(*str)) str++; end = str + strlen(str); while (end > str) { - if (!cfs_iswhite(end[-1])) + if (!isspace(end[-1])) break; end--; } @@ -255,7 +203,7 @@ cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res) /* skip leading white spaces */ while (next->ls_len) { - if (!cfs_iswhite(*next->ls_str)) + if (!isspace(*next->ls_str)) break; next->ls_str++; next->ls_len--; @@ -282,7 +230,7 @@ cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res) /* skip ending whitespaces */ while (--end != res->ls_str) { - if (!cfs_iswhite(*end)) + if (!isspace(*end)) break; } @@ -306,12 +254,12 @@ cfs_str2num_check(char *str, int nob, unsigned *num, { char *endp; - *num = strtoul(str, &endp, 0); + *num = simple_strtoul(str, &endp, 0); if (endp == str) return 0; for (; endp < str + nob; endp++) { - if (!cfs_iswhite(*endp)) + if (!isspace(*endp)) return 0; } @@ -332,7 +280,7 @@ EXPORT_SYMBOL(cfs_str2num_check); * \retval 0 will be returned if it can be parsed, otherwise -EINVAL or * -ENOMEM will be returned. */ -int +static int cfs_range_expr_parse(struct cfs_lstr *src, unsigned min, unsigned max, int bracketed, struct cfs_range_expr **expr) { @@ -395,7 +343,6 @@ cfs_range_expr_parse(struct cfs_lstr *src, unsigned min, unsigned max, LIBCFS_FREE(re, sizeof(*re)); return -EINVAL; } -EXPORT_SYMBOL(cfs_range_expr_parse); /** * Print the range expression \a re into specified \a buffer. @@ -416,12 +363,12 @@ cfs_range_expr_print(char *buffer, int count, struct cfs_range_expr *expr, s[0] = e[0] = '\0'; if (expr->re_lo == expr->re_hi) - i = cfs_snprintf(buffer, count, "%u", expr->re_lo); + i = scnprintf(buffer, count, "%u", expr->re_lo); else if (expr->re_stride == 1) - i = cfs_snprintf(buffer, count, "%s%u-%u%s", + i = scnprintf(buffer, count, "%s%u-%u%s", s, expr->re_lo, expr->re_hi, e); else - i = cfs_snprintf(buffer, count, "%s%u-%u/%u%s", + i = scnprintf(buffer, count, "%s%u-%u/%u%s", s, expr->re_lo, expr->re_hi, expr->re_stride, e); return i; @@ -448,17 +395,17 @@ cfs_expr_list_print(char *buffer, int count, struct cfs_expr_list *expr_list) numexprs++; if (numexprs > 1) - i += cfs_snprintf(buffer + i, count - i, "["); + i += scnprintf(buffer + i, count - i, "["); list_for_each_entry(expr, &expr_list->el_exprs, re_link) { if (j++ != 0) - i += cfs_snprintf(buffer + i, count - i, ","); + i += scnprintf(buffer + i, count - i, ","); i += cfs_range_expr_print(buffer + i, count - i, expr, numexprs > 1); } if (numexprs > 1) - i += cfs_snprintf(buffer + i, count - i, "]"); + i += scnprintf(buffer + i, count - i, "]"); return i; } @@ -533,6 +480,16 @@ cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, __u32 **valpp) } EXPORT_SYMBOL(cfs_expr_list_values); +void +cfs_expr_list_values_free(__u32 *values, int num) +{ + /* This array is allocated by LIBCFS_ALLOC(), so it shouldn't be freed + * by OBD_FREE() if it's called by module other than libcfs & LNet, + * otherwise we will see fake memory leak */ + LIBCFS_FREE(values, num * sizeof(values[0])); +} +EXPORT_SYMBOL(cfs_expr_list_values_free); + /** * Frees cfs_range_expr structures of \a expr_list. * @@ -545,7 +502,7 @@ cfs_expr_list_free(struct cfs_expr_list *expr_list) struct cfs_range_expr *expr; expr = list_entry(expr_list->el_exprs.next, - struct cfs_range_expr, re_link), + struct cfs_range_expr, re_link); list_del(&expr->re_link); LIBCFS_FREE(expr, sizeof(*expr)); } @@ -637,72 +594,3 @@ cfs_expr_list_free_list(struct list_head *list) } } EXPORT_SYMBOL(cfs_expr_list_free_list); - -int -cfs_ip_addr_parse(char *str, int len, struct list_head *list) -{ - struct cfs_expr_list *el; - struct cfs_lstr src; - int rc; - int i; - - src.ls_str = str; - src.ls_len = len; - i = 0; - - while (src.ls_str != NULL) { - struct cfs_lstr res; - - if (!cfs_gettok(&src, '.', &res)) { - rc = -EINVAL; - goto out; - } - - rc = cfs_expr_list_parse(res.ls_str, res.ls_len, 0, 255, &el); - if (rc != 0) - goto out; - - list_add_tail(&el->el_link, list); - i++; - } - - if (i == 4) - return 0; - - rc = -EINVAL; - out: - cfs_expr_list_free_list(list); - - return rc; -} -EXPORT_SYMBOL(cfs_ip_addr_parse); - -/** - * Matches address (\a addr) against address set encoded in \a list. - * - * \retval 1 if \a addr matches - * \retval 0 otherwise - */ -int -cfs_ip_addr_match(__u32 addr, struct list_head *list) -{ - struct cfs_expr_list *el; - int i = 0; - - list_for_each_entry_reverse(el, list, el_link) { - if (!cfs_expr_list_match(addr & 0xff, el)) - return 0; - addr >>= 8; - i++; - } - - return i == 4; -} -EXPORT_SYMBOL(cfs_ip_addr_match); - -void -cfs_ip_addr_free(struct list_head *list) -{ - cfs_expr_list_free_list(list); -} -EXPORT_SYMBOL(cfs_ip_addr_free);