From b0967993a76da06d306112bef31d9861b584fa07 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 22 Oct 2010 21:02:27 +0200 Subject: attr: string functions should take char * I do not quite see the point of using strlen in conjunction with non-string data; so let's use char * as argument types to catch misuses. Signed-off-by: Jan Engelhardt --- include/libmnl/libmnl.h | 4 ++-- src/attr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h index 0442d05..a61a0b1 100644 --- a/include/libmnl/libmnl.h +++ b/include/libmnl/libmnl.h @@ -81,8 +81,8 @@ extern void mnl_attr_put_u8(struct nlmsghdr *nlh, uint16_t type, uint8_t data); extern void mnl_attr_put_u16(struct nlmsghdr *nlh, uint16_t type, uint16_t data); extern void mnl_attr_put_u32(struct nlmsghdr *nlh, uint16_t type, uint32_t data); extern void mnl_attr_put_u64(struct nlmsghdr *nlh, uint16_t type, uint64_t data); -extern void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const void *data); -extern void mnl_attr_put_str_null(struct nlmsghdr *nlh, uint16_t type, const void *data); +extern void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const char *data); +extern void mnl_attr_put_str_null(struct nlmsghdr *nlh, uint16_t type, const char *data); /* TLV attribute nesting */ extern struct nlattr *mnl_attr_nest_start(struct nlmsghdr *nlh, uint16_t type); diff --git a/src/attr.c b/src/attr.c index f77f239..06d6367 100644 --- a/src/attr.c +++ b/src/attr.c @@ -443,7 +443,7 @@ void mnl_attr_put_u64(struct nlmsghdr *nlh, uint16_t type, uint64_t data) * This function updates the length field of the Netlink message (nlmsg_len) * by adding the size (header + payload) of the new attribute. */ -void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const void *data) +void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const char *data) { mnl_attr_put(nlh, type, strlen(data), data); } @@ -460,7 +460,7 @@ void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const void *data) * This function updates the length field of the Netlink message (nlmsg_len) * by adding the size (header + payload) of the new attribute. */ -void mnl_attr_put_str_null(struct nlmsghdr *nlh, uint16_t type, const void *data) +void mnl_attr_put_str_null(struct nlmsghdr *nlh, uint16_t type, const char *data) { mnl_attr_put(nlh, type, strlen(data)+1, data); } -- cgit v1.2.3