From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10119 invoked by alias); 12 May 2009 18:17:26 -0000 Received: (qmail 10113 invoked by alias); 12 May 2009 18:17:25 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - fenced: remove const string warnings To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: ed02ac5f4275e1a8e26c8639880e928b747b44f1 X-Git-Newrev: d77119849960b3b477f18879794c2b8f5c30d1db From: David Teigland Message-Id: <20090512181658.68D64120277@lists.fedorahosted.org> Date: Tue, 12 May 2009 18:17:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00299.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d77119849960b3b477f18879794c2b8f5c30d1db Commit: d77119849960b3b477f18879794c2b8f5c30d1db Parent: ed02ac5f4275e1a8e26c8639880e928b747b44f1 Author: David Teigland AuthorDate: Tue May 12 13:09:24 2009 -0500 Committer: David Teigland CommitterDate: Tue May 12 13:09:24 2009 -0500 fenced: remove const string warnings Signed-off-by: David Teigland --- fence/fenced/config.c | 2 +- fence/fenced/config.h | 2 +- fence/fenced/main.c | 13 +++++++------ fence/fenced/member_cman.c | 2 +- fence/fenced/recover.c | 7 ++++--- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/fence/fenced/config.c b/fence/fenced/config.c index b9fc1c7..37f98f9 100644 --- a/fence/fenced/config.c +++ b/fence/fenced/config.c @@ -24,7 +24,7 @@ int cfgd_skip_undefined = DEFAULT_SKIP_UNDEFINED; int cfgd_post_join_delay = DEFAULT_POST_JOIN_DELAY; int cfgd_post_fail_delay = DEFAULT_POST_FAIL_DELAY; int cfgd_override_time = DEFAULT_OVERRIDE_TIME; -char *cfgd_override_path = DEFAULT_OVERRIDE_PATH; +const char *cfgd_override_path = DEFAULT_OVERRIDE_PATH; void read_ccs_name(const char *path, char *name) { diff --git a/fence/fenced/config.h b/fence/fenced/config.h index e2926e6..f65af0e 100644 --- a/fence/fenced/config.h +++ b/fence/fenced/config.h @@ -26,7 +26,7 @@ extern int cfgd_skip_undefined; extern int cfgd_post_join_delay; extern int cfgd_post_fail_delay; extern int cfgd_override_time; -extern char *cfgd_override_path; +extern const char *cfgd_override_path; #endif diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 545b50b..5430afe 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -13,6 +13,7 @@ static struct pollfd *pollfd = NULL; static pthread_t query_thread; static pthread_mutex_t query_mutex; static struct list_head controlled_entries; +static char default_name[8]; struct client { int fd; @@ -335,7 +336,7 @@ static void query_node_info(int f, int data_nodeid) struct fenced_node node; int nodeid, rv; - fd = find_fd("default"); + fd = find_fd(default_name); if (!fd) { rv = -ENOENT; goto out; @@ -360,7 +361,7 @@ static void query_domain_info(int f) struct fenced_domain domain; int rv; - fd = find_fd("default"); + fd = find_fd(default_name); if (!fd) { rv = -ENOENT; goto out; @@ -384,7 +385,7 @@ static void query_domain_nodes(int f, int option, int max) struct fenced_node *nodes = NULL; int rv, result; - fd = find_fd("default"); + fd = find_fd(default_name); if (!fd) { result = -ENOENT; node_count = 0; @@ -423,11 +424,9 @@ static void query_domain_nodes(int f, int option, int max) static void process_connection(int ci) { struct fenced_header h; - char default_name[8]; char *extra = NULL; int rv, extra_len; - strcpy(default_name, "default"); rv = do_read(client[ci].fd, &h, sizeof(h)); if (rv < 0) { @@ -624,7 +623,7 @@ struct controlled_entry { char path[PATH_MAX+1]; }; -static void register_controlled_dir(char *path) +static void register_controlled_dir(const char *path) { struct controlled_entry *ce; @@ -1028,6 +1027,8 @@ int main(int argc, char **argv) INIT_LIST_HEAD(&domains); INIT_LIST_HEAD(&controlled_entries); + strcpy(default_name, "default"); + read_arguments(argc, argv); if (!daemon_debug_opt) { diff --git a/fence/fenced/member_cman.c b/fence/fenced/member_cman.c index 4b9722d..2f9dbb6 100644 --- a/fence/fenced/member_cman.c +++ b/fence/fenced/member_cman.c @@ -97,7 +97,7 @@ char *nodeid_to_name(int nodeid) if (cn) return cn->cn_name; - return "unknown"; + return NULL; } int name_to_nodeid(char *name) diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c index 82e1427..e956e83 100644 --- a/fence/fenced/recover.c +++ b/fence/fenced/recover.c @@ -80,7 +80,7 @@ static int reduce_victims(struct fd *fd) return num_victims; } -static inline void close_override(int *fd, char *path) +static inline void close_override(int *fd, const char *path) { unlink(path); if (fd) { @@ -90,7 +90,7 @@ static inline void close_override(int *fd, char *path) } } -static int open_override(char *path) +static int open_override(const char *path) { int ret; mode_t om; @@ -244,7 +244,8 @@ void defer_fencing(struct fd *fd) master_name = nodeid_to_name(fd->master); - log_level(LOG_INFO, "fencing deferred to %s", master_name); + log_level(LOG_INFO, "fencing deferred to %s", + master_name ? master_name : "unknown"); } static const char *fe_str(int r)