From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22637 invoked by alias); 12 Mar 2009 09:12:55 -0000 Received: (qmail 22631 invoked by alias); 12 Mar 2009 09:12:54 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - config: fix build warnings introduced by corosync changes 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: 05f20f21c02e460b86d8371bb30619630052d1c2 X-Git-Newrev: ba4b6698869fe00e9b708bd76191d73ad2694a2f From: "Fabio M. Di Nitto" Message-Id: <20090312091224.ADC9812034E@lists.fedorahosted.org> Date: Thu, 12 Mar 2009 09:12: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-q1/txt/msg00747.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ba4b6698869fe00e9b708bd76191d73ad2694a2f Commit: ba4b6698869fe00e9b708bd76191d73ad2694a2f Parent: 05f20f21c02e460b86d8371bb30619630052d1c2 Author: Fabio M. Di Nitto AuthorDate: Thu Mar 12 10:11:30 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Thu Mar 12 10:11:30 2009 +0100 config: fix build warnings introduced by corosync changes char -> const char.. Signed-off-by: Fabio M. Di Nitto --- config/plugins/ldap/configldap.c | 4 ++-- config/plugins/xml/config.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/plugins/ldap/configldap.c b/config/plugins/ldap/configldap.c index aab8934..e04c8fc 100644 --- a/config/plugins/ldap/configldap.c +++ b/config/plugins/ldap/configldap.c @@ -19,7 +19,7 @@ #define DEFAULT_LDAP_URL "ldap:///" #define DEFAULT_LDAP_BASEDN "dc=chrissie,dc=net" -static int ldap_readconfig(struct objdb_iface_ver0 *objdb, char **error_string); +static int ldap_readconfig(struct objdb_iface_ver0 *objdb, const char **error_string); static int init_config(struct objdb_iface_ver0 *objdb); static char error_reason[1024]; static char *ldap_url = DEFAULT_LDAP_URL; @@ -59,7 +59,7 @@ __attribute__ ((constructor)) static void ldap_comp_register(void) { lcr_component_register(&ldap_comp_ver0); }; -static int ldap_readconfig(struct objdb_iface_ver0 *objdb, char **error_string) +static int ldap_readconfig(struct objdb_iface_ver0 *objdb, const char **error_string) { int ret; diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c index 2fd346f..7853109 100644 --- a/config/plugins/xml/config.c +++ b/config/plugins/xml/config.c @@ -9,11 +9,11 @@ #include "logging.h" -static int xml_readconfig(struct objdb_iface_ver0 *objdb, char **error_string); +static int xml_readconfig(struct objdb_iface_ver0 *objdb, const char **error_string); static int xml_reloadconfig(struct objdb_iface_ver0 *objdb, int flush, - char **error_string); + const char **error_string); static int init_config(struct objdb_iface_ver0 *objdb, char *configfile, - char *error_string); + const char *error_string); static char error_reason[1024]; #define DEFAULT_CONFIG DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE @@ -87,12 +87,12 @@ static void xml2objdb(xmlNodePtr tmpnode, struct objdb_iface_ver0 *objdb, } static int xml_reloadconfig(struct objdb_iface_ver0 *objdb, int flush, - char **error_string) + const char **error_string) { return xml_readconfig(objdb, error_string); } -static int xml_readconfig(struct objdb_iface_ver0 *objdb, char **error_string) +static int xml_readconfig(struct objdb_iface_ver0 *objdb, const char **error_string) { int ret = 0; char *configfile = DEFAULT_CONFIG; @@ -117,7 +117,7 @@ static int xml_readconfig(struct objdb_iface_ver0 *objdb, char **error_string) } static int init_config(struct objdb_iface_ver0 *objdb, char *configfile, - char *error_string) + const char *error_string) { int err = 0; xmlDocPtr doc = NULL;