Date: Tue, 24 Jun 2008 09:10:03 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 144015 for review Message-ID: <200806240910.m5O9A3I8037602@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=144015 Change 144015 by gabor@gabor_server on 2008/06/24 09:09:45 - More consistent macro naming for the previous change Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#39 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#21 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#35 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#39 (text+ko) ==== @@ -116,7 +116,7 @@ char *color; /* --color */ unsigned long long mcount; /* count for -m */ -int binbehave = BIN_FILE_BIN; +int binbehave = BINFILE_BIN; int devbehave = DEV_GREP; int dirbehave = DIR_GREP; int linkbehave = LINK_GREP; @@ -431,7 +431,7 @@ Aflag = Bflag = l; break; case 'a': - binbehave = BIN_FILE_TEXT; + binbehave = BINFILE_TEXT; break; case 'b': bflag = 1; @@ -482,7 +482,7 @@ hflag = 1; break; case 'I': - binbehave = BIN_FILE_SKIP; + binbehave = BINFILE_SKIP; break; case 'i': case 'y': @@ -534,7 +534,7 @@ sflag = 1; break; case 'U': - binbehave = BIN_FILE_BIN; + binbehave = BINFILE_BIN; break; case 'u': case MMAP_OPT: @@ -557,11 +557,11 @@ break; case BIN_OPT: if (strcmp("binary", optarg) == 0) - binbehave = BIN_FILE_BIN; + binbehave = BINFILE_BIN; else if (strcmp("without-match", optarg) == 0) - binbehave = BIN_FILE_SKIP; + binbehave = BINFILE_SKIP; else if (strcmp("text", optarg) == 0) - binbehave = BIN_FILE_TEXT; + binbehave = BINFILE_TEXT; else errx(2, getstr(11)); break; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#21 (text+ko) ==== @@ -45,9 +45,9 @@ extern char *errstr[]; -#define BIN_FILE_BIN 0 -#define BIN_FILE_SKIP 1 -#define BIN_FILE_TEXT 2 +#define BINFILE_BIN 0 +#define BINFILE_SKIP 1 +#define BINFILE_TEXT 2 #define DIR_GREP 0 #define DIR_SKIP 1 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#35 (text+ko) ==== @@ -149,7 +149,7 @@ } nottext = grep_bin_file(f); - if (nottext && binbehave == BIN_FILE_SKIP) { + if (nottext && binbehave == BINFILE_SKIP) { grep_close(f); return (0); } @@ -197,7 +197,7 @@ if (Lflag && c == 0) printf("%s\n", fn); if (c && !cflag && !lflag && !Lflag && - binbehave == BIN_FILE_BIN && nottext && !qflag) + binbehave == BINFILE_BIN && nottext && !qflag) printf(getstr(12), fn); return (c); @@ -279,7 +279,7 @@ if (vflag) c = !c; - if (c && binbehave == BIN_FILE_BIN && nottext) + if (c && binbehave == BINFILE_BIN && nottext) return (c); /* Binary file */ if ((tail || c) && !cflag && !qflag) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806240910.m5O9A3I8037602>