From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20600 invoked by alias); 11 May 2009 19:00:24 -0000 Received: (qmail 20578 invoked by alias); 11 May 2009 19:00:24 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_64,SPF_HELO_PASS X-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_64,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 - dlm_tool: print no error for empty lockdump 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: 4ac022c95c570468679800bc8f3dd80c57d72e36 X-Git-Newrev: 7f8f1cafc233b252f2929cfa68624354505bb2e1 From: David Teigland Message-Id: <20090511185954.D67E81201EC@lists.fedorahosted.org> Date: Mon, 11 May 2009 19:00: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/msg00287.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=7f8f1cafc233b252f2929cfa68624354505bb2e1 Commit: 7f8f1cafc233b252f2929cfa68624354505bb2e1 Parent: 4ac022c95c570468679800bc8f3dd80c57d72e36 Author: David Teigland AuthorDate: Mon May 11 13:52:14 2009 -0500 Committer: David Teigland CommitterDate: Mon May 11 13:52:14 2009 -0500 dlm_tool: print no error for empty lockdump Signed-off-by: David Teigland --- dlm/tool/main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlm/tool/main.c b/dlm/tool/main.c index 631fb56..b708946 100644 --- a/dlm/tool/main.c +++ b/dlm/tool/main.c @@ -947,10 +947,8 @@ void do_lockdump(char *name) } /* skip the header on the first line */ - if(!fgets(line, LOCK_LINE_MAX, file)) { - fprintf(stderr, "can't read %s: %s\n", path, strerror(errno)); + if (!fgets(line, LOCK_LINE_MAX, file)) return; - } while (fgets(line, LOCK_LINE_MAX, file)) { rv = sscanf(line, "%x %d %x %u %llu %x %x %hhd %hhd %hhd %u %d %d",