From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14458 invoked by alias); 23 Jun 2009 12:27:00 -0000 Received: (qmail 14451 invoked by alias); 23 Jun 2009 12:27:00 -0000 X-SWARE-Spam-Status: No, hits=0.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_25,J_CHICKENPOX_27,J_CHICKENPOX_28,J_CHICKENPOX_41,J_CHICKENPOX_43,J_CHICKENPOX_53,J_CHICKENPOX_54,J_CHICKENPOX_66,J_CHICKENPOX_74,SPF_HELO_PASS X-Spam-Status: No, hits=0.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_25,J_CHICKENPOX_27,J_CHICKENPOX_28,J_CHICKENPOX_41,J_CHICKENPOX_43,J_CHICKENPOX_53,J_CHICKENPOX_54,J_CHICKENPOX_66,J_CHICKENPOX_74,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 - dlm: Fix some compile 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: 8a1df5b0bc701fca57996e766ea54c26f48874ea X-Git-Newrev: 58f5ea38060b84b91f043e6f51a2701343f04176 From: Christine Caulfield Message-Id: <20090623122631.90C41120255@lists.fedorahosted.org> Date: Tue, 23 Jun 2009 12:27: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/msg00740.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=58f5ea38060b84b91f043e6f51a2701343f04176 Commit: 58f5ea38060b84b91f043e6f51a2701343f04176 Parent: 8a1df5b0bc701fca57996e766ea54c26f48874ea Author: Christine Caulfield AuthorDate: Tue Jun 23 10:18:22 2009 +0100 Committer: Christine Caulfield CommitterDate: Tue Jun 23 10:18:22 2009 +0100 dlm: Fix some compile warnings Most of this patch was from Fabio. Thanks Signed-off-by: Christine Caulfield --- dlm/tests/usertest/alternate-lvb.c | 10 +++++----- dlm/tests/usertest/asttest.c | 14 +++++++------- dlm/tests/usertest/dlmtest.c | 6 ++---- dlm/tests/usertest/dlmtest2.c | 7 +++---- dlm/tests/usertest/joinleave.c | 2 +- dlm/tests/usertest/lstest.c | 12 ++++++------ dlm/tests/usertest/lvb.c | 11 +++++++---- dlm/tests/usertest/pingtest.c | 8 ++++---- dlm/tests/usertest/threads.c | 34 ++++++++++------------------------ 9 files changed, 45 insertions(+), 59 deletions(-) diff --git a/dlm/tests/usertest/alternate-lvb.c b/dlm/tests/usertest/alternate-lvb.c index 779125a..80c3ef6 100644 --- a/dlm/tests/usertest/alternate-lvb.c +++ b/dlm/tests/usertest/alternate-lvb.c @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { unsigned long long offset; unsigned long long num, last_num = 0; - unsigned int id, clients, sleep = 0; + unsigned int id, clients, sleeptime = 0; unsigned long long skip = 0; char *name; int rv; @@ -56,13 +56,13 @@ int main(int argc, char *argv[]) clients = atoi(argv[4]); if (argc > 5) - sleep = atoi(argv[5]); + sleeptime = atoi(argv[5]); printf("Joining \"alternate\" lockspace...\n"); dh = dlm_create_lockspace("alternate", 0600); if (!dh) { - printf("dlm_create_lockspace error %d %d\n", (int) dh, errno); + printf("dlm_create_lockspace error %p %d\n",dh, errno); return -ENOTCONN; } @@ -153,8 +153,8 @@ int main(int argc, char *argv[]) lksb.sb_status); } - if (sleep) - usleep(sleep); + if (sleeptime) + usleep(sleeptime); } dlm_ls_unlock_wait(dh, lksb.sb_lkid, 0, &lksb); diff --git a/dlm/tests/usertest/asttest.c b/dlm/tests/usertest/asttest.c index da498f3..224df4c 100644 --- a/dlm/tests/usertest/asttest.c +++ b/dlm/tests/usertest/asttest.c @@ -53,7 +53,7 @@ static int modetonum(char *modestr) return mode; } -static char *numtomode(int mode) +static const char *numtomode(int mode) { switch (mode) { @@ -88,10 +88,10 @@ static void usage(char *prog, FILE *file) static void ast_routine(void *arg) { - struct dlm_lksb *lksb = arg; + struct dlm_lksb *alksb = arg; if (!quiet) - printf("ast called, status = %d, lkid=%x\n", lksb->sb_status, lksb->sb_lkid); + printf("ast called, status = %d, lkid=%x\n", alksb->sb_status, alksb->sb_lkid); /* Wake the main thread */ if (use_threads) @@ -108,14 +108,14 @@ static void ast_routine(void *arg) static void bast_routine(void *arg) { - struct dlm_lksb *lksb = arg; + struct dlm_lksb *blksb = arg; if (!quiet) - printf("\nblocking ast called, status = %d, lkid=%x\n", lksb->sb_status, lksb->sb_lkid); + printf("\nblocking ast called, status = %d, lkid=%x\n", blksb->sb_status, blksb->sb_lkid); } /* Using poll(2) to wait for and dispatch ASTs */ -static int poll_for_ast() +static int poll_for_ast(void) { struct pollfd pfd; @@ -136,7 +136,7 @@ static int poll_for_ast() int main(int argc, char *argv[]) { - char *resource = "LOCK-NAME"; + const char *resource = "LOCK-NAME"; int flags = 0; int delay = 0; int status; diff --git a/dlm/tests/usertest/dlmtest.c b/dlm/tests/usertest/dlmtest.c index 1c3e312..dc54c2e 100644 --- a/dlm/tests/usertest/dlmtest.c +++ b/dlm/tests/usertest/dlmtest.c @@ -19,7 +19,6 @@ #include "libdlm.h" -static struct dlm_lksb lksb; static int modetonum(char *modestr) { int mode = LKM_EXMODE; @@ -34,7 +33,7 @@ static int modetonum(char *modestr) return mode; } -static char *numtomode(int mode) +static const char *numtomode(int mode) { switch (mode) { @@ -136,7 +135,7 @@ struct dlm_lksb tmplksb; int main(int argc, char *argv[]) { - char *resource = "LOCK-NAME"; + const char *resource = "LOCK-NAME"; int flags = 0; int status; int delay = 5; @@ -148,7 +147,6 @@ int main(int argc, char *argv[]) int do_query = 0; int do_expedite = 0; signed char opt; - int i; /* Deal with command-line arguments */ opterr = 0; diff --git a/dlm/tests/usertest/dlmtest2.c b/dlm/tests/usertest/dlmtest2.c index 96e6a16..4444132 100644 --- a/dlm/tests/usertest/dlmtest2.c +++ b/dlm/tests/usertest/dlmtest2.c @@ -120,7 +120,7 @@ static int rand_int(int a, int b) return a + (int) (((float)(b - a + 1)) * random() / (RAND_MAX+1.0)); } -static char *status_str(int status) +static const char *status_str(int status) { static char sts_str[8]; @@ -145,7 +145,7 @@ static char *status_str(int status) } } -static char *op_str(int op) +static const char *op_str(int op) { switch (op) { case Op_lock: @@ -458,7 +458,7 @@ static void lock_all(int mode) lock(i, mode); } -static char *uflags(uint32_t flags) +static const char *uflags(uint32_t flags) { if (flags == LKF_FORCEUNLOCK) return "FORCEUNLOCK"; @@ -1435,7 +1435,6 @@ int main(int argc, char *argv[]) break; } - out: if (openclose_ls) { printf("dlm_close_lockspace\n"); diff --git a/dlm/tests/usertest/joinleave.c b/dlm/tests/usertest/joinleave.c index b44116f..5dc2c3e 100644 --- a/dlm/tests/usertest/joinleave.c +++ b/dlm/tests/usertest/joinleave.c @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) gettimeofday(&begin, NULL); dh = dlm_create_lockspace(name, 0600); if (!dh) { - printf("dlm_create_lockspace error %d %d\n", (int) dh, errno); + printf("dlm_create_lockspace error %p %d\n", dh, errno); return -ENOTCONN; } gettimeofday(&end, NULL); diff --git a/dlm/tests/usertest/lstest.c b/dlm/tests/usertest/lstest.c index 025572a..ef582bf 100644 --- a/dlm/tests/usertest/lstest.c +++ b/dlm/tests/usertest/lstest.c @@ -48,7 +48,7 @@ static int modetonum(char *modestr) return mode; } -static char *numtomode(int mode) +static const char *numtomode(int mode) { switch (mode) { @@ -84,10 +84,10 @@ static void usage(char *prog, FILE *file) static void ast_routine(void *arg) { - struct dlm_lksb *lksb = arg; + struct dlm_lksb *alksb = arg; if (!quiet) - printf("ast called, status = %d, lkid=%x\n", lksb->sb_status, lksb->sb_lkid); + printf("ast called, status = %d, lkid=%x\n", alksb->sb_status, alksb->sb_lkid); /* Wake the main thread */ if (use_threads) @@ -104,10 +104,10 @@ static void ast_routine(void *arg) static void bast_routine(void *arg) { - struct dlm_lksb *lksb = arg; + struct dlm_lksb *blksb = arg; if (!quiet) - printf("\nblocking ast called, status = %d, lkid=%x\n", lksb->sb_status, lksb->sb_lkid); + printf("\nblocking ast called, status = %d, lkid=%x\n", blksb->sb_status, blksb->sb_lkid); } /* Using poll(2) to wait for and dispatch ASTs */ @@ -132,7 +132,7 @@ static int poll_for_ast(dlm_lshandle_t ls) int main(int argc, char *argv[]) { - char *resource = "LOCK-NAME"; + const char *resource = "LOCK-NAME"; int flags = 0; int status; int mode = LKM_EXMODE; diff --git a/dlm/tests/usertest/lvb.c b/dlm/tests/usertest/lvb.c index 0683103..db2ce32 100644 --- a/dlm/tests/usertest/lvb.c +++ b/dlm/tests/usertest/lvb.c @@ -30,6 +30,7 @@ struct lksb #include #include #include +#include #define LCK$M_VALBLK LKF_VALBLK #define LCK$M_CONVERT LKF_CONVERT #define LCK$K_CRMODE LKM_CRMODE @@ -94,7 +95,7 @@ static struct lksb our_lksb; static int cur_mode; static void compast_routine(void *arg); static void blockast_routine(void *arg, int mode); -static char *name = "TESTLOCK"; +static const char *name = "TESTLOCK"; #ifdef __linux__ static char lksb_lvb[DLM_LVB_LEN]; @@ -110,7 +111,7 @@ static void start_lock(int mode) /* Make a descriptor of the name */ memset(&name_s, 0, sizeof(struct dsc$descriptor_s)); name_s.dsc$w_length = strlen(name); - name_s.dsc$a_pointer = name; + name_s.dsc$a_pointer = (char *)name; /* Lock it */ status = sys$enq(0, @@ -168,7 +169,7 @@ static int convert_lock(int mode, char *lvb) return status; } -static void unlock() +static void unlock(void) { int status; @@ -226,8 +227,10 @@ int main(int argc, char *argv[]) start_lock(LCK$K_CRMODE); do { + char cmd; + fgets(buf, sizeof(buf), stdin); - char cmd = buf[0] & 0x5F; + cmd = buf[0] & 0x5F; if (cmd == 'W') convert_lock(LCK$K_CRMODE, &buf[1]); diff --git a/dlm/tests/usertest/pingtest.c b/dlm/tests/usertest/pingtest.c index adf2042..2fdbf18 100644 --- a/dlm/tests/usertest/pingtest.c +++ b/dlm/tests/usertest/pingtest.c @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -58,7 +59,7 @@ static int *lvb_int = (int *)&our_lksb.sb_lvb; #define SUCCESS SS$_NORMAL #endif -static char *lockname="ping"; +static const char *lockname="ping"; static int us = 1; static int maxnode = 2; static int cur_mode; @@ -70,7 +71,6 @@ static void blockast_routine(void *arg); #ifdef __linux__ static int convert_lock(int mode) { - int old_mode = cur_mode; int status; printf("pinglock: convert to %d starting\n", mode); @@ -96,7 +96,7 @@ static int convert_lock(int mode) return status; } -static void unlock() +static void unlock(void) { int status; status = dlm_unlock( our_lksb.sb_lkid, @@ -108,7 +108,7 @@ static void unlock() } -static void start_lock() +static void start_lock(void) { int status; cur_mode = LKM_EXMODE; diff --git a/dlm/tests/usertest/threads.c b/dlm/tests/usertest/threads.c index 1d6ba5d..afbd19a 100644 --- a/dlm/tests/usertest/threads.c +++ b/dlm/tests/usertest/threads.c @@ -54,20 +54,6 @@ static int modetonum(char *modestr) return mode; } -static char *numtomode(int mode) -{ - switch (mode) - { - case LKM_NLMODE: return "NL"; - case LKM_CRMODE: return "CR"; - case LKM_CWMODE: return "CW"; - case LKM_PRMODE: return "PR"; - case LKM_PWMODE: return "PW"; - case LKM_EXMODE: return "EX"; - default: return "??"; - } -} - static void usage(char *prog, FILE *file) { fprintf(file, "Usage:\n"); @@ -172,11 +158,11 @@ static int sync_unlock(dlm_lshandle_t lockspace, int lockid) static void *thread_fn(void *arg) { struct thread_args *ta = arg; - int lockid; + int lockid=0; int status; if (ta->verbose > 1) - fprintf(stderr, "Locking in thread %d\n", pthread_self); + fprintf(stderr, "Locking in thread %lx\n", pthread_self()); status = sync_lock(ta->lockspace, ta->resource, ta->mode, ta->flags, &lockid); @@ -184,20 +170,20 @@ static void *thread_fn(void *arg) if (status) { if (ta->verbose) - fprintf(stderr, "Lock in thread %x failed: %s\n", pthread_self, strerror(errno)); + fprintf(stderr, "Lock in thread %lx failed: %s\n", pthread_self(), strerror(errno)); return NULL; } sleep(ta->delay); if (ta->verbose > 1) - fprintf(stderr, "Unlocking in thread %x\n", pthread_self()); + fprintf(stderr, "Unlocking in thread %lx\n", pthread_self()); status = sync_unlock(ta->lockspace,lockid); if (status) { if (ta->verbose) - fprintf(stderr, "Unlock in thread %x failed: %s\n", pthread_self(), strerror(errno)); + fprintf(stderr, "Unlock in thread %lx failed: %s\n", pthread_self(), strerror(errno)); } return NULL; @@ -206,14 +192,14 @@ static void *thread_fn(void *arg) int main(int argc, char *argv[]) { - char *resource = "LOCK-NAME"; - char *lockspace_name = "threadtest"; + char const *resource = "LOCK-NAME"; + char const *lockspace_name = "threadtest"; dlm_lshandle_t *lockspace; int flags = 0; int num_threads = 5; int delay = 1; - int mode; - int verbose; + int mode = LKM_EXMODE; + int verbose = 0; int i; signed char opt; pthread_t *threads; @@ -297,7 +283,7 @@ int main(int argc, char *argv[]) ta.flags = flags; ta.delay = delay; ta.verbose = verbose; - ta.resource = resource; + ta.resource = (char *)resource; for (i=0; i