From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22711 invoked by alias); 27 May 2009 10:20:15 -0000 Received: (qmail 22705 invoked by alias); 27 May 2009 10:20:15 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_24,SPF_HELO_PASS X-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_24,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 - fsck.gfs2: Add gettext support 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: 873360edd9ae4417fa11379928ecf0f54216cb42 X-Git-Newrev: 797bcb77cbed90852be871012075fd18ea0ba6c3 From: Steven Whitehouse Message-Id: <20090527101943.62215120373@lists.fedorahosted.org> Date: Wed, 27 May 2009 10:20: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/msg00412.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=797bcb77cbed90852be871012075fd18ea0ba6c3 Commit: 797bcb77cbed90852be871012075fd18ea0ba6c3 Parent: 873360edd9ae4417fa11379928ecf0f54216cb42 Author: Steven Whitehouse AuthorDate: Tue Mar 24 20:50:24 2009 +0000 Committer: Steven Whitehouse CommitterDate: Wed May 27 10:06:20 2009 +0100 fsck.gfs2: Add gettext support The messages need to be cleaned up a bit, but this is the guts of it anyway. Signed-off-by: Steven Whitehouse --- gfs2/fsck/main.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c index 0bd67cc..b0f7856 100644 --- a/gfs2/fsck/main.c +++ b/gfs2/fsck/main.c @@ -90,15 +90,9 @@ static int read_cmdline(int argc, char **argv, struct gfs2_options *gopts) } } if(argc > optind) { -<<<<<<< HEAD:gfs2/fsck/main.c gopts->device = (argv[optind]); - if(!gopts->device) { - fprintf(stderr, "Please use '-h' for usage.\n"); -======= - opts->device = (argv[optind]); if(!opts->device) { fprintf(stderr, _("Please use '-h' for usage.\n")); ->>>>>>> abf33c3... fsck.gfs2: Add gettext support:gfs2/fsck/main.c return FSCK_USAGE; } } else {