From 51f2ded17c35c146488f6f3b697764bb2953a156 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 23 Apr 2012 13:01:00 +0200 Subject: param: make return value of param getter function const The string returned by the getter function should not be changed. Make it const. Signed-off-by: Sascha Hauer --- include/param.h | 6 +++--- lib/parameter.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/param.h b/include/param.h index 4a39dc732c..e7b66a4d68 100644 --- a/include/param.h +++ b/include/param.h @@ -10,7 +10,7 @@ struct device_d; typedef unsigned long IPaddr_t; struct param_d { - char* (*get)(struct device_d *, struct param_d *param); + const char* (*get)(struct device_d *, struct param_d *param); int (*set)(struct device_d *, struct param_d *param, const char *val); unsigned int flags; char *name; @@ -24,9 +24,9 @@ const char *dev_get_param(struct device_d *dev, const char *name); int dev_set_param(struct device_d *dev, const char *name, const char *val); struct param_d *get_param_by_name(struct device_d *dev, const char *name); -int dev_add_param(struct device_d *dev, char *name, +int dev_add_param(struct device_d *dev, const char *name, int (*set)(struct device_d *dev, struct param_d *p, const char *val), - char *(*get)(struct device_d *, struct param_d *p), + const char *(*get)(struct device_d *, struct param_d *p), unsigned long flags); int dev_add_param_fixed(struct device_d *dev, char *name, char *value); diff --git a/lib/parameter.c b/lib/parameter.c index 5a7ae1a3cf..e7464670b3 100644 --- a/lib/parameter.c +++ b/lib/parameter.c @@ -133,14 +133,14 @@ int dev_param_set_generic(struct device_d *dev, struct param_d *p, return 0; } -static char *param_get_generic(struct device_d *dev, struct param_d *p) +static const char *param_get_generic(struct device_d *dev, struct param_d *p) { return p->value; } -static struct param_d *__dev_add_param(struct device_d *dev, char *name, +static struct param_d *__dev_add_param(struct device_d *dev, const char *name, int (*set)(struct device_d *dev, struct param_d *p, const char *val), - char *(*get)(struct device_d *dev, struct param_d *p), + const char *(*get)(struct device_d *dev, struct param_d *p), unsigned long flags) { struct param_d *param; @@ -176,9 +176,9 @@ static struct param_d *__dev_add_param(struct device_d *dev, char *name, * expect the parameter value to be a string which can be freed with free(). Do * not use static arrays when using the generic functions. */ -int dev_add_param(struct device_d *dev, char *name, +int dev_add_param(struct device_d *dev, const char *name, int (*set)(struct device_d *dev, struct param_d *p, const char *val), - char *(*get)(struct device_d *dev, struct param_d *param), + const char *(*get)(struct device_d *dev, struct param_d *param), unsigned long flags) { struct param_d *param; -- cgit v1.2.3