X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Fnidstrings.c;h=8f3236d6f935901842a0cd4231bf94fc8845f592;hp=24744459f3d635d486a16d68e6111232f00435aa;hb=6c0fa97869b568a7af2d21e7e4ed2b440b7dfa27;hpb=05d13ca333a3158a98f0c0e048a85564c6b9ed88 diff --git a/lnet/lnet/nidstrings.c b/lnet/lnet/nidstrings.c index 2474445..8f3236d 100644 --- a/lnet/lnet/nidstrings.c +++ b/lnet/lnet/nidstrings.c @@ -941,7 +941,7 @@ libcfs_ip_addr_range_print(char *buffer, int count, struct list_head *list) list_for_each_entry(el, list, el_link) { LASSERT(j++ < 4); if (i != 0) - i += cfs_snprintf(buffer + i, count - i, "."); + i += scnprintf(buffer + i, count - i, "."); i += cfs_expr_list_print(buffer + i, count - i, el); } return i; @@ -959,9 +959,9 @@ cfs_print_network(char *buffer, int count, struct nidrange *nr) struct netstrfns *nf = nr->nr_netstrfns; if (nr->nr_netnum == 0) - return cfs_snprintf(buffer, count, "@%s", nf->nf_name); + return scnprintf(buffer, count, "@%s", nf->nf_name); else - return cfs_snprintf(buffer, count, "@%s%u", + return scnprintf(buffer, count, "@%s%u", nf->nf_name, nr->nr_netnum); } @@ -982,7 +982,7 @@ cfs_print_addrranges(char *buffer, int count, struct list_head *addrranges, list_for_each_entry(ar, addrranges, ar_link) { if (i != 0) - i += cfs_snprintf(buffer + i, count - i, " "); + i += scnprintf(buffer + i, count - i, " "); i += nf->nf_print_addrlist(buffer + i, count - i, &ar->ar_numaddr_ranges); i += cfs_print_network(buffer + i, count - i, nr); @@ -1007,11 +1007,11 @@ int cfs_print_nidlist(char *buffer, int count, struct list_head *nidlist) list_for_each_entry(nr, nidlist, nr_link) { if (i != 0) - i += cfs_snprintf(buffer + i, count - i, " "); + i += scnprintf(buffer + i, count - i, " "); if (nr->nr_all != 0) { LASSERT(list_empty(&nr->nr_addrranges)); - i += cfs_snprintf(buffer + i, count - i, "*"); + i += scnprintf(buffer + i, count - i, "*"); i += cfs_print_network(buffer + i, count - i, nr); } else { i += cfs_print_addrranges(buffer + i, count - i,