This is the mail archive of the cluster-cvs@sourceware.org mailing list for the cluster.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

gfs2-utils: master - gfs_controld: fix const warnings


Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=5cf2af4d9da2e4830e4d36e15e30cc12e1cde598
Commit:        5cf2af4d9da2e4830e4d36e15e30cc12e1cde598
Parent:        a333fb1bd78751edf9e0215c76d39f13e93a3285
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed May 6 09:24:13 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Jun 23 11:15:26 2009 +0200

gfs_controld: fix const warnings

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 group/gfs_controld/config.c     |    6 +++---
 group/gfs_controld/cpg-new.c    |    2 +-
 group/gfs_controld/gfs_daemon.h |   10 +++++-----
 group/gfs_controld/main.c       |    2 +-
 group/gfs_controld/util.c       |    8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/group/gfs_controld/config.c b/group/gfs_controld/config.c
index 79c47f1..3131189 100644
--- a/group/gfs_controld/config.c
+++ b/group/gfs_controld/config.c
@@ -38,7 +38,7 @@ int optd_enable_withdraw;
 int cfgd_debug_logfile		= DEFAULT_DEBUG_LOGFILE;
 int cfgd_enable_withdraw	= DEFAULT_ENABLE_WITHDRAW;
 
-void read_ccs_name(char *path, char *name)
+void read_ccs_name(const char *path, char *name)
 {
 	char *str;
 	int error;
@@ -52,7 +52,7 @@ void read_ccs_name(char *path, char *name)
 	free(str);
 }
 
-void read_ccs_yesno(char *path, int *yes, int *no)
+void read_ccs_yesno(const char *path, int *yes, int *no)
 {
 	char *str;
 	int error;
@@ -73,7 +73,7 @@ void read_ccs_yesno(char *path, int *yes, int *no)
 	free(str);
 }
 
-int read_ccs_int(char *path, int *config_val)
+int read_ccs_int(const char *path, int *config_val)
 {
 	char *str;
 	int val;
diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c
index 5fafd61..7d721e8 100644
--- a/group/gfs_controld/cpg-new.c
+++ b/group/gfs_controld/cpg-new.c
@@ -261,7 +261,7 @@ static void apply_changes_recovery(struct mountgroup *mg);
 static void send_withdraw_acks(struct mountgroup *mg);
 static void leave_mountgroup(struct mountgroup *mg, int mnterr);
 
-static char *msg_name(int type)
+static const char *msg_name(int type)
 {
 	switch (type) {
 	case GFS_MSG_PROTOCOL:
diff --git a/group/gfs_controld/gfs_daemon.h b/group/gfs_controld/gfs_daemon.h
index 7e844cf..2f2626e 100644
--- a/group/gfs_controld/gfs_daemon.h
+++ b/group/gfs_controld/gfs_daemon.h
@@ -163,9 +163,9 @@ struct mountgroup {
 /* config.c */
 int setup_ccs(void);
 void close_ccs(void);
-void read_ccs_name(char *path, char *name);
-void read_ccs_yesno(char *path, int *yes, int *no);
-int read_ccs_int(char *path, int *config_val);
+void read_ccs_name(const char *path, char *name);
+void read_ccs_yesno(const char *path, int *yes, int *no);
+int read_ccs_int(const char *path, int *config_val);
 void read_ccs_nodir(struct mountgroup *mg, char *buf);
 
 /* cpg-new.c */
@@ -216,8 +216,8 @@ void kick_node_from_cluster(int nodeid);
 
 /* util.c */
 int we_are_in_fence_domain(void);
-int set_sysfs(struct mountgroup *mg, char *field, int val);
-int read_sysfs_int(struct mountgroup *mg, char *field, int *val_out);
+int set_sysfs(struct mountgroup *mg, const char *field, int val);
+int read_sysfs_int(struct mountgroup *mg, const char *field, int *val_out);
 int run_dmsetup_suspend(struct mountgroup *mg, char *dev);
 void update_dmsetup_wait(void);
 void update_flow_control_status(void);
diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c
index a0b809d..f7f4da3 100644
--- a/group/gfs_controld/main.c
+++ b/group/gfs_controld/main.c
@@ -913,7 +913,7 @@ static void process_listener(int ci)
 	log_debug("client connection %d fd %d", i, fd);
 }
 
-static int setup_listener(char *sock_path)
+static int setup_listener(const char *sock_path)
 {
 	struct sockaddr_un addr;
 	socklen_t addrlen;
diff --git a/group/gfs_controld/util.c b/group/gfs_controld/util.c
index 51d274f..44d8827 100644
--- a/group/gfs_controld/util.c
+++ b/group/gfs_controld/util.c
@@ -47,7 +47,7 @@ int we_are_in_fence_domain(void)
 #define SYSFS_DIR       "/sys/fs"
 #define SYSFS_BUFLEN    64
 
-int set_sysfs(struct mountgroup *mg, char *field, int val)
+int set_sysfs(struct mountgroup *mg, const char *field, int val)
 {
 	char fname[PATH_MAX];
 	char out[SYSFS_BUFLEN];
@@ -76,7 +76,7 @@ int set_sysfs(struct mountgroup *mg, char *field, int val)
 	return rv;
 }
 
-static int get_sysfs(struct mountgroup *mg, char *field, char *buf, int len)
+static int get_sysfs(struct mountgroup *mg, const char *field, char *buf, int len)
 {
 	char fname[PATH_MAX], *p;
 	int fd, rv;
@@ -104,7 +104,7 @@ static int get_sysfs(struct mountgroup *mg, char *field, char *buf, int len)
 	return rv;
 }
 
-int read_sysfs_int(struct mountgroup *mg, char *field, int *val_out)
+int read_sysfs_int(struct mountgroup *mg, const char *field, int *val_out)
 {
 	char buf[SYSFS_BUFLEN];
 	int rv;
@@ -206,7 +206,7 @@ void update_dmsetup_wait(void)
 	}
 }
 
-static int ignore_nolock(char *sysfs_dir, char *table)
+static int ignore_nolock(const char *sysfs_dir, char *table)
 {
 	char path[PATH_MAX];
 	int fd;


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]