From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8762 invoked by alias); 12 Aug 2009 10:16:52 -0000 Received: (qmail 8718 invoked by alias); 12 Aug 2009 10:16:51 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_55,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_55,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 - config: Remove all references to ccsd from ccs_tool 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: de503c0247d1ae7191996e8aa6f4fde3d9256a63 X-Git-Newrev: 922b9930e20a8894e29326ffb8f4d314207a3128 From: Christine Caulfield Message-Id: <20090812101435.2C111120324@lists.fedorahosted.org> Date: Wed, 12 Aug 2009 10:16: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-q3/txt/msg00192.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=922b9930e20a8894e29326ffb8f4d314207a3128 Commit: 922b9930e20a8894e29326ffb8f4d314207a3128 Parent: de503c0247d1ae7191996e8aa6f4fde3d9256a63 Author: Christine Caulfield AuthorDate: Wed Aug 12 11:13:51 2009 +0100 Committer: Christine Caulfield CommitterDate: Wed Aug 12 11:13:51 2009 +0100 config: Remove all references to ccsd from ccs_tool Apparently it doesn't exist any more, even as legacy code Signed-off-by: Christine Caulfield --- config/tools/ccs_tool/editconf.c | 47 -------------------------------------- 1 files changed, 0 insertions(+), 47 deletions(-) diff --git a/config/tools/ccs_tool/editconf.c b/config/tools/ccs_tool/editconf.c index cd25b38..323c561 100644 --- a/config/tools/ccs_tool/editconf.c +++ b/config/tools/ccs_tool/editconf.c @@ -36,8 +36,6 @@ struct option_info const char *configfile; const char *outputfile; int do_delete; - int tell_ccsd; - int force_ccsd; }; static void config_usage(int rw) @@ -46,9 +44,6 @@ static void config_usage(int rw) if (rw) { fprintf(stderr, " -o --outputfile Name of output file (defaults to same as --configfile)\n"); - fprintf(stderr, " -C --ccs Tell CCSD about this change\n"); - fprintf(stderr, " default: run \"ccs_tool update\" if file is updated in place)\n"); - fprintf(stderr, " -F --force_ccs Force \"ccs_tool upgrade\" even if input & output files differ\n"); } } @@ -575,8 +570,6 @@ struct option addnode_options[] = { "fence_type", required_argument, NULL, 'f'}, { "outputfile", required_argument, NULL, 'o'}, { "configfile", required_argument, NULL, 'c'}, - { "ccs", no_argument, NULL, 'C'}, - { "force_ccs", no_argument, NULL, 'F'}, { NULL, 0, NULL, 0 }, }; @@ -584,8 +577,6 @@ struct option delnode_options[] = { { "outputfile", required_argument, NULL, 'o'}, { "configfile", required_argument, NULL, 'c'}, - { "ccs", no_argument, NULL, 'C'}, - { "force_ccs", no_argument, NULL, 'F'}, { NULL, 0, NULL, 0 }, }; @@ -593,8 +584,6 @@ struct option addfence_options[] = { { "outputfile", required_argument, NULL, 'o'}, { "configfile", required_argument, NULL, 'c'}, - { "ccs", no_argument, NULL, 'C'}, - { "force_ccs", no_argument, NULL, 'F'}, { NULL, 0, NULL, 0 }, }; @@ -792,7 +781,6 @@ void add_node(int argc, char **argv) xmlNode *root_element; memset(&ninfo, 0, sizeof(ninfo)); - ninfo.tell_ccsd = 0; ninfo.votes = "1"; while ( (opt = getopt_long(argc, argv, "v:n:a:f:o:c:CFh?", addnode_options, NULL)) != EOF) @@ -825,14 +813,6 @@ void add_node(int argc, char **argv) ninfo.outputfile = strdup(optarg); break; - case 'C': - ninfo.tell_ccsd = 1; - break; - - case 'F': - ninfo.force_ccsd = 1; - break; - case '?': default: addnode_usage(argv[0]); @@ -868,7 +848,6 @@ void del_node(int argc, char **argv) xmlNode *root_element; memset(&ninfo, 0, sizeof(ninfo)); - ninfo.tell_ccsd = 0; while ( (opt = getopt_long(argc, argv, "o:c:CFh?", delnode_options, NULL)) != EOF) { @@ -882,14 +861,6 @@ void del_node(int argc, char **argv) ninfo.outputfile = strdup(optarg); break; - case 'C': - ninfo.tell_ccsd = 1; - break; - - case 'F': - ninfo.force_ccsd = 1; - break; - case '?': default: delnode_usage(argv[0]); @@ -1100,7 +1071,6 @@ void add_fence(int argc, char **argv) int opt; memset(&ninfo, 0, sizeof(ninfo)); - ninfo.tell_ccsd = 0; while ( (opt = getopt_long(argc, argv, "c:o:CFh?", list_options, NULL)) != EOF) { @@ -1113,14 +1083,6 @@ void add_fence(int argc, char **argv) ninfo.outputfile = strdup(optarg); break; - case 'C': - ninfo.tell_ccsd = 1; - break; - - case 'F': - ninfo.force_ccsd = 1; - break; - case '?': default: addfence_usage(argv[0]); @@ -1171,7 +1133,6 @@ void del_fence(int argc, char **argv) int opt; memset(&ninfo, 0, sizeof(ninfo)); - ninfo.tell_ccsd = 0; while ( (opt = getopt_long(argc, argv, "c:o:CFhv?", list_options, NULL)) != EOF) { @@ -1184,14 +1145,6 @@ void del_fence(int argc, char **argv) ninfo.outputfile = strdup(optarg); break; - case 'C': - ninfo.tell_ccsd = 1; - break; - - case 'F': - ninfo.force_ccsd = 1; - break; - case '?': default: delfence_usage(argv[0]);