From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 1/2] param_enum: Make name strings const
Date: Tue, 1 Sep 2015 08:18:04 +0200 [thread overview]
Message-ID: <1441088285-22965-1-git-send-email-s.hauer@pengutronix.de> (raw)
Not only the array containing the pointers should be const but
also the strings themselves, so instead of using const char **
use const char * const *.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
include/globalvar.h | 4 ++--
include/param.h | 4 ++--
lib/parameter.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/globalvar.h b/include/globalvar.h
index 6e10956..e77209b 100644
--- a/include/globalvar.h
+++ b/include/globalvar.h
@@ -60,7 +60,7 @@ static inline int globalvar_add_simple_bool(const char *name,
}
static inline int globalvar_add_simple_enum(const char *name,
- int *value, const char **names, int max)
+ int *value, const char * const *names, int max)
{
struct param_d *p;
@@ -117,7 +117,7 @@ static inline int globalvar_add_simple_bool(const char *name,
}
static inline int globalvar_add_simple_enum(const char *name,
- int *value, const char **names, int max)
+ int *value, const char * const *names, int max)
{
return 0;
}
diff --git a/include/param.h b/include/param.h
index 3a851fc..3fb4740 100644
--- a/include/param.h
+++ b/include/param.h
@@ -50,7 +50,7 @@ struct param_d *dev_add_param_bool(struct device_d *dev, const char *name,
struct param_d *dev_add_param_enum(struct device_d *dev, const char *name,
int (*set)(struct param_d *p, void *priv),
int (*get)(struct param_d *p, void *priv),
- int *value, const char **names, int max, void *priv);
+ int *value, const char * const *names, int max, void *priv);
struct param_d *dev_add_param_int_ro(struct device_d *dev, const char *name,
int value, const char *format);
@@ -120,7 +120,7 @@ static inline struct param_d *dev_add_param_int(struct device_d *dev, const char
static inline struct param_d *dev_add_param_enum(struct device_d *dev, const char *name,
int (*set)(struct param_d *p, void *priv),
int (*get)(struct param_d *p, void *priv),
- int *value, const char **names, int max, void *priv)
+ int *value, const char * const *names, int max, void *priv)
{
return ERR_PTR(-ENOSYS);
diff --git a/lib/parameter.c b/lib/parameter.c
index b238859..868b810 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -390,7 +390,7 @@ struct param_d *dev_add_param_int(struct device_d *dev, const char *name,
struct param_enum {
struct param_d param;
int *value;
- const char **names;
+ const char * const *names;
int num_names;
int (*set)(struct param_d *p, void *priv);
int (*get)(struct param_d *p, void *priv);
@@ -467,7 +467,7 @@ static void param_enum_info(struct param_d *p)
struct param_d *dev_add_param_enum(struct device_d *dev, const char *name,
int (*set)(struct param_d *p, void *priv),
int (*get)(struct param_d *p, void *priv),
- int *value, const char **names, int num_names, void *priv)
+ int *value, const char * const *names, int num_names, void *priv)
{
struct param_enum *pe;
struct param_d *p;
--
2.5.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2015-09-01 6:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-01 6:18 Sascha Hauer [this message]
2015-09-01 6:18 ` [PATCH 2/2] param_enum: protect against invalid values Sascha Hauer
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=1441088285-22965-1-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.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