public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: master - ccs: fix build warnings in ccs_tool Date: Mon, 04 May 2009 09:16:00 -0000 [thread overview] Message-ID: <20090504091552.6F057120370@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=52f25465d84aa1eca62b6af51192014a9f4a1a61 Commit: 52f25465d84aa1eca62b6af51192014a9f4a1a61 Parent: 6a30c6577c6c8f1b6e1f46a50b360a77ac6091a4 Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Mon May 4 11:11:24 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto@redhat.com> CommitterDate: Mon May 4 11:15:36 2009 +0200 ccs: fix build warnings in ccs_tool Fix const, shadow and function declaration warnings. Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> --- config/tools/ccs_tool/editconf.c | 54 +++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 26 deletions(-) diff --git a/config/tools/ccs_tool/editconf.c b/config/tools/ccs_tool/editconf.c index 86fa65e..8f808e9 100644 --- a/config/tools/ccs_tool/editconf.c +++ b/config/tools/ccs_tool/editconf.c @@ -11,9 +11,11 @@ #include <libxml/tree.h> +#include "editconf.h" + #define MAX_NODES 256 -char *prog_name = "ccs_tool"; +const char *prog_name = "ccs_tool"; #define die(fmt, args...) \ do { \ @@ -25,14 +27,14 @@ do { \ struct option_info { - char *name; - char *altname; - char *votes; - char *nodeid; - char *mcast_addr; - char *fence_type; - char *configfile; - char *outputfile; + const char *name; + const char *altname; + const char *votes; + const char *nodeid; + const char *mcast_addr; + const char *fence_type; + const char *configfile; + const char *outputfile; int do_delete; int tell_ccsd; int force_ccsd; @@ -180,8 +182,8 @@ static int valid_mcast_addr(char *mcast) static void save_file(xmlDoc *doc, struct option_info *ninfo) { - char tmpfile[strlen(ninfo->outputfile)+5]; - char oldfile[strlen(ninfo->outputfile)+5]; + char tmpconffile[strlen(ninfo->outputfile)+5]; + char oldconffile[strlen(ninfo->outputfile)+5]; int using_stdout = 0; mode_t old_mode; int ret; @@ -196,30 +198,30 @@ static void save_file(xmlDoc *doc, struct option_info *ninfo) */ if (!using_stdout) { - snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", ninfo->outputfile); - snprintf(oldfile, sizeof(oldfile), "%s.old", ninfo->outputfile); + snprintf(tmpconffile, sizeof(tmpconffile), "%s.tmp", ninfo->outputfile); + snprintf(oldconffile, sizeof(oldconffile), "%s.old", ninfo->outputfile); } else { - strcpy(tmpfile, ninfo->outputfile); + strcpy(tmpconffile, ninfo->outputfile); } xmlKeepBlanksDefault(0); - ret = xmlSaveFormatFile(tmpfile, doc, 1); + ret = xmlSaveFormatFile(tmpconffile, doc, 1); if (ret == -1) die("Error writing new config file %s", ninfo->outputfile); if (!using_stdout) { - if (rename(ninfo->outputfile, oldfile) == -1 && errno != ENOENT) + if (rename(ninfo->outputfile, oldconffile) == -1 && errno != ENOENT) die("Can't move old config file out of the way\n"); - if (rename(tmpfile, ninfo->outputfile)) + if (rename(tmpconffile, ninfo->outputfile)) { perror("Error renaming new file to its real filename"); /* Drat, that failed, try to put the old one back */ - if (rename(oldfile, ninfo->outputfile)) + if (rename(oldconffile, ninfo->outputfile)) die("Can't move old config fileback in place - clean up after me please\n"); } } @@ -285,7 +287,7 @@ static void increment_version(xmlNode *root_element) xmlSetProp(root_element, BAD_CAST "config_version", BAD_CAST newver); } -static xmlNode *findnode(xmlNode *root, char *name) +static xmlNode *findnode(xmlNode *root, const char *name) { xmlNode *cur_node; @@ -319,7 +321,7 @@ static xmlChar *get_fence_type(xmlNode *clusternode, xmlNode **fencenode) } /* Check the fence type exists under <fencedevices> */ -static xmlNode *valid_fence_type(xmlNode *root, char *fencetype) +static xmlNode *valid_fence_type(xmlNode *root, const char *fencetype) { xmlNode *devs; xmlNode *cur_node; @@ -376,7 +378,7 @@ static xmlNode *find_multicast_addr(xmlNode *clusternodes) return NULL; } -static xmlNode *find_node(xmlNode *clusternodes, char *nodename) +static xmlNode *find_node(xmlNode *clusternodes, const char *nodename) { xmlNode *cur_node; @@ -395,7 +397,7 @@ static xmlNode *find_node(xmlNode *clusternodes, char *nodename) /* Print name=value pairs for a (n XML) node. * "ignore" is a string to ignore if present as a property (probably already printed on the main line) */ -static int print_properties(xmlNode *node, char *prefix, char *ignore, char *ignore2) +static int print_properties(xmlNode *node, const char *prefix, const char *ignore, const char *ignore2) { xmlAttr *attr; int done_prefix = 0; @@ -422,11 +424,11 @@ static int print_properties(xmlNode *node, char *prefix, char *ignore, char *ign } /* Add name=value pairs from the commandline as properties to a node */ -static void add_fence_args(xmlNode *fencenode, int argc, char **argv, int optind) +static void add_fence_args(xmlNode *fencenode, int argc, char **argv, int optindex) { int i; - for (i = optind; i<argc; i++) + for (i = optindex; i<argc; i++) { char *prop; char *value; @@ -453,7 +455,7 @@ static void add_fence_args(xmlNode *fencenode, int argc, char **argv, int optind } static void add_clusternode(xmlNode *root_element, struct option_info *ninfo, - int argc, char **argv, int optind) + int argc, char **argv, int optindex) { xmlNode *clusternodes; xmlNode *newnode; @@ -506,7 +508,7 @@ static void add_clusternode(xmlNode *root_element, struct option_info *ninfo, xmlSetProp(newfencedevice, BAD_CAST "name", BAD_CAST ninfo->fence_type); /* Add name=value options */ - add_fence_args(newfencedevice, argc, argv, optind+1); + add_fence_args(newfencedevice, argc, argv, optindex+1); xmlAddChild(newnode, newfence); xmlAddChild(newfence, newfencemethod);
reply other threads:[~2009-05-04 9:16 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090504091552.6F057120370@lists.fedorahosted.org \ --to=fabbione@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).