From f4d718309d8737059453fbd452ceac83110d61ad Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Wed, 6 May 2015 16:11:25 +0200
Subject: [PATCH] iscsi-scstd: Constify several function arguments

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
---
 iscsi-scst/usr/config.c | 10 +++++-----
 iscsi-scst/usr/event.c  |  4 ++--
 iscsi-scst/usr/iscsid.c |  4 ++--
 iscsi-scst/usr/iscsid.h |  9 +++++----
 iscsi-scst/usr/param.c  | 24 +++++++++++++-----------
 iscsi-scst/usr/param.h  | 23 +++++++++++++----------
 6 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/iscsi-scst/usr/config.c b/iscsi-scst/usr/config.c
index 7d0ec9b00..b423a722b 100644
--- a/iscsi-scst/usr/config.c
+++ b/iscsi-scst/usr/config.c
@@ -478,8 +478,8 @@ int account_replace(struct target *target, int direction,
 	return iscsi_attr_replace(list, sysfs_name, value);
 }
 
-int __config_account_add(struct target *target, int dir, char *name,
-	char *pass, char *sysfs_name, int send_to_kern, u32 cookie)
+int __config_account_add(struct target *target, int dir, char *name, char *pass,
+			 const char *sysfs_name, int send_to_kern, u32 cookie)
 {
 	int err = 0;
 	struct iscsi_attr *user;
@@ -550,8 +550,8 @@ out_destroy:
 	goto out;
 }
 
-int config_account_add(u32 tid, int dir, char *name, char *pass, char *sysfs_name,
-	u32 cookie)
+int config_account_add(u32 tid, int dir, char *name, char *pass,
+		       const char *sysfs_name, u32 cookie)
 {
 	int err = 0;
 	struct target *target;
@@ -705,7 +705,7 @@ static int __initiator_match(int fd, char *str)
 	return err;
 }
 
-static int initiator_match(u32 tid, int fd, char *filename)
+static int initiator_match(u32 tid, int fd, const char *filename)
 {
 	int err = 0;
 	FILE *fp;
diff --git a/iscsi-scst/usr/event.c b/iscsi-scst/usr/event.c
index 2dbf387bb..8c8b5e601 100644
--- a/iscsi-scst/usr/event.c
+++ b/iscsi-scst/usr/event.c
@@ -226,8 +226,8 @@ static int handle_e_del_target(int fd, const struct iscsi_kern_event *event)
 	return res;
 }
 
-static int handle_add_user(struct target *target, int dir, char *sysfs_name,
-	char *p, u32 cookie)
+static int handle_add_user(struct target *target, int dir,
+			   const char *sysfs_name, char *p, u32 cookie)
 {
 	int res;
 	char *name, *pass;
diff --git a/iscsi-scst/usr/iscsid.c b/iscsi-scst/usr/iscsid.c
index 1e4ee87bc..d1e0e46c6 100644
--- a/iscsi-scst/usr/iscsid.c
+++ b/iscsi-scst/usr/iscsid.c
@@ -48,7 +48,7 @@ static struct iscsi_key login_keys[] = {
 	{NULL,},
 };
 
-char *text_key_find(struct connection *conn, char *searchKey)
+char *text_key_find(struct connection *conn, const char *searchKey)
 {
 	char *data, *key, *value;
 	int keylen, datasize;
@@ -120,7 +120,7 @@ static struct buf_segment *conn_alloc_buf_segment(struct connection *conn,
 	return seg;
 }
 
-void text_key_add(struct connection *conn, char *key, const char *value)
+void text_key_add(struct connection *conn, const char *key, const char *value)
 {
 	struct buf_segment *seg;
 	int keylen = strlen(key);
diff --git a/iscsi-scst/usr/iscsid.h b/iscsi-scst/usr/iscsid.h
index a245b3513..eadc60911 100644
--- a/iscsi-scst/usr/iscsid.h
+++ b/iscsi-scst/usr/iscsid.h
@@ -266,8 +266,9 @@ extern int iscsi_enabled;
 
 extern int cmnd_execute(struct connection *conn);
 extern void cmnd_finish(struct connection *conn);
-extern char *text_key_find(struct connection *conn, char *searchKey);
-extern void text_key_add(struct connection *conn, char *key, const char *value);
+extern char *text_key_find(struct connection *conn, const char *searchKey);
+extern void text_key_add(struct connection *conn, const char *key,
+			 const char *value);
 
 /* log.c */
 extern int log_daemon;
@@ -358,9 +359,9 @@ extern int config_load(const char *config_name);
 extern int config_target_create(u32 *tid, char *name);
 extern int config_target_destroy(u32 tid);
 extern int config_account_add(u32 tid, int dir, char *name, char *pass,
-	char *sysfs_name, u32 cookie);
+	const char *sysfs_name, u32 cookie);
 extern int __config_account_add(struct target *target, int dir, char *name,
-	char *pass, char *sysfs_name, int send_to_kern, u32 cookie);
+	char *pass, const char *sysfs_name, int send_to_kern, u32 cookie);
 extern int config_account_query(u32 tid, int dir, const char *name, char *pass);
 extern int config_account_list(u32 tid, int dir, u32 *cnt, u32 *overflow,
 	char *buf, size_t buf_sz);
diff --git a/iscsi-scst/usr/param.c b/iscsi-scst/usr/param.c
index 09a93e3cc..04b692e78 100644
--- a/iscsi-scst/usr/param.c
+++ b/iscsi-scst/usr/param.c
@@ -35,7 +35,7 @@ size_t strlcpy(char *dest, const char *src, size_t size)
 	return ret;
 }
 
