netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 03/13] src: add const qualifiers
Date: Sat, 23 Oct 2010 07:44:40 +0200	[thread overview]
Message-ID: <1287812691-14470-4-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1287812691-14470-1-git-send-email-jengelh@medozas.de>

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 src/attr.c     |    8 ++++----
 src/callback.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/attr.c b/src/attr.c
index 9c17f4d..cafd2c7 100644
--- a/src/attr.c
+++ b/src/attr.c
@@ -138,7 +138,7 @@ static int __mnl_attr_validate(const struct nlattr *attr,
 			       enum mnl_attr_data_type type, size_t exp_len)
 {
 	uint16_t attr_len = mnl_attr_get_payload_len(attr);
-	char *attr_data = mnl_attr_get_payload(attr);
+	const char *attr_data = mnl_attr_get_payload(attr);
 
 	if (attr_len < exp_len) {
 		errno = ERANGE;
@@ -188,7 +188,7 @@ static int __mnl_attr_validate(const struct nlattr *attr,
 	return 0;
 }
 
-static size_t mnl_attr_data_type_len[MNL_TYPE_MAX] = {
+static const size_t mnl_attr_data_type_len[MNL_TYPE_MAX] = {
 	[MNL_TYPE_U8]		= sizeof(uint8_t),
 	[MNL_TYPE_U16]		= sizeof(uint16_t),
 	[MNL_TYPE_U32]		= sizeof(uint32_t),
@@ -255,7 +255,7 @@ int mnl_attr_parse(const struct nlmsghdr *nlh, unsigned int offset,
 		   mnl_attr_cb_t cb, void *data)
 {
 	int ret = MNL_CB_OK;
-	struct nlattr *attr = mnl_nlmsg_get_payload_offset(nlh, offset);
+	const struct nlattr *attr = mnl_nlmsg_get_payload_offset(nlh, offset);
 	int len = nlh->nlmsg_len - MNL_NLMSG_HDRLEN - MNL_ALIGN(offset);
 
 	while (mnl_attr_ok(attr, len)) {
@@ -284,7 +284,7 @@ int mnl_attr_parse_nested(const struct nlattr *nested,
 			  mnl_attr_cb_t cb, void *data)
 {
 	int ret = MNL_CB_OK;
-	struct nlattr *attr = mnl_attr_get_payload(nested);
+	const struct nlattr *attr = mnl_attr_get_payload(nested);
 	int len = mnl_attr_get_payload_len(nested);
 
 	while (mnl_attr_ok(attr, len)) {
diff --git a/src/callback.c b/src/callback.c
index e1599ff..f5a6112 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -37,7 +37,7 @@ static int mnl_cb_stop(const struct nlmsghdr *nlh, void *data)
 	return MNL_CB_STOP;
 }
 
-static mnl_cb_t default_cb_array[NLMSG_MIN_TYPE] = {
+static const mnl_cb_t default_cb_array[NLMSG_MIN_TYPE] = {
 	[NLMSG_NOOP]	= mnl_cb_noop,
 	[NLMSG_ERROR]	= mnl_cb_error,
 	[NLMSG_DONE]	= mnl_cb_stop,
-- 
1.7.1


  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 ` Jan Engelhardt [this message]
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 ` [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-4-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).