From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 09/13] callback: mnl_cb_run should use a void *
Date: Sat, 23 Oct 2010 07:44:46 +0200 [thread overview]
Message-ID: <1287812691-14470-10-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1287812691-14470-1-git-send-email-jengelh@medozas.de>
Because in most cases, it won't be a nul-terminated string :)
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
include/libmnl/libmnl.h | 4 ++--
src/callback.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h
index a61a0b1..d35e1c1 100644
--- a/include/libmnl/libmnl.h
+++ b/include/libmnl/libmnl.h
@@ -141,10 +141,10 @@ extern int mnl_attr_parse_nested(const struct nlattr *attr, mnl_attr_cb_t cb, vo
typedef int (*mnl_cb_t)(const struct nlmsghdr *nlh, void *data);
-extern int mnl_cb_run(const char *buf, size_t numbytes, unsigned int seq,
+extern int mnl_cb_run(const void *buf, size_t numbytes, unsigned int seq,
unsigned int portid, mnl_cb_t cb_data, void *data);
-extern int mnl_cb_run2(const char *buf, size_t numbytes, unsigned int seq,
+extern int mnl_cb_run2(const void *buf, size_t numbytes, unsigned int seq,
unsigned int portid, mnl_cb_t cb_data, void *data,
mnl_cb_t *cb_ctl_array, unsigned int cb_ctl_array_len);
diff --git a/src/callback.c b/src/callback.c
index f5a6112..4a8fa2d 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -74,12 +74,12 @@ static const mnl_cb_t default_cb_array[NLMSG_MIN_TYPE] = {
* is set to ESRCH. If the sequence number is not the expected, errno is set
* to EPROTO.
*/
-int mnl_cb_run2(const char *buf, size_t numbytes, unsigned int seq,
+int mnl_cb_run2(const void *buf, size_t numbytes, unsigned int seq,
unsigned int portid, mnl_cb_t cb_data, void *data,
mnl_cb_t *cb_ctl_array, unsigned int cb_ctl_array_len)
{
int ret = MNL_CB_OK, len = numbytes;
- struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
+ const struct nlmsghdr *nlh = buf;
while (mnl_nlmsg_ok(nlh, len)) {
/* check message source */
@@ -136,7 +136,7 @@ out:
*
* This function propagates the callback return value.
*/
-int mnl_cb_run(const char *buf, size_t numbytes, unsigned int seq,
+int mnl_cb_run(const void *buf, size_t numbytes, unsigned int seq,
unsigned int portid, mnl_cb_t cb_data, void *data)
{
return mnl_cb_run2(buf, numbytes, seq, portid, cb_data, data, NULL, 0);
--
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 ` Jan Engelhardt [this message]
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 ` [PATCH 13/13] attr: rename str_null from NULL away Jan Engelhardt
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-10-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).