-int params_index_by_name(char *name, struct iscsi_key *keys)
+int params_index_by_name(const char *name, const struct iscsi_key *keys)
 {
 	int i, err = -ENOENT;
 
@@ -49,7 +49,7 @@ int params_index_by_name(char *name, struct iscsi_key *keys)
 	return err;
 }
 
-int params_index_by_name_numwild(char *name, struct iscsi_key *keys)
+int params_index_by_name_numwild(const char *name, const struct iscsi_key *keys)
 {
 	int i, err = -ENOENT;
 
@@ -72,7 +72,7 @@ next:
 	return err;
 }
 
-void params_set_defaults(unsigned int *params, struct iscsi_key *keys)
+void params_set_defaults(unsigned int *params, const struct iscsi_key *keys)
 {
 	int i;
 
@@ -88,7 +88,7 @@ static int range_val_to_str(unsigned int val, char *str, int len)
 	return 0;
 }
 
-static int range_str_to_val(char *str, unsigned int *val)
+static int range_str_to_val(const char *str, unsigned int *val)
 {
 	*val = strtol(str, NULL, 0);
 	return 0;
@@ -112,7 +112,7 @@ static int bool_val_to_str(unsigned int val, char *str, int len)
 	return err;
 }
 
-static int bool_str_to_val(char *str, unsigned int *val)
+static int bool_str_to_val(const char *str, unsigned int *val)
 {
 	int err = 0;
 
@@ -142,7 +142,7 @@ static int and_set_val(struct iscsi_param *param, int idx, unsigned int *val)
 	return 0;
 }
 
-static int num_check_val(struct iscsi_key *key, unsigned int *val)
+static int num_check_val(const struct iscsi_key *key, unsigned int *val)
 {
 	int err = 0;
 
@@ -201,10 +201,10 @@ out:
 	return 0;
 }
 
-static int digest_str_to_val(char *str, unsigned int *val)
+static int digest_str_to_val(const char *str, unsigned int *val)
 {
 	int err = 0;
-	char *p, *q;
+	const char *p, *q;
 	p = str;
 
 	*val = 0;
@@ -265,7 +265,8 @@ static int marker_set_val(struct iscsi_param *params, int idx, unsigned int *val
 	return 0;
 }
 
-int params_val_to_str(struct iscsi_key *keys, int idx, unsigned int val, char *str, int len)
+int params_val_to_str(const struct iscsi_key *keys, int idx, unsigned int val,
+		      char *str, int len)
 {
 	if (keys[idx].ops->val_to_str)
 		return keys[idx].ops->val_to_str(val, str, len);
@@ -273,7 +274,8 @@ int params_val_to_str(struct iscsi_key *keys, int idx, unsigned int val, char *s
 		return 0;
 }
 
-int params_str_to_val(struct iscsi_key *keys, int idx, char *str, unsigned int *val)
+int params_str_to_val(const struct iscsi_key *keys, int idx, const char *str,
+		      unsigned int *val)
 {
 	if (keys[idx].ops->str_to_val)
 		return keys[idx].ops->str_to_val(str, val);
@@ -281,7 +283,7 @@ int params_str_to_val(struct iscsi_key *keys, int idx, char *str, unsigned int *
 		return 0;
 }
 
-int params_check_val(struct iscsi_key *keys, int idx, unsigned int *val)
+int params_check_val(const struct iscsi_key *keys, int idx, unsigned int *val)
 {
 	if (keys[idx].ops->check_val)
 		return keys[idx].ops->check_val(&keys[idx], val);
diff --git a/iscsi-scst/usr/param.h b/iscsi-scst/usr/param.h
index 7b46900aa..cc0e43c62 100644
--- a/iscsi-scst/usr/param.h
+++ b/iscsi-scst/usr/param.h
@@ -35,13 +35,13 @@ struct iscsi_param {
 
 struct iscsi_key_ops {
 	int (*val_to_str)(unsigned int, char *, int);
-	int (*str_to_val)(char *, unsigned int *);
-	int (*check_val)(struct iscsi_key *, unsigned int *);
+	int (*str_to_val)(const char *, unsigned int *);
+	int (*check_val)(const struct iscsi_key *, unsigned int *);
 	int (*set_val)(struct iscsi_param *, int, unsigned int *);
 };
 
 struct iscsi_key {
-	char *name;
+	const char *name;
 	unsigned int rfc_def;
 	unsigned int local_def;
 	unsigned int min;
@@ -56,12 +56,15 @@ extern struct iscsi_key user_keys[];
 
 extern size_t strlcpy(char *dest, const char *src, size_t size);
 
-extern void params_set_defaults(unsigned int *, struct iscsi_key *);
-extern int params_index_by_name(char *, struct iscsi_key *);
-extern int params_index_by_name_numwild(char *, struct iscsi_key *);
-extern int params_val_to_str(struct iscsi_key *, int, unsigned int, char *, int);
-extern int params_str_to_val(struct iscsi_key *, int, char *, unsigned int *);
-extern int params_check_val(struct iscsi_key *, int, unsigned int *);
-extern int params_set_val(struct iscsi_key *, struct iscsi_param *, int, unsigned int *);
+extern void params_set_defaults(unsigned int *, const struct iscsi_key *);
+extern int params_index_by_name(const char *, const struct iscsi_key *);
+extern int params_index_by_name_numwild(const char *, const struct iscsi_key *);
+extern int params_val_to_str(const struct iscsi_key *, int, unsigned int,
+			     char *, int);
+extern int params_str_to_val(const struct iscsi_key *, int, const char *,
+			     unsigned int *);
+extern int params_check_val(const struct iscsi_key *, int, unsigned int *);
+extern int params_set_val(struct iscsi_key *, struct iscsi_param *, int,
+			  unsigned int *);
 
 #endif