From 1f09fdccb75005a53ba2bb90fb61d4e6f45e8e14 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 12 Apr 2010 18:06:28 +0200 Subject: remove mnl_nlmsg_get_len() function Remove mnl_nlmsg_get_len() since it returns a field of a structure that is public (struct nlmsghdr). We can directly access the header fields and they are not likely to change in the future (at least for this version of Netlink I think). Signed-off-by: Pablo Neira Ayuso --- src/attr.c | 2 +- src/nlmsg.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/attr.c b/src/attr.c index 936a9ae..59cf8c0 100644 --- a/src/attr.c +++ b/src/attr.c @@ -247,7 +247,7 @@ int mnl_attr_parse(const struct nlmsghdr *nlh, int offset, { int ret = MNL_CB_OK; struct nlattr *attr = mnl_nlmsg_get_payload_offset(nlh, offset); - int len = mnl_nlmsg_get_len(nlh); + int len = nlh->nlmsg_len; while (mnl_attr_ok(attr, len)) { if (cb && (ret = cb(attr, data)) <= MNL_CB_STOP) diff --git a/src/nlmsg.c b/src/nlmsg.c index 4450cf5..de41be6 100644 --- a/src/nlmsg.c +++ b/src/nlmsg.c @@ -112,21 +112,6 @@ void *mnl_nlmsg_put_extra_header(struct nlmsghdr *nlh, int size) return ptr; } -/** - * mnl_nlmsg_get_len - get the length field from the netlink message - * @nlh: pointer to a netlink header - * - * This function returns the full length of the Netlink message (including the - * length of the Netlink header) by return the field nlmsg_len of the message. - * - * XXX: This function is likely to be deleted soon since the structure of the - * Netlink header is public. - */ -uint16_t mnl_nlmsg_get_len(const struct nlmsghdr *nlh) -{ - return nlh->nlmsg_len; -} - /** * mnl_nlmsg_get_payload - get a pointer to the payload of the netlink message * @nlh: pointer to a netlink header @@ -248,7 +233,7 @@ void mnl_nlmsg_print(const struct nlmsghdr *nlh) printf("port ID(32 bits)=%.08u\n", nlh->nlmsg_pid); printf("===================================\n"); - for (i=sizeof(struct nlmsghdr); inlmsg_len; i+=4) { char *b = (char *) nlh; printf("(%.3d) %.2x %.2x %.2x %.2x | ", i, -- cgit v1.2.3