diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-04-04 16:19:03 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-04-04 16:19:03 +0200 |
commit | bd00b928e678b3ede5dbc5abc933539fe5cc31e6 (patch) | |
tree | c598104414480b55bc819f679715ba55b9228a1e | |
parent | 117f033c413820739e6679c926a39a5b3f45ff79 (diff) | |
download | libmnl-bd00b928e678b3ede5dbc5abc933539fe5cc31e6.tar.gz libmnl-bd00b928e678b3ede5dbc5abc933539fe5cc31e6.zip |
remove mnl_align() as it's been replaced by MNL_ALIGN()
We remove mnl_align() since it has been replaced by the macro
MNL_ALIGN(). The macro allows its use in static arrays and
such.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | include/libmnl/libmnl.h | 1 | ||||
-rw-r--r-- | src/attr.c | 8 | ||||
-rw-r--r-- | src/msg.c | 28 |
3 files changed, 12 insertions, 25 deletions
diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h index 8502eeb..efdae74 100644 --- a/include/libmnl/libmnl.h +++ b/include/libmnl/libmnl.h @@ -33,7 +33,6 @@ extern int mnl_socket_getsockopt(const struct mnl_socket *nl, int type, void *bu #define MNL_ALIGN(len) (((len)+MNL_ALIGNTO-1) & ~(MNL_ALIGNTO-1)) #define MNL_NLMSG_HDRLEN MNL_ALIGN(sizeof(struct nlmsghdr)) -extern int mnl_align(int len); 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); @@ -91,8 +91,8 @@ int mnl_attr_ok(const struct nlattr *attr, int len) */ struct nlattr *mnl_attr_next(const struct nlattr *attr, int *len) { - *len -= mnl_align(attr->nla_len); - return (struct nlattr *)((void *)attr + mnl_align(attr->nla_len)); + *len -= MNL_ALIGN(attr->nla_len); + return (struct nlattr *)((void *)attr + MNL_ALIGN(attr->nla_len)); } /** @@ -333,12 +333,12 @@ const char *mnl_attr_get_str(const struct nlattr *attr) void mnl_attr_put(struct nlmsghdr *nlh, int type, size_t len, const void *data) { struct nlattr *attr = mnl_nlmsg_get_tail(nlh); - int payload_len = mnl_align(sizeof(struct nlattr)) + len; + int payload_len = MNL_ALIGN(sizeof(struct nlattr)) + len; attr->nla_type = type; attr->nla_len = payload_len; memcpy(mnl_attr_get_data(attr), data, len); - nlh->nlmsg_len += mnl_align(payload_len); + nlh->nlmsg_len += MNL_ALIGN(payload_len); } /** @@ -14,18 +14,6 @@ #include <libmnl/libmnl.h> /** - * mnl_align - align a value to four bytes - * @value: the value that we want to get aligned - * - * This function returns the value passed aligned to four bytes. Netlink - * message headers and its attributes are always aligned to four bytes. - */ -int mnl_align(int value) -{ - return (value + MNL_ALIGNTO - 1) & ~(MNL_ALIGNTO - 1); -} - -/** * mnl_nlmsg_size - get size of the netlink messages (without alignment) * @len: length of the netlink message * @@ -34,7 +22,7 @@ int mnl_align(int value) */ size_t mnl_nlmsg_size(int len) { - return len + mnl_align(MNL_NLMSG_HDRLEN); + return len + MNL_ALIGN(MNL_NLMSG_HDRLEN); } /** @@ -46,7 +34,7 @@ size_t mnl_nlmsg_size(int len) */ size_t mnl_nlmsg_aligned_size(int len) { - return mnl_align(mnl_nlmsg_size(len)); + return MNL_ALIGN(mnl_nlmsg_size(len)); } /** @@ -71,7 +59,7 @@ size_t mnl_nlmsg_payload_size(const struct nlmsghdr *nlh) */ struct nlmsghdr *mnl_nlmsg_put_header(void *buf) { - int len = mnl_align(sizeof(struct nlmsghdr)); + int len = MNL_ALIGN(sizeof(struct nlmsghdr)); struct nlmsghdr *nlh = buf; memset(buf, 0, len); @@ -92,7 +80,7 @@ struct nlmsghdr *mnl_nlmsg_put_header(void *buf) void *mnl_nlmsg_put_extra_header(struct nlmsghdr *nlh, int size) { char *ptr = (char *)nlh + nlh->nlmsg_len; - nlh->nlmsg_len += mnl_align(size); + nlh->nlmsg_len += MNL_ALIGN(size); memset(ptr, 0, size); return ptr; } @@ -130,7 +118,7 @@ void *mnl_nlmsg_get_data(const struct nlmsghdr *nlh) */ void *mnl_nlmsg_get_data_offset(const struct nlmsghdr *nlh, int offset) { - return (void *)nlh + MNL_NLMSG_HDRLEN + mnl_align(offset); + return (void *)nlh + MNL_NLMSG_HDRLEN + MNL_ALIGN(offset); } /** @@ -162,8 +150,8 @@ int mnl_nlmsg_ok(const struct nlmsghdr *nlh, int len) */ struct nlmsghdr *mnl_nlmsg_next(const struct nlmsghdr *nlh, int *len) { - *len -= mnl_align(nlh->nlmsg_len); - return (struct nlmsghdr *)((void *)nlh + mnl_align(nlh->nlmsg_len)); + *len -= MNL_ALIGN(nlh->nlmsg_len); + return (struct nlmsghdr *)((void *)nlh + MNL_ALIGN(nlh->nlmsg_len)); } /** @@ -175,7 +163,7 @@ struct nlmsghdr *mnl_nlmsg_next(const struct nlmsghdr *nlh, int *len) */ void *mnl_nlmsg_get_tail(const struct nlmsghdr *nlh) { - return (struct nlmsghdr *)((void *)nlh + mnl_align(nlh->nlmsg_len)); + return (struct nlmsghdr *)((void *)nlh + MNL_ALIGN(nlh->nlmsg_len)); } /** |