From owner-p4-projects@FreeBSD.ORG Mon Jun 28 23:58:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC83C1065670; Mon, 28 Jun 2010 23:58:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80C29106564A for ; Mon, 28 Jun 2010 23:58:34 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 549AC8FC1B for ; Mon, 28 Jun 2010 23:58:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5SNwY8K002547 for ; Mon, 28 Jun 2010 23:58:34 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5SNwYQo002545 for perforce@freebsd.org; Mon, 28 Jun 2010 23:58:34 GMT (envelope-from bfiedler@FreeBSD.org) Date: Mon, 28 Jun 2010 23:58:34 GMT Message-Id: <201006282358.o5SNwYQo002545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 23:58:35 -0000 http://p4web.freebsd.org/@@180308?ac=10 Change 180308 by bfiedler@freebsd-7803 on 2010/06/28 23:58:10 Simple cleanup, reordering Affected files ... .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#6 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#5 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#6 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#6 (text+ko) ==== @@ -46,9 +46,11 @@ #include "diff.h" #include "pathnames.h" -int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; -int sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize=8; -int horizon, Eflag; +int aflag, bflag, Bflag, dflag, Eflag, iflag; +int lflag, Nflag, Pflag, pflag, rflag, sflag; +int tflag, Tflag, wflag, uniflag; +int strip_cr, horizon; +int tabsize = 8; int format, status; int fcase_behave = FCASE_SENSITIVE; unsigned long long context; @@ -67,8 +69,6 @@ UNIDIR_OPT, STRIPCR_OPT, HORIZ_OPT, - NOOP_OPT, - LEFTC_OPT, SUPCL_OPT, GTYPE_OPT, @@ -77,6 +77,7 @@ TSIZE_OPT, HLINES_OPT, LFILES_OPT, + NOOP_OPT, }; @@ -98,7 +99,6 @@ { "context", optional_argument, NULL, 'C' }, { "ifdef", required_argument, NULL, 'D' }, { "minimal", no_argument, NULL, 'd' }, -/* XXX: UNIMPLEMENTED */ { "ignore-tab-expansion", no_argument, NULL, 'E' }, { "ed", no_argument, NULL, 'e' }, { "forward-ed", no_argument, NULL, 'f' }, ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#5 (text+ko) ==== @@ -82,9 +82,11 @@ struct excludes *next; }; -extern int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, - sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize, Eflag; -extern int format, status, horizon; +extern int aflag, bflag, Bflag, dflag, Eflag, iflag; +extern int lflag, Nflag, Pflag, pflag, rflag, sflag; +extern int tflag, Tflag, wflag, uniflag; +extern int strip_cr, tabsize, horizon; +extern int format, status; extern int fcase_behave; extern unsigned long long context; extern char *start, *ifdefname, *diffargs, *label[2], *ignore_pats; ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#6 (text+ko) ==== @@ -719,8 +719,6 @@ strc = fgetwln(f1, &lenc); strd = fgetwln(f2, &lend); - ccol = lenc; - dcol = lend; if (Bflag) { while ((lenc = 1) && (strc[0] == L'\n'))