From adae0f1a8967e5e853c98a336c51553c07c1d269 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 5 Apr 2010 18:23:25 +0200 Subject: rename mnl_nlmsg_payload_size() to mnl_nlmsg_get_payload_len() for consistency Signed-off-by: Pablo Neira Ayuso --- include/libmnl/libmnl.h | 4 ++-- src/nlmsg.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h index 5d05b19..b7e72c8 100644 --- a/include/libmnl/libmnl.h +++ b/include/libmnl/libmnl.h @@ -35,7 +35,7 @@ extern int mnl_socket_getsockopt(const struct mnl_socket *nl, int type, void *bu extern size_t mnl_nlmsg_size(int len); extern size_t mnl_nlmsg_total_size(int len); -extern size_t mnl_nlmsg_payload_size(const struct nlmsghdr *nlh); +extern size_t mnl_nlmsg_get_payload_len(const struct nlmsghdr *nlh); /* Netlink message header builder */ extern struct nlmsghdr *mnl_nlmsg_put_header(void *buf); @@ -112,7 +112,7 @@ extern int mnl_attr_ok(const struct nlattr *attr, int len); extern struct nlattr *mnl_attr_next(const struct nlattr *attr, int *len); #define mnl_attr_for_each(attr, nlh, offset) \ - int __len__ = mnl_nlmsg_payload_size(nlh); \ + int __len__ = mnl_nlmsg_get_payload_len(nlh); \ for (attr = mnl_nlmsg_get_data_offset(nlh, offset); \ mnl_attr_ok(attr, __len__); \ attr = mnl_attr_next(attr, &(__len__))) diff --git a/src/nlmsg.c b/src/nlmsg.c index ad387e7..274aa8e 100644 --- a/src/nlmsg.c +++ b/src/nlmsg.c @@ -38,12 +38,12 @@ size_t mnl_nlmsg_aligned_size(int len) } /** - * mnl_nlmsg_payload_size - get the size of the payload + * mnl_nlmsg_get_payload_len - get the size of the payload * @nlh: pointer to the header of the netlink message * * This function returns the size of the netlink payload */ -size_t mnl_nlmsg_payload_size(const struct nlmsghdr *nlh) +size_t mnl_nlmsg_get_payload_len(const struct nlmsghdr *nlh) { return nlh->nlmsg_len - MNL_NLMSG_HDRLEN; } -- cgit v1.2.3