cluster: STABLE3 - group_daemon: fix const warnings
David Teigland
teigland@fedoraproject.org
Mon May 11 15:14:00 GMT 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=45943657f4c9643a523cd767164cd1572272e0f0
Commit: 45943657f4c9643a523cd767164cd1572272e0f0
Parent: 91f5df664ce98105ad59f8d5b3a222e264b8dac1
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Wed May 6 11:40:22 2009 +0200
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Mon May 11 10:05:07 2009 -0500
group_daemon: fix const warnings
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
group/daemon/app.c | 8 ++++----
group/daemon/cpg.c | 6 +++---
group/daemon/gd_internal.h | 12 ++++++------
group/daemon/joinleave.c | 2 +-
group/daemon/main.c | 8 ++++----
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/group/daemon/app.c b/group/daemon/app.c
index 9ca2801..c024407 100644
--- a/group/daemon/app.c
+++ b/group/daemon/app.c
@@ -10,7 +10,7 @@ struct nodeid {
int nodeid;
};
-char *msg_type(int type)
+const char *msg_type(int type)
{
switch (type) {
case MSG_APP_STOPPED:
@@ -119,7 +119,7 @@ static void purge_messages(group_t *g)
struct save_msg *save, *tmp;
node_t *node;
int nodeid, type;
- char *state_str;
+ const char *state_str;
list_for_each_entry_safe(save, tmp, &g->messages, list) {
if (save->msg.ms_type == MSG_APP_INTERNAL)
@@ -851,7 +851,7 @@ int do_startdone(char *name, int level, int event_nr)
{
group_t *g;
event_t *ev;
- char *state;
+ const char *state;
g = find_group_level(name, level);
if (!g) {
@@ -877,7 +877,7 @@ int do_startdone(char *name, int level, int event_nr)
return send_started(g);
}
-char *ev_state_str(event_t *ev)
+const char *ev_state_str(event_t *ev)
{
switch (ev->state) {
case EST_JOIN_BEGIN:
diff --git a/group/daemon/cpg.c b/group/daemon/cpg.c
index dde9bb9..e81b496 100644
--- a/group/daemon/cpg.c
+++ b/group/daemon/cpg.c
@@ -48,7 +48,7 @@ struct group_node {
static void block_old_nodes(void);
-static char *mode_str(int m)
+static const char *mode_str(int m)
{
switch (m) {
case GROUP_PENDING:
@@ -754,7 +754,7 @@ void confchg_cb(cpg_handle_t handle,
size_t joined_list_entries)
{
group_t *g;
- char *name = "unknown";
+ const char *name = "unknown";
int i, level = -1;
if (handle == groupd_handle)
@@ -1047,7 +1047,7 @@ int send_message(group_t *g, void *buf, int len)
return _send_message(g->cpg_handle, g, buf, len);
}
-static void block_old_group(char *name, int level)
+static void block_old_group(const char *name, int level)
{
group_t *g;
app_t *a;
diff --git a/group/daemon/gd_internal.h b/group/daemon/gd_internal.h
index befbaff..5e2c4d3 100644
--- a/group/daemon/gd_internal.h
+++ b/group/daemon/gd_internal.h
@@ -256,7 +256,7 @@ int queue_app_leave(group_t *g, int nodeid);
int queue_app_message(group_t *g, struct save_msg *save);
int do_stopdone(char *name, int level);
int do_startdone(char *name, int level, int event_nr);
-char *ev_state_str(event_t *ev);
+const char *ev_state_str(event_t *ev);
event_t *find_queued_recover_event(group_t *g);
void extend_recover_event(group_t *g, event_t *ev, int nodeid);
int process_apps(void);
@@ -270,15 +270,15 @@ void msg_bswap_out(msg_t *msg);
void msg_bswap_in(msg_t *msg);
struct recovery_set *get_recovery_set(int nodeid);
void groupd_down(int nodeid);
-char *msg_type(int type);
+const char *msg_type(int type);
int process_app(group_t *g);
int is_our_join(event_t *ev);
void purge_node_messages(group_t *g, int nodeid);
/* main.c */
-void read_ccs_name(char *path, char *name);
-void read_ccs_yesno(char *path, int *yes, int *no);
-void 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);
+void read_ccs_int(const char *path, int *config_val);
void app_stop(app_t *a);
void app_setid(app_t *a);
void app_start(app_t *a);
@@ -312,7 +312,7 @@ int do_join(char *name, int level, int ci);
int do_leave(char *name, int level);
node_t *new_node(int nodeid);
group_t *find_group_level(char *name, int level);
-int create_group(char *name, int level, group_t **g_out);
+int create_group(const char *name, int level, group_t **g_out);
app_t *create_app(group_t *g);
/* logging.c */
diff --git a/group/daemon/joinleave.c b/group/daemon/joinleave.c
index 95cc444..a9dcc8e 100644
--- a/group/daemon/joinleave.c
+++ b/group/daemon/joinleave.c
@@ -15,7 +15,7 @@ group_t *find_group_level(char *name, int level)
return NULL;
}
-int create_group(char *name, int level, group_t **g_out)
+int create_group(const char *name, int level, group_t **g_out)
{
group_t *g;
diff --git a/group/daemon/main.c b/group/daemon/main.c
index 16b019c..c82b23b 100644
--- a/group/daemon/main.c
+++ b/group/daemon/main.c
@@ -63,7 +63,7 @@ static int do_write(int fd, void *buf, size_t count)
return 0;
}
-void read_ccs_name(char *path, char *name)
+void read_ccs_name(const char *path, char *name)
{
char *str;
int error;
@@ -77,7 +77,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;
@@ -98,7 +98,7 @@ void read_ccs_yesno(char *path, int *yes, int *no)
free(str);
}
-void read_ccs_int(char *path, int *config_val)
+void read_ccs_int(const char *path, int *config_val)
{
char *str;
int val;
@@ -697,7 +697,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;
More information about the Cluster-cvs
mailing list