PERFORCE change 180308 for review
Benjamin Fiedler
bfiedler at FreeBSD.org
Mon Jun 28 23:58:35 UTC 2010
http://p4web.freebsd.org/@@180308?ac=10
Change 180308 by bfiedler at 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'))
More information about the p4-projects
mailing list