diff options
| -rw-r--r-- | examples/genl/genl-family-get.c | 2 | ||||
| -rw-r--r-- | include/libmnl/libmnl.h | 2 | ||||
| -rw-r--r-- | src/attr.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/genl/genl-family-get.c b/examples/genl/genl-family-get.c index b015466..be8da3c 100644 --- a/examples/genl/genl-family-get.c +++ b/examples/genl/genl-family-get.c @@ -204,7 +204,7 @@ int main(int argc, char *argv[]) genl->version = 1; mnl_attr_put_u32(nlh, CTRL_ATTR_FAMILY_ID, GENL_ID_CTRL); - mnl_attr_put_str_null(nlh, CTRL_ATTR_FAMILY_NAME, argv[1]); + mnl_attr_put_strz(nlh, CTRL_ATTR_FAMILY_NAME, argv[1]); nl = mnl_socket_open(NETLINK_GENERIC); if (nl == NULL) { diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h index a32fb1d..7094af2 100644 --- a/include/libmnl/libmnl.h +++ b/include/libmnl/libmnl.h @@ -89,7 +89,7 @@ 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 char *data); -extern void mnl_attr_put_str_null(struct nlmsghdr *nlh, uint16_t type, const char *data); +extern void mnl_attr_put_strz(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); @@ -449,18 +449,18 @@ void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const char *data) } /** - * mnl_attr_put_str_null - add string attribute to netlink message + * mnl_attr_put_strz - add string attribute to netlink message * \param nlh pointer to the netlink message * \param type netlink attribute type * \param data pointer to string data that is stored by the new attribute * - * This function is similar to mnl_attr_put_str, but it includes the NUL - * terminator at the end of the string. + * This function is similar to mnl_attr_put_str, but it includes the + * NUL/zero ('\0') terminator at the end of the string. * * 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 char *data) +void mnl_attr_put_strz(struct nlmsghdr *nlh, uint16_t type, const char *data) { mnl_attr_put(nlh, type, strlen(data)+1, data); } |