PERFORCE change 140991 for review
Gabor Kovesdan
gabor at FreeBSD.org
Thu May 1 17:00:40 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140991
Change 140991 by gabor at gabor_server on 2008/05/01 17:00:19
- style(9)
Affected files ...
.. //depot/projects/soc2008/gabor_textproc/grep/binary.c#2 edit
.. //depot/projects/soc2008/gabor_textproc/grep/file.c#2 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#2 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#2 edit
.. //depot/projects/soc2008/gabor_textproc/grep/mmfile.c#2 edit
.. //depot/projects/soc2008/gabor_textproc/grep/queue.c#2 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#2 edit
Differences ...
==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#2 (text+ko) ====
@@ -46,15 +46,15 @@
int
bin_file(FILE *f)
{
- char buf[BUFSIZ];
- size_t i, m;
- int ret = 0;
+ char buf[BUFSIZ];
+ size_t i, m;
+ int ret = 0;
if (fseek(f, 0L, SEEK_SET) == -1)
- return 0;
+ return (0);
if ((m = fread(buf, 1, BUFSIZ, f)) == 0)
- return 0;
+ return (0);
for (i = 0; i < m; i++)
if (isbinary(buf[i])) {
@@ -63,21 +63,21 @@
}
rewind(f);
- return ret;
+ return (ret);
}
int
gzbin_file(gzFile *f)
{
- char buf[BUFSIZ];
- int i, m;
- int ret = 0;
+ char buf[BUFSIZ];
+ int i, m;
+ int ret = 0;
if (gzseek(f, (z_off_t)0, SEEK_SET) == -1)
- return 0;
+ return (0);
if ((m = gzread(f, buf, BUFSIZ)) <= 0)
- return 0;
+ return (0);
for (i = 0; i < m; i++)
if (isbinary(buf[i])) {
@@ -87,17 +87,17 @@
if (gzrewind(f) != 0)
err(1, "gzbin_file");
- return ret;
+ return (ret);
}
int
mmbin_file(mmf_t *f)
{
- int i;
+ int i;
/* XXX knows too much about mmf internals */
for (i = 0; i < BUFSIZ && i < f->len; i++)
if (isbinary(f->base[i]))
- return 1;
- return 0;
+ return (1);
+ return (0);
}
==== //depot/projects/soc2008/gabor_textproc/grep/file.c#2 (text+ko) ====
@@ -63,14 +63,14 @@
static char *
gzfgetln(gzFile *f, size_t *len)
{
- size_t n;
- int c;
+ size_t n;
+ int c;
for (n = 0; ; ++n) {
c = gzgetc(f);
if (c == -1) {
- const char *gzerrstr;
- int gzerr;
+ const char *gzerrstr;
+ int gzerr;
if (gzeof(f))
break;
@@ -91,15 +91,15 @@
}
if (gzeof(f) && n == 0)
- return NULL;
+ return (NULL);
*len = n;
- return lnbuf;
+ return (lnbuf);
}
file_t *
grep_fdopen(int fd, char *mode)
{
- file_t *f;
+ file_t *f;
if (fd == STDIN_FILENO)
snprintf(fname, sizeof fname, "(standard input)");
@@ -112,23 +112,23 @@
f->type = FILE_GZIP;
f->noseek = lseek(fd, 0L, SEEK_SET) == -1;
if ((f->gzf = gzdopen(fd, mode)) != NULL)
- return f;
+ return (f);
} else
{
f->type = FILE_STDIO;
f->noseek = isatty(fd);
if ((f->f = fdopen(fd, mode)) != NULL)
- return f;
+ return (f);
}
free(f);
- return NULL;
+ return (NULL);
}
file_t *
grep_open(char *path, char *mode)
{
- file_t *f;
+ file_t *f;
snprintf(fname, sizeof fname, "%s", path);
@@ -138,38 +138,38 @@
if (Zflag) {
f->type = FILE_GZIP;
if ((f->gzf = gzopen(fname, mode)) != NULL)
- return f;
+ return (f);
} else
{
/* try mmap first; if it fails, try stdio */
if ((f->mmf = mmopen(fname, mode)) != NULL) {
f->type = FILE_MMAP;
- return f;
+ return (f);
}
f->type = FILE_STDIO;
if ((f->f = fopen(path, mode)) != NULL)
- return f;
+ return (f);
}
free(f);
- return NULL;
+ return (NULL);
}
int
grep_bin_file(file_t *f)
{
if (f->noseek)
- return 0;
+ return (0);
switch (f->type) {
case FILE_STDIO:
- return bin_file(f->f);
+ return (bin_file(f->f));
case FILE_MMAP:
- return mmbin_file(f->mmf);
+ return (mmbin_file(f->mmf));
case FILE_GZIP:
- return gzbin_file(f->gzf);
+ return (gzbin_file(f->gzf));
default:
- /* can't happen */
+ /* NOTREACHED */
errx(2, "invalid file type");
}
}
@@ -179,13 +179,13 @@
{
switch (f->type) {
case FILE_STDIO:
- return fgetln(f->f, l);
+ return (fgetln(f->f, l));
case FILE_MMAP:
- return mmfgetln(f->mmf, l);
+ return (mmfgetln(f->mmf, l));
case FILE_GZIP:
- return gzfgetln(f->gzf, l);
+ return (gzfgetln(f->gzf, l));
default:
- /* can't happen */
+ /* NOTREACHED */
errx(2, "invalid file type");
}
}
@@ -204,7 +204,7 @@
gzclose(f->gzf);
break;
default:
- /* can't happen */
+ /* NOTREACHED */
errx(2, "invalid file type");
}
free(f);
==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#2 (text+ko) ====
@@ -34,10 +34,10 @@
#endif
#endif /* not lint */
-#include <sys/types.h>
#include <sys/limits.h>
+#include <sys/queue.h>
#include <sys/stat.h>
-#include <sys/queue.h>
+#include <sys/types.h>
#include <ctype.h>
#include <err.h>
@@ -52,14 +52,14 @@
#include "grep.h"
/* Flags passed to regcomp() and regexec() */
-int cflags;
-int eflags = REG_STARTEND;
+int cflags;
+int eflags = REG_STARTEND;
-int matchall; /* shortcut */
-int patterns, pattern_sz;
-char **pattern;
-regex_t *r_pattern;
-fastgrep_t *fg_pattern;
+int matchall; /* shortcut */
+int patterns, pattern_sz;
+char **pattern;
+regex_t *r_pattern;
+fastgrep_t *fg_pattern;
/* For regex errors */
char re_error[RE_ERROR_BUF + 1];
@@ -109,7 +109,7 @@
};
SLIST_HEAD(, patfile) patfilelh;
-extern char *__progname;
+extern char *__progname;
static void
usage(void)
@@ -121,7 +121,7 @@
exit(2);
}
-static char *optstr = "0123456789A:B:CEFGHILPSRUVZabce:f:hilnoqrsuvwxy";
+static char *optstr = "0123456789A:B:CEFGHILPSRUVZabce:f:hilnoqrsuvwxy";
struct option long_options[] =
{
@@ -137,44 +137,43 @@
{"color", optional_argument, NULL, COLOR_OPT},
{"colour", optional_argument, NULL, COLOR_OPT}, */
{"after-context", required_argument, NULL, 'A'},
+ {"text", no_argument, NULL, 'a'},
{"before-context", required_argument, NULL, 'B'},
+ {"byte-offset", no_argument, NULL, 'b'},
{"context", optional_argument, NULL, 'C'},
+ {"count", no_argument, NULL, 'c'},
/* XXX: UNDOCUMENTED
- {"devices", required_argument, NULL, 'D'}, */
+ {"devices", required_argument, NULL, 'D'},
+ {"directories", required_argument, NULL, 'd'}, */
{"extended-regexp", no_argument, NULL, 'E'},
+ {"regexp", required_argument, NULL, 'e'},
{"fixed-strings", no_argument, NULL, 'F'},
+ {"file", required_argument, NULL, 'f'},
{"basic-regexp", no_argument, NULL, 'G'},
+ {"no-filename", no_argument, NULL, 'h'},
/* XXX: UNIMPLEMENTED / INCOMPATIBLE
{"with-filename", no_argument, NULL, 'H'}, */
+ {"ignore-case", no_argument, NULL, 'i'},
/* XXX: UNIMPLEMENTED
{"bz2decompress", no_argument, NULL, 'J'}, */
+ {"files-with-matches", no_argument, NULL, 'l'},
{"files-without-match", no_argument, NULL, 'L'},
- {"binary", no_argument, NULL, 'U'},
- {"version", no_argument, NULL, 'V'},
- {"decompress", no_argument, NULL, 'Z'},
- {"text", no_argument, NULL, 'a'},
- {"byte-offset", no_argument, NULL, 'b'},
- {"count", no_argument, NULL, 'c'},
-/* XXX: UNIMPLEMENTED
- {"directories", required_argument, NULL, 'd'}, */
- {"regexp", required_argument, NULL, 'e'},
- {"file", required_argument, NULL, 'f'},
- {"no-filename", no_argument, NULL, 'h'},
- {"ignore-case", no_argument, NULL, 'i'},
- {"files-with-matches", no_argument, NULL, 'l'},
/* XXX: UNIMPLEMENTED
{"max-count", required_argument, NULL, 'm'}, */
{"line-number", no_argument, NULL, 'n'},
/* XXX: UNIMPLEMENTED / INCOMPATIBLE
- {"only-matching", no_argument, NULL, 'o'}, */
+ {"only-matching", no_argument, NULL, 'o'}, */
{"quiet", no_argument, NULL, 'q'},
{"silent", no_argument, NULL, 'q'},
{"recursive", no_argument, NULL, 'r'},
{"no-messages", no_argument, NULL, 's'},
- {"unix-byte-offsets", no_argument, NULL, 'u'},
+ {"binary", no_argument, NULL, 'U'},
+ {"unix-byte-offsets", no_argument, NULL, 'u'},
{"invert-match", no_argument, NULL, 'v'},
+ {"version", no_argument, NULL, 'V'},
{"word-regexp", no_argument, NULL, 'w'},
{"line-regexp", no_argument, NULL, 'x'},
+ {"decompress", no_argument, NULL, 'Z'},
{NULL, no_argument, NULL, 0}
};
@@ -220,7 +219,7 @@
static void
add_patterns(char *pats)
{
- char *nl;
+ char *nl;
while ((nl = strchr(pats, '\n')) != NULL) {
add_pattern(pats, nl - pats);
@@ -232,9 +231,9 @@
static void
read_patterns(const char *fn)
{
- FILE *f;
- char *line;
- size_t len;
+ FILE *f;
+ char *line;
+ size_t len;
if ((f = fopen(fn, "r")) == NULL)
err(2, "%s", fn);
@@ -248,10 +247,10 @@
int
main(int argc, char *argv[])
{
- int c, lastc, prevoptind, newarg, i, needpattern;
+ int c, lastc, prevoptind, newarg, i, needpattern;
struct patfile *patfile, *pf_next;
- long l;
- char *ep;
+ long l;
+ char *ep;
SLIST_INIT(&patfilelh);
switch (__progname[0]) {
@@ -306,6 +305,12 @@
else
Bflag = (int)l;
break;
+ case 'a':
+ binbehave = BIN_FILE_TEXT;
+ break;
+ case 'b':
+ bflag = 1;
+ break;
case 'C':
if (optarg == NULL)
Aflag = Bflag = 2;
@@ -317,14 +322,27 @@
Aflag = Bflag = (int)l;
}
break;
+ case 'c':
+ cflag = 1;
+ break;
case 'E':
Fflag = Gflag = 0;
Eflag++;
break;
+ case 'e':
+ add_patterns(optarg);
+ needpattern = 0;
+ break;
case 'F':
Eflag = Gflag = 0;
Fflag++;
break;
+ case 'f':
+ patfile = grep_malloc(sizeof(*patfile));
+ patfile->pf_file = optarg;
+ SLIST_INSERT_HEAD(&patfilelh, patfile, pf_next);
+ needpattern = 0;
+ break;
case 'G':
Eflag = Fflag = 0;
Gflag++;
@@ -332,61 +350,22 @@
case 'H':
Hflag++;
break;
- case 'I':
- binbehave = BIN_FILE_SKIP;
- break;
- case 'L':
- lflag = 0;
- Lflag = qflag = 1;
- break;
- case 'P':
- Pflag++;
- break;
- case 'S':
- Sflag++;
- break;
- case 'R':
- case 'r':
- Rflag++;
- oflag++;
- break;
- case 'U':
- binbehave = BIN_FILE_BIN;
- break;
- case 'V':
- printf("FreeBSD version 2.5.1\n");
- exit(0);
- case 'Z':
- Zflag++;
- break;
- case 'a':
- binbehave = BIN_FILE_TEXT;
- break;
- case 'b':
- bflag = 1;
- break;
- case 'c':
- cflag = 1;
- break;
- case 'e':
- add_patterns(optarg);
- needpattern = 0;
- break;
- case 'f':
- patfile = grep_malloc(sizeof(*patfile));
- patfile->pf_file = optarg;
- SLIST_INSERT_HEAD(&patfilelh, patfile, pf_next);
- needpattern = 0;
- break;
case 'h':
oflag = 0;
hflag = 1;
break;
+ case 'I':
+ binbehave = BIN_FILE_SKIP;
+ break;
case 'i':
case 'y':
iflag = 1;
cflags |= REG_ICASE;
break;
+ case 'L':
+ lflag = 0;
+ Lflag = qflag = 1;
+ break;
case 'l':
Lflag = 0;
lflag = qflag = 1;
@@ -398,12 +377,33 @@
hflag = 0;
oflag = 1;
break;
+ case 'P':
+ Pflag++;
+ break;
case 'q':
qflag = 1;
break;
+ case 'S':
+ Sflag++;
+ break;
+ case 'R':
+ case 'r':
+ Rflag++;
+ oflag++;
+ break;
case 's':
sflag = 1;
break;
+ case 'U':
+ binbehave = BIN_FILE_BIN;
+ break;
+ case 'u':
+ case MMAP_OPT:
+ /* default, compatibility */
+ break;
+ case 'V':
+ printf("FreeBSD version 2.5.1\n");
+ exit(0);
case 'v':
vflag = 1;
break;
@@ -413,6 +413,9 @@
case 'x':
xflag = 1;
break;
+ case 'Z':
+ Zflag++;
+ break;
case BIN_OPT:
if (strcmp("binary", optarg) == 0)
binbehave = BIN_FILE_BIN;
@@ -423,10 +426,6 @@
else
errx(2, "Unknown binary-files option");
break;
- case 'u':
- case MMAP_OPT:
- /* default, compatibility */
- break;
case LINEBUF_OPT:
lbflag = 1;
break;
==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
+/* $OpenBSD: grep.h,v 1.14 2007/09/02 15:19:32 deraadt Exp $ */
/* $FreeBSD$ */
-/* $OpenBSD: grep.h,v 1.14 2007/09/02 15:19:32 deraadt Exp $ */
/*-
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* All rights reserved.
@@ -72,24 +72,24 @@
extern regex_t *r_pattern;
/* For regex errors */
-#define RE_ERROR_BUF 512
+#define RE_ERROR_BUF 512
extern char re_error[RE_ERROR_BUF + 1]; /* Seems big enough */
/* util.c */
-int procfile(char *fn);
-int grep_tree(char **argv);
-void *grep_malloc(size_t size);
-void *grep_calloc(size_t nmemb, size_t size);
-void *grep_realloc(void *ptr, size_t size);
-void printline(str_t *line, int sep);
-int fastcomp(fastgrep_t *, const char *);
-void fgrepcomp(fastgrep_t *, const char *);
+int procfile(char *fn);
+int grep_tree(char **argv);
+void *grep_malloc(size_t size);
+void *grep_calloc(size_t nmemb, size_t size);
+void *grep_realloc(void *ptr, size_t size);
+void printline(str_t *line, int sep);
+int fastcomp(fastgrep_t *, const char *);
+void fgrepcomp(fastgrep_t *, const char *);
/* queue.c */
-void initqueue(void);
-void enqueue(str_t *x);
-void printqueue(void);
-void clearqueue(void);
+void initqueue(void);
+void enqueue(str_t *x);
+void printqueue(void);
+void clearqueue(void);
/* mmfile.c */
typedef struct mmfile {
@@ -98,22 +98,21 @@
char *base, *end, *ptr;
} mmf_t;
-mmf_t *mmopen(char *fn, char *mode);
-void mmclose(mmf_t *mmf);
-char *mmfgetln(mmf_t *mmf, size_t *l);
+mmf_t *mmopen(char *fn, char *mode);
+void mmclose(mmf_t *mmf);
+char *mmfgetln(mmf_t *mmf, size_t *l);
/* file.c */
struct file;
typedef struct file file_t;
-file_t *grep_fdopen(int fd, char *mode);
-file_t *grep_open(char *path, char *mode);
-int grep_bin_file(file_t *f);
-char *grep_fgetln(file_t *f, size_t *l);
-void grep_close(file_t *f);
+file_t *grep_fdopen(int fd, char *mode);
+file_t *grep_open(char *path, char *mode);
+int grep_bin_file(file_t *f);
+char *grep_fgetln(file_t *f, size_t *l);
+void grep_close(file_t *f);
/* binary.c */
-int bin_file(FILE * f);
-int gzbin_file(gzFile * f);
-int mmbin_file(mmf_t *f);
-
+int bin_file(FILE * f);
+int gzbin_file(gzFile * f);
+int mmbin_file(mmf_t *f);
==== //depot/projects/soc2008/gabor_textproc/grep/mmfile.c#2 (text+ko) ====
@@ -34,8 +34,8 @@
#endif
#endif /* not lint */
+#include <sys/mman.h>
#include <sys/param.h>
-#include <sys/mman.h>
#include <sys/stat.h>
#include <err.h>
@@ -45,13 +45,13 @@
#include "grep.h"
-#define MAX_MAP_LEN 1048576
+#define MAX_MAP_LEN 1048576
mmf_t *
mmopen(char *fn, char *mode)
{
- mmf_t *mmf;
- struct stat st;
+ mmf_t *mmf;
+ struct stat st;
/* XXX ignore mode for now */
mode = mode;
@@ -72,13 +72,13 @@
mmf->ptr = mmf->base;
mmf->end = mmf->base + mmf->len;
madvise(mmf->base, mmf->len, MADV_SEQUENTIAL);
- return mmf;
+ return (mmf);
ouch2:
close(mmf->fd);
ouch1:
free(mmf);
- return NULL;
+ return (NULL);
}
void
@@ -92,15 +92,15 @@
char *
mmfgetln(mmf_t *mmf, size_t *l)
{
- static char *p;
+ static char *p;
if (mmf->ptr >= mmf->end)
- return NULL;
+ return (NULL);
for (p = mmf->ptr; mmf->ptr < mmf->end; ++mmf->ptr)
if (*mmf->ptr == '\n')
break;
*l = mmf->ptr - p;
++mmf->ptr;
- return p;
+ return (p);
}
==== //depot/projects/soc2008/gabor_textproc/grep/queue.c#2 (text+ko) ====
@@ -65,6 +65,7 @@
static void
free_item(queue_t *item)
{
+
free(item);
}
@@ -99,20 +100,20 @@
queue_t *item;
if (q_head == NULL)
- return NULL;
+ return (NULL);
--count;
item = q_head;
q_head = item->next;
if (q_head == NULL)
q_tail = NULL;
- return item;
+ return (item);
}
void
printqueue(void)
{
- queue_t *item;
+ queue_t *item;
while ((item = dequeue()) != NULL) {
printline(&item->data, '-');
==== //depot/projects/soc2008/gabor_textproc/grep/util.c#2 (text+ko) ====
@@ -34,8 +34,8 @@
#endif
#endif /* not lint */
+#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <ctype.h>
#include <err.h>
@@ -54,18 +54,18 @@
* Process a file line by line...
*/
-static int linesqueued;
-static int procline(str_t *l, int);
-static int grep_search(fastgrep_t *, unsigned char *, size_t, regmatch_t *pmatch);
-static int grep_cmp(const unsigned char *, const unsigned char *, size_t);
-static void grep_revstr(unsigned char *, int);
+static int linesqueued;
+static int procline(str_t *l, int);
+static int grep_search(fastgrep_t *, unsigned char *, size_t, regmatch_t *pmatch);
+static int grep_cmp(const unsigned char *, const unsigned char *, size_t);
+static void grep_revstr(unsigned char *, int);
int
grep_tree(char **argv)
{
FTS *fts;
FTSENT *p;
- int c, fts_flags;
+ int c, fts_flags;
c = fts_flags = 0;
@@ -97,15 +97,15 @@
if (errno)
err(2, "fts_read");
- return c;
+ return (c);
}
int
procfile(char *fn)
{
- str_t ln;
- file_t *f;
- int c, t, z, nottext;
+ str_t ln;
+ file_t *f;
+ int c, t, z, nottext;
if (fn == NULL) {
fn = "(standard input)";
@@ -116,13 +116,13 @@
if (f == NULL) {
if (!sflag)
warn("%s", fn);
- return 0;
+ return (0);
}
nottext = grep_bin_file(f);
if (nottext && binbehave == BIN_FILE_SKIP) {
grep_close(f);
- return 0;
+ return (0);
}
ln.file = fn;
@@ -167,7 +167,7 @@
binbehave == BIN_FILE_BIN && nottext && !qflag)
printf("Binary file %s matches\n", fn);
- return c;
+ return (c);
}
@@ -175,13 +175,13 @@
* Process an individual line in a file. Return non-zero if it matches.
*/
-#define isword(x) (isalnum(x) || (x) == '_')
+#define isword(x) (isalnum(x) || (x) == '_')
static int
procline(str_t *l, int nottext)
{
- regmatch_t pmatch;
- int c, i, r;
+ regmatch_t pmatch;
+ int c, i, r;
if (matchall) {
c = !vflag;
@@ -211,7 +211,7 @@
print:
if (c && binbehave == BIN_FILE_BIN && nottext)
- return c; /* Binary file */
+ return (c); /* Binary file */
if ((tail > 0 || c) && !cflag && !qflag) {
if (c) {
@@ -229,13 +229,13 @@
tail--;
}
}
- return c;
+ return (c);
}
void
fgrepcomp(fastgrep_t *fg, const char *pattern)
{
- int i;
+ int i;
/* Initialize. */
fg->patternLen = strlen(pattern);
@@ -277,14 +277,14 @@
int
fastcomp(fastgrep_t *fg, const char *pattern)
{
- int i;
- int bol = 0;
- int eol = 0;
- int shiftPatternLen;
- int hasDot = 0;
- int firstHalfDot = -1;
- int firstLastHalfDot = -1;
- int lastHalfDot = 0;
+ int i;
+ int bol = 0;
+ int eol = 0;
+ int shiftPatternLen;
+ int hasDot = 0;
+ int firstHalfDot = -1;
+ int firstLastHalfDot = -1;
+ int lastHalfDot = 0;
/* Initialize. */
fg->patternLen = strlen(pattern);
@@ -433,8 +433,8 @@
static int
grep_search(fastgrep_t *fg, unsigned char *data, size_t dataLen, regmatch_t *pmatch)
{
- int j;
- int rtrnVal = REG_NOMATCH;
+ int j;
+ int rtrnVal = REG_NOMATCH;
pmatch->rm_so = -1;
pmatch->rm_eo = -1;
@@ -516,7 +516,7 @@
if ((ptr = malloc(size)) == NULL)
err(2, "malloc");
- return ptr;
+ return (ptr);
}
void *
@@ -526,15 +526,16 @@
if ((ptr = calloc(nmemb, size)) == NULL)
err(2, "calloc");
- return ptr;
+ return (ptr);
}
void *
grep_realloc(void *ptr, size_t size)
{
+
if ((ptr = realloc(ptr, size)) == NULL)
err(2, "realloc");
- return ptr;
+ return (ptr);
}
/*
@@ -544,7 +545,7 @@
static int
grep_cmp(const unsigned char *pattern, const unsigned char *data, size_t len)
{
- int i;
+ int i;
for (i = 0; i < len; i++) {
if (((pattern[i] == data[i]) || (!Fflag && pattern[i] == '.'))
@@ -559,8 +560,8 @@
static void
grep_revstr(unsigned char *str, int len)
{
- int i;
- char c;
+ int i;
+ char c;
for (i = 0; i < len / 2; i++) {
c = str[i];
@@ -572,7 +573,7 @@
void
printline(str_t *line, int sep)
{
- int n;
+ int n;
n = 0;
if (!hflag) {
More information about the p4-projects
mailing list