From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18595 invoked by alias); 26 Jun 2009 08:01:19 -0000 Received: (qmail 18315 invoked by alias); 26 Jun 2009 08:01:19 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,J_CHICKENPOX_73,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: dlm: master - fix compile failures To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: dlm.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ac6d6c210989e598ef3f809ee68ac093f63ac41a X-Git-Newrev: cdda56dcbb999b3ffd6dd080fa97f8dd8eefcc14 From: Jim Meyering Message-Id: <20090626080051.B13CE120381@lists.fedorahosted.org> Date: Fri, 26 Jun 2009 08:01: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/msg00766.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=cdda56dcbb999b3ffd6dd080fa97f8dd8eefcc14 Commit: cdda56dcbb999b3ffd6dd080fa97f8dd8eefcc14 Parent: ac6d6c210989e598ef3f809ee68ac093f63ac41a Author: Jim Meyering AuthorDate: Fri Jun 26 09:34:49 2009 +0200 Committer: Jim Meyering CommitterDate: Fri Jun 26 09:34:49 2009 +0200 fix compile failures * dlm/tests/usertest/dlmtest2.c: (main): Restore accidentally removed label. It's still used. (main): Test "opt_cmd", rather than the always-true array, "cmd". --- dlm/tests/usertest/dlmtest2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlm/tests/usertest/dlmtest2.c b/dlm/tests/usertest/dlmtest2.c index 6160d4a..9d3afd9 100644 --- a/dlm/tests/usertest/dlmtest2.c +++ b/dlm/tests/usertest/dlmtest2.c @@ -120,7 +120,7 @@ static void unlockf(int i); static int rand_int(int a, int b) { - return a + (int) (((float)(b - a + 1)) * random() / (RAND_MAX+1.0)); + return a + (int) (((float)(b - a + 1)) * random() / (RAND_MAX+1.0)); } static const char *status_str(int status) @@ -1415,7 +1415,7 @@ int main(int argc, char *argv[]) client_add(libdlm_fd, &maxi); - if (cmd) { + if (opt_cmd) { process_command(&quit); goto out; } @@ -1450,6 +1450,7 @@ int main(int argc, char *argv[]) break; } + out: if (openclose_ls) { printf("dlm_close_lockspace\n"); @@ -1466,4 +1467,3 @@ int main(int argc, char *argv[]) return 0; } -