From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 13/13] attr: rename str_null from NULL away
Date: Sat, 23 Oct 2010 07:44:50 +0200 [thread overview]
Message-ID: <1287812691-14470-14-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1287812691-14470-1-git-send-email-jengelh@medozas.de>
A small little pedantism: NULL (as in, the pointer) isn't NUL (as in,
the character with value zero, '\0'). I propose to rename it to strz,
for the zero-terminated string (sometimes referred to as ASCIZ string,
but of course C isn't tied to ASCII).
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
examples/genl/genl-family-get.c | 2 +-
include/libmnl/libmnl.h | 2 +-
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);
diff --git a/src/attr.c b/src/attr.c
index 06d6367..c60e1f4 100644
--- a/src/attr.c
+++ b/src/attr.c
@@ -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);
}
--
1.7.1
next prev parent reply other threads:[~2010-10-23 5:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-23 5:44 libmnl: misc code updates Jan Engelhardt
2010-10-23 5:44 ` [PATCH 01/13] build: fix disable_static functionality Jan Engelhardt
2010-10-23 5:44 ` [PATCH 02/13] src: avoid using deprecated unspecified argument lists Jan Engelhardt
2010-10-23 5:44 ` [PATCH 03/13] src: add const qualifiers Jan Engelhardt
2010-10-23 5:44 ` [PATCH 04/13] src: remove redundant casts Jan Engelhardt
2010-10-23 5:44 ` [PATCH 05/13] socket: remove statement with no effect Jan Engelhardt
2010-10-23 5:44 ` [PATCH 06/13] doc: documentation updates Jan Engelhardt
2010-10-23 5:44 ` [PATCH 07/13] include: consistent usage of "extern" Jan Engelhardt
2010-10-23 5:44 ` [PATCH 08/13] attr: string functions should take char * Jan Engelhardt
2010-10-23 5:44 ` [PATCH 09/13] callback: mnl_cb_run should use a void * Jan Engelhardt
2010-10-23 5:44 ` [PATCH 10/13] socket: use more appropriate types for mnl_socket_bind Jan Engelhardt
2010-10-23 5:44 ` [PATCH 11/13] include: add cplusplus guards for extern Jan Engelhardt
2010-10-23 5:44 ` [PATCH 12/13] nlmsg: use bool return type for yes-no functions Jan Engelhardt
2010-10-23 5:44 ` Jan Engelhardt [this message]
2010-10-23 14:52 ` libmnl: misc code updates Pablo Neira Ayuso
2010-10-23 18:53 ` Jan Engelhardt
2010-10-24 20:33 ` Jozsef Kadlecsik
2010-10-24 22:45 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287812691-14470-14-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).