From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 17 Jul 2008 13:29:52 -0000 Subject: [Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-23-g8ff7d32 Message-ID: <20080717132952.9167.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=8ff7d32e3a8bfc9d27aa96c733d1011ddf7969ed The branch, master has been updated via 8ff7d32e3a8bfc9d27aa96c733d1011ddf7969ed (commit) from 9bf768bfbce13a7a5fa9413d4e353a85c0358c88 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8ff7d32e3a8bfc9d27aa96c733d1011ddf7969ed Author: Fabio M. Di Nitto Date: Thu Jul 17 15:29:07 2008 +0200 [CCS] Inflict hopefully last compat issues love to ccs_t* Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: ccs/ccs_tool/ccs_tool.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ccs/ccs_tool/ccs_tool.c b/ccs/ccs_tool/ccs_tool.c index b73a546..9963f0d 100644 --- a/ccs/ccs_tool/ccs_tool.c +++ b/ccs/ccs_tool/ccs_tool.c @@ -90,20 +90,26 @@ static int test_main(int argc, char *argv[], int old_format){ } else { printf("Connect successful.\n"); printf(" Connection descriptor = %d\n", desc); +#ifndef LEGACY_CODE ccs_disconnect(desc); +#endif } } - else if(!strcmp(argv[1], "ccs_disconnect")){ + else if(!strcmp(argv[1], "disconnect")){ if(argc < 3){ fprintf(stderr, "Wrong number of arguments.\n"); exit(EXIT_FAILURE); } +#ifdef LEGACY_CODE + desc = atoi(argv[2]); +#else desc = ccs_connect(); +#endif if((error = ccs_disconnect(desc))){ - fprintf(stderr, "ccs_ccs_disconnect failed: %s\n", errstring(-error)); + fprintf(stderr, "ccs_disconnect failed: %s\n", errstring(-error)); exit(EXIT_FAILURE); } else { - printf("Ccs_Disconnect successful.\n"); + printf("Disconnect successful.\n"); } } else if(!strcmp(argv[1], "get")){ @@ -111,7 +117,11 @@ static int test_main(int argc, char *argv[], int old_format){ fprintf(stderr, "Wrong number of arguments.\n"); exit(EXIT_FAILURE); } +#ifdef LEGACY_CODE + desc = atoi(argv[2]); +#else desc = ccs_connect(); +#endif if((desc < 0) || (error = ccs_get(desc, argv[3], &str))){ fprintf(stderr, "ccs_get failed: %s\n", errstring(-error)); exit(EXIT_FAILURE); @@ -124,7 +134,9 @@ static int test_main(int argc, char *argv[], int old_format){ printf("%s\n", str); } if(str)free(str); +#ifndef LEGACY_CODE ccs_disconnect(desc); +#endif } } else { @@ -148,7 +160,7 @@ static void test_print_usage(FILE *stream) "\n" "Commands:\n" " connect Connect to CCS and return connection descriptor.\n" - " ccs_disconnect Disconnect from CCS.\n" + " disconnect Disconnect from CCS.\n" " get Get a value from CCS.\n" ); } hooks/post-receive -- Cluster Project